6 files changed, 10 insertions, 6 deletions
diff --git a/test/common/bufferedreadstream.h b/test/common/bufferedreadstream.h
index 4238c1b42e..c10fbf4b1d 100644
--- a/test/common/bufferedreadstream.h
+++ b/test/common/bufferedreadstream.h
@@ -1,6 +1,7 @@
 #include <cxxtest/TestSuite.h>
 
-#include "common/stream.h"
+#include "common/memstream.h"
+#include "common/bufferedstream.h"
 
 class BufferedReadStreamTestSuite : public CxxTest::TestSuite {
 	public:
diff --git a/test/common/bufferedseekablereadstream.h b/test/common/bufferedseekablereadstream.h
index d9b8e2f6a0..11eb58f3d0 100644
--- a/test/common/bufferedseekablereadstream.h
+++ b/test/common/bufferedseekablereadstream.h
@@ -1,6 +1,7 @@
 #include <cxxtest/TestSuite.h>
 
-#include "common/stream.h"
+#include "common/memstream.h"
+#include "common/bufferedstream.h"
 
 class BufferedSeekableReadStreamTestSuite : public CxxTest::TestSuite {
 	public:
diff --git a/test/common/memoryreadstream.h b/test/common/memoryreadstream.h
index dab9b34e0c..f7a144d730 100644
--- a/test/common/memoryreadstream.h
+++ b/test/common/memoryreadstream.h
@@ -1,6 +1,6 @@
 #include <cxxtest/TestSuite.h>
 
-#include "common/stream.h"
+#include "common/memstream.h"
 
 class MemoryReadStreamTestSuite : public CxxTest::TestSuite {
 	public:
diff --git a/test/common/seekablesubreadstream.h b/test/common/seekablesubreadstream.h
index b6e584e510..0a7f93ca5e 100644
--- a/test/common/seekablesubreadstream.h
+++ b/test/common/seekablesubreadstream.h
@@ -1,6 +1,7 @@
 #include <cxxtest/TestSuite.h>
 
-#include "common/stream.h"
+#include "common/memstream.h"
+#include "common/substream.h"
 
 class SeekableSubReadStreamTestSuite : public CxxTest::TestSuite {
 	public:
diff --git a/test/common/stream.h b/test/common/stream.h
index 8f989009cd..2bd0599acc 100644
--- a/test/common/stream.h
+++ b/test/common/stream.h
@@ -1,6 +1,6 @@
 #include <cxxtest/TestSuite.h>
 
-#include "common/stream.h"
+#include "common/memstream.h"
 
 class ReadLineStreamTestSuite : public CxxTest::TestSuite {
 	public:
diff --git a/test/common/subreadstream.h b/test/common/subreadstream.h
index 15d959892f..463f49e929 100644
--- a/test/common/subreadstream.h
+++ b/test/common/subreadstream.h
@@ -1,6 +1,7 @@
 #include <cxxtest/TestSuite.h>
 
-#include "common/stream.h"
+#include "common/memstream.h"
+#include "common/substream.h"
 
 class SubReadStreamTestSuite : public CxxTest::TestSuite {
 	public: