diff --git a/src/Common/Debug.hpp b/src/Common/Debug.hpp
index 0632743..5ccc35a 100644
--- a/src/Common/Debug.hpp
+++ b/src/Common/Debug.hpp
@@ -27,19 +27,19 @@
 
 void trace(const char *format, ...);
 
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 	#define TRACE(format, ...) trace("[0x%0.8X]%s(" format ")\n", this, __FUNCTION__, ##__VA_ARGS__)
 #else
 	#define TRACE(...) ((void)0)
 #endif
 
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 	#define UNIMPLEMENTED() {trace("\t! Unimplemented: %s(%d)\n", __FUNCTION__, __LINE__); ASSERT(false);}
 #else
 	#define UNIMPLEMENTED() ((void)0)
 #endif
 
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 	#define ASSERT(expression) {if(!(expression)) trace("\t! Assert failed in %s(%d): " #expression "\n", __FUNCTION__, __LINE__); assert(expression);}
 #else
 	#define ASSERT assert
diff --git a/src/OpenGL/common/debug.h b/src/OpenGL/common/debug.h
index bbf7521..51957d8 100644
--- a/src/OpenGL/common/debug.h
+++ b/src/OpenGL/common/debug.h
@@ -56,7 +56,7 @@
 
 // A macro asserting a condition and outputting failures to the debug log
 #undef ASSERT
-#if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 #define ASSERT(expression) do { \
 	if(!(expression)) \
 		ERR("\t! Assert failed in %s(%d): "#expression"\n", __FUNCTION__, __LINE__); \
@@ -68,7 +68,7 @@
 
 // A macro to indicate unimplemented functionality
 #undef UNIMPLEMENTED
-#if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 #define UNIMPLEMENTED() do { \
 	FIXME("\t! Unimplemented: %s(%d)\n", __FUNCTION__, __LINE__); \
 	assert(false); \
@@ -79,7 +79,7 @@
 
 // A macro for code which is not expected to be reached under valid assumptions
 #undef UNREACHABLE
-#if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 #define UNREACHABLE(value) do { \
 	ERR("\t! Unreachable case reached: %s(%d). %s: %d\n", __FUNCTION__, __LINE__, #value, value); \
 	assert(false); \