diff --git a/source/system/dbg.cpp b/source/system/dbg.cpp
index 20bf98dad..99cfa58f6 100644
--- a/source/system/dbg.cpp
+++ b/source/system/dbg.cpp
@@ -231,11 +231,13 @@ char *__getDbgLineFromLog(int _line)
 #endif
 }
 
+#endif	/* DBG_ACTIVE */
 
 
 
 
 
+#ifdef __VERSION_DEBUG__
 #define OnScreenDebug
 #include "gfx\font.h"
 #include 	"system\vid.h"
@@ -290,10 +292,11 @@ void	DbgPollHost()
 #endif
 }
 
+#endif	/* __VERSION_DEBUG__ */
+
 
 
 
-#endif	/* DBG_ACTIVE */
 
 /*===========================================================================
  end */
diff --git a/source/system/dbg.h b/source/system/dbg.h
index b4b67a439..9606c08bb 100644
--- a/source/system/dbg.h
+++ b/source/system/dbg.h
@@ -26,9 +26,9 @@
 	------------------- */
 
 // Allow debug messaging
-#if defined(__VERSION_DEBUG__)
+//#if defined(__VERSION_DEBUG__)
 #define DBG_ACTIVE
-#endif
+//#endif
 
 
 // Available channels
@@ -90,10 +90,6 @@ typedef enum
 
 	#define getNumberOfDbgLinesInLog()			__getNumberOfDbgLinesInLog()
 	#define getDbgLineFromLog(_line)			__getDbgLineFromLog(_line)
-
-	void	DbgPollHost();
-	void	DoAssert(const char * Txt, const char * file, const int line);
-	#define	ASSERT(x)							if (!(x)) DoAssert(#x,__FILE__,__LINE__);
 #else
 	#define CHARLES_DBGMSG						;
 	#define DAVE_DBGMSG							;
@@ -106,7 +102,14 @@ typedef enum
 
 	#define getNumberOfDbgLinesInLog()			0
 	#define getDbgLineFromLog(_line)			NULL
+#endif
 
+
+#if defined(__VERSION_DEBUG__)
+	void	DbgPollHost();
+	void	DoAssert(const char * Txt, const char * file, const int line);
+	#define	ASSERT(x)							if (!(x)) DoAssert(#x,__FILE__,__LINE__);
+#else
 	#define	ASSERT(x)							;
 #endif