diff --git a/src/Makefile.am b/src/Makefile.am
index 3b573a3b..1b07c773 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 noinst_LIBRARIES = liblol.a
 
 liblol_a_SOURCES = \
-    core.h tiler.cpp tiler.h dict.cpp dict.h debug/debug.h \
+    core.h tiler.cpp tiler.h dict.cpp dict.h \
     audio.cpp audio.h scene.cpp scene.h font.cpp font.h layer.cpp layer.h \
     map.cpp map.h entity.cpp entity.h ticker.cpp ticker.h lolgl.h \
     tileset.cpp tileset.h forge.cpp forge.h video.cpp video.h log.cpp log.h \
@@ -12,7 +12,7 @@ liblol_a_SOURCES = \
     worldentity.cpp worldentity.h gradient.cpp gradient.h \
     platform.cpp platform.h sprite.cpp sprite.h \
     \
-    lol/unit.h \
+    lol/unit.h lol/debug.h \
     lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
     \
     application/application.cpp application/application.h \
diff --git a/src/core.h b/src/core.h
index 5569bf33..6331ad4b 100644
--- a/src/core.h
+++ b/src/core.h
@@ -62,6 +62,7 @@ static inline int isnan(float f)
 #endif
 
 // Base types
+#include "lol/debug.h"
 #include "math/trig.h"
 #include "lol/math/half.h"
 #include "lol/math/real.h"
@@ -71,7 +72,6 @@ static inline int isnan(float f)
 #include "thread/thread.h"
 
 // Static classes
-#include "debug/debug.h"
 #include "log.h"
 #include "platform.h"
 #include "video.h"
diff --git a/src/debug/debug.h b/src/lol/debug.h
similarity index 91%
rename from src/debug/debug.h
rename to src/lol/debug.h
index 521c907f..db9476f8 100644
--- a/src/debug/debug.h
+++ b/src/lol/debug.h
@@ -21,9 +21,9 @@
 namespace lol
 {
 
-static void Abort()
+static inline void Abort()
 {
-    *(int *)NULL = 0;
+    *(int *)0 = 0xdead;
 }
 
 } /* namespace lol */
diff --git a/win32/lolcore.vcxproj b/win32/lolcore.vcxproj
index 9523acb0..233b2344 100644
--- a/win32/lolcore.vcxproj
+++ b/win32/lolcore.vcxproj
@@ -133,7 +133,6 @@
     <ClInclude Include="..\src\debug\record.h" />
     <ClInclude Include="..\src\debug\sphere.h" />
     <ClInclude Include="..\src\debug\stats.h" />
-    <ClInclude Include="..\src\debug\debug.h" />
     <ClInclude Include="..\src\dict.h" />
     <ClInclude Include="..\src\eglapp.h" />
     <ClInclude Include="..\src\emitter.h" />
@@ -152,6 +151,7 @@
     <ClInclude Include="..\src\log.h" />
     <ClInclude Include="..\src\loldebug.h" />
     <ClInclude Include="..\src\lolgl.h" />
+    <ClInclude Include="..\src\lol\debug.h" />
     <ClInclude Include="..\src\lol\math\half.h" />
     <ClInclude Include="..\src\lol\math\real.h" />
     <ClInclude Include="..\src\lol\math\remez.h" />