4 files changed, 9 insertions, 12 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 89a8e82cc..22c0f7ea8 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -33,7 +33,7 @@
 #include "lib/raw_image_proxy.h"
 #include "lib/data.h"
 #include "lib/server_description.h"
-#include "lib/log.h"
+#include "lib/file_log.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 
@@ -216,4 +216,3 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
 	delete server;
 }
-
diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index c81b7389c..39536f1ab 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -25,14 +25,14 @@
  *  it probably should.
  */
 
-#include <vector>
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
-#include "lib/log.h"
+#include "lib/null_log.h"
 #include "lib/film.h"
 #include "test.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
 
 using std::cerr;
 using std::vector;
@@ -91,4 +91,3 @@ BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
 
 	test ("prophet_clip.mkv", frames);
 }
-
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 601dd1c59..ce799bb24 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -22,13 +22,13 @@
  *  (dropped frames being checked by assert() in VideoDecoder).  Also that the decoder picks up frame rates correctly.
  */
 
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
-#include "lib/log.h"
+#include "lib/null_log.h"
 #include "lib/film.h"
 #include "test.h"
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
 
 using std::cout;
 using std::cerr;
@@ -78,4 +78,3 @@ BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
 	*/
 	test ("prophet_clip.mkv", 23.976, 12);
 }
-
diff --git a/test/file_log_test.cc b/test/file_log_test.cc
index a587b87ef..29205e400 100644
--- a/test/file_log_test.cc
+++ b/test/file_log_test.cc
@@ -17,8 +17,8 @@
 
 */
 
+#include "lib/file_log.h"
 #include <boost/test/unit_test.hpp>
-#include "lib/log.h"
 
 using std::cout;