diff --git a/include/Types.h b/include/Types.h
index bad93cc..22fb147 100644
--- a/include/Types.h
+++ b/include/Types.h
@@ -2,15 +2,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <assert.h>
-
-#ifdef __cplusplus
-    template <class Out, class In>
-    Out safe_cast(In in) {
-        assert(in);
-        return reinterpret_cast<Out>(in);
-    }
-#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/Cast.hpp b/src/Cast.hpp
new file mode 100644
index 0000000..ddcefdf
--- /dev/null
+++ b/src/Cast.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <assert.h>
+
+template <class Out, class In>
+Out safe_cast(In in) {
+    assert(in);
+    return reinterpret_cast<Out>(in);
+}
diff --git a/src/Player.cpp b/src/Player.cpp
index 2db35fd..a071f63 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -5,7 +5,7 @@
 #include <BWAPI/TechType.h>
 #include <BWAPI/Color.h>
 
-#include <Types.h>
+#include "Cast.hpp"
 
 namespace BWAPI {
     typedef const PlayerInterface* ConstPlayer;