diff --git a/libguac/include/protocol.h b/libguac/include/protocol.h
index 1a3a1d8a..27d95101 100644
--- a/libguac/include/protocol.h
+++ b/libguac/include/protocol.h
@@ -50,12 +50,6 @@
  * @file protocol.h
  */
 
-
-/**
- * An arbitrary timestamp denoting a relative time value in milliseconds.
- */
-typedef int64_t guac_timestamp;
-
 /**
  * Composite modes used by Guacamole draw instructions. Each
  * composite mode maps to a unique channel mask integer.
@@ -170,16 +164,6 @@ typedef enum guac_line_join_style {
     GUAC_LINE_JOIN_ROUND = 0x2
 } guac_line_join_style;
 
-/**
- * Returns an arbitrary timestamp. The difference between return values of any
- * two calls is equal to the amount of time in milliseconds between those 
- * calls. The return value from a single call will not have any useful
- * (or defined) meaning.
- *
- * @return An arbitrary millisecond timestamp.
- */
-guac_timestamp guac_protocol_get_timestamp();
-
 /* CONTROL INSTRUCTIONS */
 
 /**
diff --git a/libguac/include/time.h b/libguac/include/time.h
new file mode 100644
index 00000000..21dfea05
--- /dev/null
+++ b/libguac/include/time.h
@@ -0,0 +1,63 @@
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is libguac.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _GUAC_TIME_H
+#define _GUAC_TIME_H
+
+/**
+ * Provides functions and structures for creating timestamps.
+ *
+ * @file time.h
+ */
+
+/**
+ * An arbitrary timestamp denoting a relative time value in milliseconds.
+ */
+typedef int64_t guac_timestamp;
+
+/**
+ * Returns an arbitrary timestamp. The difference between return values of any
+ * two calls is equal to the amount of time in milliseconds between those 
+ * calls. The return value from a single call will not have any useful
+ * (or defined) meaning.
+ *
+ * @return An arbitrary millisecond timestamp.
+ */
+guac_timestamp guac_timestamp_current();
+
+#endif
+