diff --git a/CMakeLists.txt b/CMakeLists.txt
index 211bfd9d..4e0cb755 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,7 +170,6 @@ set(INTERNAL_HEADERS
         ${HEADER_DIR}/internal/catch_section_info.h
         ${HEADER_DIR}/internal/catch_startup_exception_registry.h
         ${HEADER_DIR}/internal/catch_stream.h
-        ${HEADER_DIR}/internal/catch_stream.hpp
         ${HEADER_DIR}/internal/catch_streambuf.h
         ${HEADER_DIR}/internal/catch_string.h
         ${HEADER_DIR}/internal/catch_stringbuilder.h
@@ -224,6 +223,7 @@ set(IMPL_SOURCES
         ${HEADER_DIR}/internal/catch_section.cpp
         ${HEADER_DIR}/internal/catch_section_info.cpp
         ${HEADER_DIR}/internal/catch_startup_exception_registry.cpp
+        ${HEADER_DIR}/internal/catch_stream.cpp
         ${HEADER_DIR}/internal/catch_string.cpp
         ${HEADER_DIR}/internal/catch_stringbuilder.cpp
         ${HEADER_DIR}/internal/catch_stringdata.cpp
diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp
index 03fa6e46..0d846e1d 100644
--- a/include/internal/catch_impl.hpp
+++ b/include/internal/catch_impl.hpp
@@ -29,7 +29,6 @@
 
 
 #include "../catch_session.hpp"
-#include "catch_stream.hpp"
 #include "catch_test_spec.hpp"
 #include "catch_test_case_tracker.hpp"
 
diff --git a/include/internal/catch_stream.hpp b/include/internal/catch_stream.cpp
similarity index 94%
rename from include/internal/catch_stream.hpp
rename to include/internal/catch_stream.cpp
index dbcda110..81dbdd47 100644
--- a/include/internal/catch_stream.hpp
+++ b/include/internal/catch_stream.cpp
@@ -6,8 +6,6 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
-#ifndef TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED
 
 #include "catch_common.h"
 #include "catch_enforce.h"
@@ -106,5 +104,3 @@ namespace Catch {
     }
 #endif
 }
-
-#endif // TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED