14 files changed, 14 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 73c7919e..010561a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ cmake_install.cmake
 install_manifest.txt
 
 testing/data
+*~
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 7e5c119a..6ddd5b9b 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -12,7 +12,6 @@ set(core_sources
         net_crypto.c
         friend_requests.c
         LAN_discovery.c
-        Messenger.c
-        misc_tools.c)
+        Messenger.c)
 
 add_library(core ${core_sources})
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index 61901a15..19714e70 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -29,7 +29,7 @@
 
 #include "../core/DHT.h"
 #include "../core/friend_requests.h"
-#include "../core/misc_tools.h"
+#include "../testing/misc_tools.h"
 
 //Sleep function (x = milliseconds)
 #ifdef WIN32
diff --git a/other/cmake/DHT_bootstrap.cmake b/other/cmake/DHT_bootstrap.cmake
index c3c313ae..e2b164ba 100644
--- a/other/cmake/DHT_bootstrap.cmake
+++ b/other/cmake/DHT_bootstrap.cmake
@@ -4,6 +4,6 @@ project(DHT_bootstrap C)
 set(exe_name DHT_bootstrap)
 
 add_executable(${exe_name}
-        DHT_bootstrap.c)
+        DHT_bootstrap.c ../testing/misc_tools.c)
 
 linkCoreLibraries(${exe_name})
diff --git a/testing/DHT_cryptosendfiletest.c b/testing/DHT_cryptosendfiletest.c
index 23423497..c7c33531 100644
--- a/testing/DHT_cryptosendfiletest.c
+++ b/testing/DHT_cryptosendfiletest.c
@@ -38,7 +38,7 @@
 #include "../core/network.h"
 #include "../core/DHT.h"
 #include "../core/net_crypto.h"
-#include "../core/misc_tools.h"
+#include "misc_tools.h"
 
 #include <string.h>
 
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 92845b7e..2e9c2ac2 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -30,7 +30,7 @@
 //#include "../core/network.h"
 #include "../core/DHT.c"
 #include "../core/friend_requests.c"
-#include "../core/misc_tools.h"
+#include "misc_tools.h"
 
 #include <string.h>
 
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 6ad5c7dd..0518d284 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -38,7 +38,7 @@
  */
 
 #include "../core/Messenger.h"
-#include "../core/misc_tools.h"
+#include "misc_tools.h"
 
 #ifdef WIN32
 
diff --git a/testing/cmake/DHT_cryptosendfiletest.cmake b/testing/cmake/DHT_cryptosendfiletest.cmake
index 8d6079f8..c98a2bcd 100644
--- a/testing/cmake/DHT_cryptosendfiletest.cmake
+++ b/testing/cmake/DHT_cryptosendfiletest.cmake
@@ -4,6 +4,6 @@ project(DHT_cryptosendfiletest C)
 set(exe_name DHT_cryptosendfiletest)
 
 add_executable(${exe_name}
-        DHT_cryptosendfiletest.c)
+        DHT_cryptosendfiletest.c misc_tools.c)
 
-linkCoreLibraries(${exe_name})
\ No newline at end of file
+linkCoreLibraries(${exe_name})
diff --git a/testing/cmake/DHT_test.cmake b/testing/cmake/DHT_test.cmake
index bcde4370..74fdf35d 100644
--- a/testing/cmake/DHT_test.cmake
+++ b/testing/cmake/DHT_test.cmake
@@ -4,6 +4,6 @@ project(DHT_test C)
 set(exe_name DHT_test)
 
 add_executable(${exe_name}
-        DHT_test.c)
+        DHT_test.c misc_tools.c)
 
 linkCoreLibraries(${exe_name})
diff --git a/testing/cmake/Messenger_test.cmake b/testing/cmake/Messenger_test.cmake
index a85e043d..b2f54d0a 100644
--- a/testing/cmake/Messenger_test.cmake
+++ b/testing/cmake/Messenger_test.cmake
@@ -4,6 +4,6 @@ project(Messenger_test C)
 set(exe_name Messenger_test)
 
 add_executable(${exe_name}
-        Messenger_test.c)
+        Messenger_test.c misc_tools.c)
 
 linkCoreLibraries(${exe_name})
diff --git a/testing/cmake/nTox.cmake b/testing/cmake/nTox.cmake
index 1656bc80..4c6905e5 100644
--- a/testing/cmake/nTox.cmake
+++ b/testing/cmake/nTox.cmake
@@ -4,7 +4,7 @@ project(nTox C)
 set(exe_name nTox)
 
 add_executable(${exe_name}
-        nTox.c)
+        nTox.c misc_tools.c)
         
 target_link_libraries(${exe_name} ncurses)
 
diff --git a/core/misc_tools.c b/testing/misc_tools.c
index 34d64bf4..34d64bf4 100644
--- a/core/misc_tools.c
+++ b/testing/misc_tools.c
diff --git a/core/misc_tools.h b/testing/misc_tools.h
index 29b37ce5..29b37ce5 100644
--- a/core/misc_tools.h
+++ b/testing/misc_tools.h
diff --git a/testing/nTox.c b/testing/nTox.c
index e202a697..7ba31110 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -22,7 +22,8 @@
  */
 
 #include "nTox.h"
-#include "../core/misc_tools.h"
+#include "misc_tools.h"
+
 #include <stdio.h>
 #include <time.h>
 #ifdef WIN32