diff --git a/either.h b/either.h
index 907c2409..23da49d4 100644
--- a/either.h
+++ b/either.h
@@ -3,6 +3,7 @@
 #define MESSMER_CPPUTILS_EITHER_H
 
 #include <boost/optional.hpp>
+#include <iostream>
 
 namespace cpputils {
 
diff --git a/test/EitherIncludeTest.cpp b/test/EitherIncludeTest.cpp
new file mode 100644
index 00000000..39e46f30
--- /dev/null
+++ b/test/EitherIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../either.h"
+
+//Test that either can be included without needing additional dependencies
diff --git a/test/MacrosIncludeTest.cpp b/test/MacrosIncludeTest.cpp
new file mode 100644
index 00000000..c763d50f
--- /dev/null
+++ b/test/MacrosIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../macros.h"
+
+// Test that macros.h can be included without needing additional dependencies
diff --git a/test/assert/assert_include_test.cpp b/test/assert/assert_include_test.cpp
new file mode 100644
index 00000000..595f9e8f
--- /dev/null
+++ b/test/assert/assert_include_test.cpp
@@ -0,0 +1,3 @@
+#include "../../assert/assert.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/assert/backtrace_include_test.cpp b/test/assert/backtrace_include_test.cpp
new file mode 100644
index 00000000..dc335586
--- /dev/null
+++ b/test/assert/backtrace_include_test.cpp
@@ -0,0 +1,4 @@
+#include "../../assert/backtrace.h"
+
+// Test the header can be included without needing additional dependencies
+
diff --git a/test/daemon/daemonize_include_test.cpp b/test/daemon/daemonize_include_test.cpp
new file mode 100644
index 00000000..69fa6b6a
--- /dev/null
+++ b/test/daemon/daemonize_include_test.cpp
@@ -0,0 +1,4 @@
+#include "../../daemon/daemonize.h"
+
+// Test the header can be included without needing additional dependencies
+
diff --git a/test/data/DataFixtureIncludeTest.cpp b/test/data/DataFixtureIncludeTest.cpp
new file mode 100644
index 00000000..67c1b040
--- /dev/null
+++ b/test/data/DataFixtureIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../data/DataFixture.h"
+
+// Test the header can be included without needing additional dependencies
\ No newline at end of file
diff --git a/test/data/DataIncludeTest.cpp b/test/data/DataIncludeTest.cpp
new file mode 100644
index 00000000..18a20275
--- /dev/null
+++ b/test/data/DataIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../data/Data.h"
+
+// Test the header can be included without needing additional dependencies
\ No newline at end of file
diff --git a/test/data/FixedSizeDataIncludeTest.cpp b/test/data/FixedSizeDataIncludeTest.cpp
new file mode 100644
index 00000000..502cd16c
--- /dev/null
+++ b/test/data/FixedSizeDataIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../data/FixedSizeData.h"
+
+// Test the header can be included without needing additional dependencies
\ No newline at end of file
diff --git a/test/io/ConsoleIncludeTest.cpp b/test/io/ConsoleIncludeTest.cpp
new file mode 100644
index 00000000..0c6cb805
--- /dev/null
+++ b/test/io/ConsoleIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../io/Console.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/lock/ConditionBarrierIncludeTest.cpp b/test/lock/ConditionBarrierIncludeTest.cpp
new file mode 100644
index 00000000..3c59544c
--- /dev/null
+++ b/test/lock/ConditionBarrierIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../lock/ConditionBarrier.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/lock/LockPoolIncludeTest.cpp b/test/lock/LockPoolIncludeTest.cpp
new file mode 100644
index 00000000..edf61b4d
--- /dev/null
+++ b/test/lock/LockPoolIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../lock/LockPool.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/lock/MutexPoolLockIncludeTest.cpp b/test/lock/MutexPoolLockIncludeTest.cpp
new file mode 100644
index 00000000..39f77710
--- /dev/null
+++ b/test/lock/MutexPoolLockIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../lock/MutexPoolLock.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/logging/LoggerIncludeTest.cpp b/test/logging/LoggerIncludeTest.cpp
new file mode 100644
index 00000000..f73edb83
--- /dev/null
+++ b/test/logging/LoggerIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../logging/Logger.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/logging/LoggingIncludeTest.cpp b/test/logging/LoggingIncludeTest.cpp
new file mode 100644
index 00000000..819e10b9
--- /dev/null
+++ b/test/logging/LoggingIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../logging/logging.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/pointer/cast_include_test.cpp b/test/pointer/cast_include_test.cpp
new file mode 100644
index 00000000..b883dafa
--- /dev/null
+++ b/test/pointer/cast_include_test.cpp
@@ -0,0 +1,3 @@
+#include "../../pointer/cast.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/pointer/optional_ownership_ptr_include_test.cpp b/test/pointer/optional_ownership_ptr_include_test.cpp
new file mode 100644
index 00000000..237ae69a
--- /dev/null
+++ b/test/pointer/optional_ownership_ptr_include_test.cpp
@@ -0,0 +1,3 @@
+#include "../../pointer/optional_ownership_ptr.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/pointer/unique_ref_boost_optional_gtest_workaround_include_test.cpp b/test/pointer/unique_ref_boost_optional_gtest_workaround_include_test.cpp
new file mode 100644
index 00000000..3e501333
--- /dev/null
+++ b/test/pointer/unique_ref_boost_optional_gtest_workaround_include_test.cpp
@@ -0,0 +1,3 @@
+#include "../../pointer/unique_ref_boost_optional_gtest_workaround.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/pointer/unique_ref_include_test.cpp b/test/pointer/unique_ref_include_test.cpp
new file mode 100644
index 00000000..c0fd2b62
--- /dev/null
+++ b/test/pointer/unique_ref_include_test.cpp
@@ -0,0 +1,3 @@
+#include "../../pointer/unique_ref.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/random/RandomPoolIncludeTest.cpp b/test/random/RandomPoolIncludeTest.cpp
new file mode 100644
index 00000000..ab75b141
--- /dev/null
+++ b/test/random/RandomPoolIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../random/RandomPool.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/tempfile/TempDirIncludeTest.cpp b/test/tempfile/TempDirIncludeTest.cpp
new file mode 100644
index 00000000..5981ad35
--- /dev/null
+++ b/test/tempfile/TempDirIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../tempfile/TempDir.h"
+
+// Test the header can be included without needing additional dependencies
diff --git a/test/tempfile/TempFileIncludeTest.cpp b/test/tempfile/TempFileIncludeTest.cpp
new file mode 100644
index 00000000..b61c2785
--- /dev/null
+++ b/test/tempfile/TempFileIncludeTest.cpp
@@ -0,0 +1,3 @@
+#include "../../tempfile/TempFile.h"
+
+// Test the header can be included without needing additional dependencies