Index: branches/ErmaC/Enoch/i386/libsaio/gma.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/gma.c	(revision 2851)
+++ branches/ErmaC/Enoch/i386/libsaio/gma.c	(revision 2852)
@@ -33,6 +33,7 @@
 	- http://www.insanelymac.com/forum/topic/288241-intel-hd4000-inject-aaplig-platform-id/
 */
 
+#include "config.h"
 #include "libsa.h"
 #include "saio_internal.h"
 #include "bootstruct.h"
@@ -44,14 +45,6 @@
 #include "vbe.h"
 #include "graphics.h"
 
-#ifndef DEBUG_GMA
-	#define DEBUG_GMA 0
-#endif
-
-#ifndef REPLACE_DEVICE_ID
-	#define REPLACE_DEVICE_ID 0
-#endif
-
 #if DEBUG_GMA
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/nvidia.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/nvidia.c	(revision 2851)
+++ branches/ErmaC/Enoch/i386/libsaio/nvidia.c	(revision 2852)
@@ -47,6 +47,7 @@
  *	SOFTWARE.
  */
 
+#include "config.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "pci.h"
@@ -56,10 +57,6 @@
 #include "nvidia.h"
 #include "nvidia_helper.h"
 
-#ifndef DEBUG_NVIDIA
-	#define DEBUG_NVIDIA 0
-#endif
-
 #if DEBUG_NVIDIA
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/ati.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/ati.c	(revision 2851)
+++ branches/ErmaC/Enoch/i386/libsaio/ati.c	(revision 2852)
@@ -5,13 +5,10 @@
  *
  */
 
+#include "config.h"
 #include "ati.h"
 #include "convert.h"
 
-#ifndef DEBUG_ATI
-	#define DEBUG_ATI 0
-#endif
-
 #if DEBUG_ATI
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/boot2/config.h
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/config.h	(revision 2851)
+++ branches/ErmaC/Enoch/i386/boot2/config.h	(revision 2852)
@@ -13,6 +13,16 @@
 #define DEBUG_BOOT2 0
 #define DEBUG_INTERRUPTS 0
 
+////////////////////////////////// ati.c
+#define DEBUG_ATI 0
+
+////////////////////////////////// nvidia.c
+#define DEBUG_NVIDIA 0
+
+////////////////////////////////// gma.c
+#define DEBUG_GMA 0
+#define REPLACE_DEVICE_ID 0
+
 ////////////////////////////////// cpu.c
 #define DEBUG_CPU 0