diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index 0bf71312..952f457d 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -29,7 +29,7 @@
 
 #include "../toxcore/DHT.h"
 #include "../toxcore/friend_requests.h"
-#include "../testing/misc_tools.h"
+#include "../toxcore/misc_tools.h"
 
 //Sleep function (x = milliseconds)
 #ifdef WIN32
diff --git a/other/Makefile.inc b/other/Makefile.inc
index 10ef55a3..c737b642 100644
--- a/other/Makefile.inc
+++ b/other/Makefile.inc
@@ -3,8 +3,7 @@ noinst_PROGRAMS += DHT_bootstrap
 DHT_bootstrap_SOURCES = $(top_srcdir)/other/DHT_bootstrap.c \
                         $(top_srcdir)/toxcore/DHT.h \
                         $(top_srcdir)/toxcore/friend_requests.h \
-                        $(top_srcdir)/testing/misc_tools.h \
-                        $(top_srcdir)/testing/misc_tools.c
+                        $(top_srcdir)/toxcore/misc_tools.h
 
 DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \
                         $(LIBSODIUM_CFLAGS)
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index d14f9781..02c9360a 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -30,7 +30,7 @@
 //#include "../core/network.h"
 #include "../toxcore/DHT.h"
 #include "../toxcore/friend_requests.h"
-#include "misc_tools.h"
+#include "../toxcore/misc_tools.h"
 
 #include <string.h>
 
diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index 067b6ead..cebb3e2c 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -2,9 +2,7 @@ if BUILD_NTOX
 
 bin_PROGRAMS += nTox
 
-nTox_SOURCES =          $(top_srcdir)/testing/misc_tools.h \
-                        $(top_srcdir)/testing/misc_tools.c \
-                        $(top_srcdir)/testing/nTox.h \
+nTox_SOURCES =          $(top_srcdir)/testing/nTox.h \
                         $(top_srcdir)/testing/nTox.c
 
 nTox_CFLAGS =           $(LIBSODIUM_CFLAGS) \
@@ -24,9 +22,7 @@ noinst_PROGRAMS +=      DHT_test \
                         Messenger_test \
                         crypto_speed_test
 
-DHT_test_SOURCES =      $(top_srcdir)/testing/DHT_test.c \
-                        $(top_srcdir)/testing/misc_tools.h \
-                        $(top_srcdir)/testing/misc_tools.c
+DHT_test_SOURCES =      $(top_srcdir)/testing/DHT_test.c
 
 DHT_test_CFLAGS =       $(LIBSODIUM_CFLAGS) 
 
@@ -63,9 +59,7 @@ Lossless_UDP_testserver_LDADD = \
 
 
 Messenger_test_SOURCES = \
-                        $(top_srcdir)/testing/Messenger_test.c \
-                        $(top_srcdir)/testing/misc_tools.h \
-                        $(top_srcdir)/testing/misc_tools.c
+                        $(top_srcdir)/testing/Messenger_test.c
 
 Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS)
 
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 19fd9ab7..fcfe9513 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -38,7 +38,7 @@
  */
 
 #include "../toxcore/Messenger.h"
-#include "misc_tools.h"
+#include "../toxcore/misc_tools.h"
 
 #ifdef WIN32
 
diff --git a/testing/nTox.c b/testing/nTox.c
index 9df1e78b..43ea1b6a 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -21,7 +21,7 @@
  *
  */
 #include "nTox.h"
-#include "misc_tools.h"
+#include "../toxcore/misc_tools.h"
 
 #include <stdio.h>
 #include <time.h>
diff --git a/toxcore/Lossless_UDP.h b/toxcore/Lossless_UDP.h
index ba89c2a1..cc184ec0 100644
--- a/toxcore/Lossless_UDP.h
+++ b/toxcore/Lossless_UDP.h
@@ -25,7 +25,7 @@
 #define LOSSLESS_UDP_H
 
 #include "network.h"
-#include "../testing/misc_tools.h"
+#include "misc_tools.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc
index da07db41..9abefc5b 100644
--- a/toxcore/Makefile.inc
+++ b/toxcore/Makefile.inc
@@ -25,7 +25,9 @@ libtoxcore_la_SOURCES = $(top_srcdir)/toxcore/DHT.h \
                         $(top_srcdir)/toxcore/tox.h \
                         $(top_srcdir)/toxcore/tox.c \
                         $(top_srcdir)/toxcore/util.h \
-                        $(top_srcdir)/toxcore/util.c
+                        $(top_srcdir)/toxcore/util.c \
+                        $(top_srcdir)/toxcore/misc_tools.h \
+                        $(top_srcdir)/toxcore/misc_tools.c
 
 libtoxcore_la_CFLAGS =  -I$(top_srcdir) \
                         -I$(top_srcdir)/toxcore \
diff --git a/testing/misc_tools.c b/toxcore/misc_tools.c
similarity index 100%
rename from testing/misc_tools.c
rename to toxcore/misc_tools.c
diff --git a/testing/misc_tools.h b/toxcore/misc_tools.h
similarity index 100%
rename from testing/misc_tools.h
rename to toxcore/misc_tools.h