diff --git a/configure.ac b/configure.ac
index 2b83cc6f..62f4d51d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,11 @@ AC_FUNC_MMAP
 AC_CHECK_HEADER([execinfo.h], [break])
 AM_CONDITIONAL([HAVE_EXECINFO], [test x$ac_cv_header_execinfo_h = "xyes"])
 
+AC_SEARCH_LIBS([clock_gettime], [rt])
+if [[ "x$ac_cv_search_clock_gettime" == "x-*" ]]; then
+    COMMON_LDFLAGS="$COMMON_LDFLAGS $ac_cv_search_clock_gettime"
+fi
+    
 
 ##
 ## Debug features
diff --git a/test/.gitignore b/test/.gitignore
index 65f608cc..481d5729 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,5 +1,6 @@
-/adler
+/adler*
 /backtrace*
+/checksum*
 /float*
 /hton*
 /ip*
diff --git a/test/matrix.cpp b/test/matrix.cpp
index 0f36df4f..56f9680d 100644
--- a/test/matrix.cpp
+++ b/test/matrix.cpp
@@ -1,5 +1,5 @@
 #include "../debug.hpp"
-#include "../matrix.hpp"
+#include "../maths/matrix.hpp"
 #include "../maths.hpp"
 
 #include <iostream>
diff --git a/test/pool.cpp b/test/pool.cpp
index ab9ed577..b59a21f2 100644
--- a/test/pool.cpp
+++ b/test/pool.cpp
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 using namespace std;
-
+using namespace util;
 
 void
 check_single (void) {
diff --git a/test/version.cpp b/test/version.cpp
index c8ccc22f..4987f2e9 100644
--- a/test/version.cpp
+++ b/test/version.cpp
@@ -2,12 +2,12 @@
 #include <string>
 #include <vector>
 
-using namespace std;
-
-
 #include "../version.hpp"
 #include "../debug.hpp"
 
+using namespace std;
+using namespace util;
+
 
 struct parsed_version {
     string                str;