diff --git a/src/gu/Makefile.am b/src/gu/Makefile.am
index f0389db4..80fd80e7 100644
--- a/src/gu/Makefile.am
+++ b/src/gu/Makefile.am
@@ -12,10 +12,11 @@ CFLAGS =  @PSPSDK_CFLAGS@
 libpspguincludedir = @PSPSDK_INCLUDEDIR@
 libpspguinclude_HEADERS = pspgu.h
 
-lib_LIBRARIES = libpspgu.a
+lib_LIBRARIES = libpspgu.a libpspgud.a
 
 noinst_HEADERS = guInternal.h
 
+# Regular library (no debug assertions)
 libpspgu_a_SOURCES = \
 	guInternal.c \
 	sceGuAlphaFunc.c \
@@ -112,3 +113,7 @@ libpspgu_a_SOURCES = \
 	sceGuViewport.c \
 	vram.c
 
+# Debug library (with debug assertions)
+libpspgud_a_SOURCES = $(libpspgu_a_SOURCES)
+libpspgud_a_CFLAGS = $(CFLAGS) -DGU_DEBUG
+
diff --git a/src/gu/guInternal.h b/src/gu/guInternal.h
index 019b5aa7..3d0ef7a0 100644
--- a/src/gu/guInternal.h
+++ b/src/gu/guInternal.h
@@ -11,6 +11,11 @@
 
 #include "pspgu.h"
 
+#ifdef GU_DEBUG
+#include <assert.h>
+#include <stdio.h>
+#endif
+
 typedef void (*GuCallback)(int);
 
 typedef struct