diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 15322be6..17dbca8c 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -39,6 +39,7 @@ SET(CORE_INC_FILES
 	PolyVox/DefaultIsQuadNeeded.h
 	PolyVox/DefaultMarchingCubesController.h
 	PolyVox/Density.h
+	PolyVox/Exceptions.h
 	PolyVox/FilePager.h
 	PolyVox/GradientEstimators.h
 	PolyVox/GradientEstimators.inl
@@ -79,10 +80,12 @@ SET(CORE_INC_FILES
 )
 
 SET(IMPL_INC_FILES
+	PolyVox/Impl/Assertions.h
 	PolyVox/Impl/AStarPathfinderImpl.h
     PolyVox/Impl/Config.h
 	PolyVox/Impl/ErrorHandling.h
-	PolyVox/Impl/Logging.h
+	PolyVox/Impl/ExceptionsImpl.h
+	PolyVox/Impl/LoggingImpl.h
 	PolyVox/Impl/MarchingCubesTables.h
 	PolyVox/Impl/PlatformDefinitions.h
 	PolyVox/Impl/RandomUnitVectors.h
diff --git a/include/PolyVox/Impl/Assertions.h b/include/PolyVox/Impl/Assertions.h
index e58ca272..be2b7ee5 100644
--- a/include/PolyVox/Impl/Assertions.h
+++ b/include/PolyVox/Impl/Assertions.h
@@ -25,7 +25,7 @@ distribution.
 #define __PolyVox_Assertions_H__
 
 #include "PolyVox/Impl/Config.h"
-#include "PolyVox/Impl/Logging.h" // Asserts can log when they fire.
+#include "PolyVox/Impl/LoggingImpl.h" // Asserts can log when they fire.
 
 // The code below implements a custom assert function called POLYVOX_ASSERT which has a number of advantages compared
 // to the standard C/C++ assert(). It is inspired by http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/
diff --git a/include/PolyVox/Impl/ErrorHandling.h b/include/PolyVox/Impl/ErrorHandling.h
index 912d6002..e3e20341 100644
--- a/include/PolyVox/Impl/ErrorHandling.h
+++ b/include/PolyVox/Impl/ErrorHandling.h
@@ -27,6 +27,6 @@ freely, subject to the following restrictions:
 
 #include "PolyVox/Impl/Assertions.h"
 #include "PolyVox/Impl/ExceptionsImpl.h"
-#include "PolyVox/Impl/Logging.h"
+#include "PolyVox/Impl/LoggingImpl.h"
 
 #endif //__PolyVox_ErrorHandling_H__
diff --git a/include/PolyVox/Impl/ExceptionsImpl.h b/include/PolyVox/Impl/ExceptionsImpl.h
index 45f3a6fb..c552d8cc 100644
--- a/include/PolyVox/Impl/ExceptionsImpl.h
+++ b/include/PolyVox/Impl/ExceptionsImpl.h
@@ -27,7 +27,7 @@ distribution.
 #include "PolyVox/Exceptions.h"
 
 #include "PolyVox/Impl/Config.h"
-#include "PolyVox/Impl/Logging.h" // Exceptions can log when they are thrown.
+#include "PolyVox/Impl/LoggingImpl.h" // Exceptions can log when they are thrown.
 
 #include <cstdlib>  // For std::exit
 #include <iostream> // For std::cerr
diff --git a/include/PolyVox/Impl/Logging.h b/include/PolyVox/Impl/LoggingImpl.h
similarity index 100%
rename from include/PolyVox/Impl/Logging.h
rename to include/PolyVox/Impl/LoggingImpl.h