diff --git a/Makefile b/Makefile
index c74d26c..e214abb 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ all :
 
 me :
 	mkdir -p $(BUILD)
-	$(CC) $(CFLAGS) $(DEFS) $(SOURCES) -o $(BUILD)/arch
+	$(CC) $(CFLAGS) $(SOURCES) -o $(BUILD)/arch
 
 clean :
 	rm -fr $(BUILD)
diff --git a/test/Makefile b/test/Makefile
index a8ac318..028d038 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -12,7 +12,7 @@ raw_inotify :
 	$(CC) -linotifytools raw_inotify.c -o raw_inotify
 	
 path :
-	$(CC) -D__DEBUG__ $(CFLAGS) ../src/common/path.c t_path.c -o test_path
+	$(CC) $(DEFS) $(CFLAGS) unit.c ../src/common/path.c t_path.c -o test_path
 
 rbtree : 
 	$(CC) $(DEFS) $(CFLAGS) unit.c ../src/common/rbtree.c t_rbtree.c -o test_rbtree
diff --git a/test/t_rbtree.c b/test/t_rbtree.c
index 1266a6a..5f146a3 100644
--- a/test/t_rbtree.c
+++ b/test/t_rbtree.c
@@ -7,7 +7,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
 #include "unit.h"
 #include "../src/common/rbtree.h"
 #include "../src/common/debug.h"
diff --git a/test/unit.c b/test/unit.c
index 23cec36..0982421 100644
--- a/test/unit.c
+++ b/test/unit.c
@@ -14,6 +14,16 @@ static inline char ranchr() {
     return ch;
 }
 
+void __assert_str(char *file, int line, char *func, char *a, char *b) {
+    
+    if (a == NULL || b == NULL)
+        __uexit(file, line, func, "a or b is null\n", NULL);
+
+    if (strcmp(a, b) != 0)
+        __uexit(file, line, func, "\"%s\" != \"%s\"\n", a, b);
+    
+}
+
 void utest_init_RNG() {
 
     static unsigned char init = 0;
diff --git a/test/unit.h b/test/unit.h
index 119177e..d751938 100644
--- a/test/unit.h
+++ b/test/unit.h
@@ -1,7 +1,7 @@
 
 #ifndef _UNIT_H
 
-#define _UNIT_H
+#define _UNIT_H 1
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -15,15 +15,7 @@
     } while(0)
 
 /* internal function. assert_* macros below expands to this */
-inline void __assert_str(char *file, int line, char *func, char *a, char *b) {
-
-    if (a == NULL || b == NULL)
-        __uexit(file, line, func, "a or b is null\n", NULL);
-
-    if (strcmp(a, b) != 0)
-        __uexit(file, line, func, "\"%s\" != \"%s\"\n", a, b);
-    
-}
+void __assert_str(char *file, int line, char *func, char *a, char *b);
 
 #define assert_string(a, b) __assert_str(__FILE__, __LINE__, __FUNCTION__, a, b)