3 files changed, 9 insertions, 3 deletions

diff --git a/core/DHT.h b/core/DHT.h
index 2308abd8..cb5697ea 100644
--- a/core/DHT.h
+++ b/core/DHT.h
@@ -30,8 +30,6 @@
 extern "C" {
 #endif
 
-/* Current time, unix format */
-#define unix_time() ((uint64_t)time(NULL))
 
 /* size of the client_id in bytes */
 #define CLIENT_ID_SIZE crypto_box_PUBLICKEYBYTES
diff --git a/core/network.h b/core/network.h
index d246a9d1..d3c39333 100644
--- a/core/network.h
+++ b/core/network.h
@@ -66,6 +66,11 @@ extern "C" {
 
 #define MAX_UDP_PACKET_SIZE 65507
 
+
+/* Current time, unix format */
+#define unix_time() ((uint64_t)time(NULL))
+
+
 typedef union {
     uint8_t c[4];
     uint16_t s[2];
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index d4579571..7fa9e964 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -22,7 +22,10 @@ extern int add_req(uint8_t *public_key); // XXX
 
 /* Holds status of chat windows */
 char WINDOW_STATUS[MAX_WINDOW_SLOTS];
-//#define TOXICVER "0.1.0" //Will be moved to a -D flag later 
+
+#ifndef TOXICVER
+#define TOXICVER "NOVER" //Use the -D flag to set this
+#endif
 
 static ToxWindow windows[MAX_WINDOW_SLOTS];
 static ToxWindow* prompt;