Index: branches/ErmaC/Enoch/i386/libsaio/hda.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/hda.c	(revision 2850)
+++ branches/ErmaC/Enoch/i386/libsaio/hda.c	(revision 2851)
@@ -60,6 +60,7 @@
  *
  ******************************************************************************/
 
+#include "config.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "cpu.h"
@@ -75,20 +76,12 @@
 
 #define HEADER      __FILE__ " [" TOSTRING(__LINE__) "]: "
 
-#ifndef DEBUG_HDA
-	#define DEBUG_HDA 0
-#endif
-
 #if DEBUG_HDA
 	#define DBG(x...)  verbose(x)
 #else
 	#define DBG(x...)
 #endif
 
-#ifndef DEBUG_CODEC
-	#define DEBUG_CODEC 0
-#endif
-
 #if DEBUG_CODEC
 	#define CDBG(x...)  verbose(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/cpu.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/cpu.c	(revision 2850)
+++ branches/ErmaC/Enoch/i386/libsaio/cpu.c	(revision 2851)
@@ -4,16 +4,13 @@
  * Bronya:   2015 Improve AMD support, cleanup and bugfix
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "platform.h"
 #include "cpu.h"
 #include "bootstruct.h"
 #include "boot.h"
 
-#ifndef DEBUG_CPU
-	#define DEBUG_CPU 0
-#endif
-
 #if DEBUG_CPU
 	#define DBG(x...)		printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/boot2/config.h
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/config.h	(revision 2850)
+++ branches/ErmaC/Enoch/i386/boot2/config.h	(revision 2851)
@@ -9,5 +9,15 @@
 #ifndef config_h
 #define config_h
 
+////////////////////////////////// boot.c
+#define DEBUG_BOOT2 0
+#define DEBUG_INTERRUPTS 0
 
+////////////////////////////////// cpu.c
+#define DEBUG_CPU 0
+
+////////////////////////////////// hda.c
+#define DEBUG_HDA 0
+#define DEBUG_CODEC 0
+
 #endif /* config_h */
Index: branches/ErmaC/Enoch/i386/boot2/boot.c
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/boot.c	(revision 2850)
+++ branches/ErmaC/Enoch/i386/boot2/boot.c	(revision 2851)
@@ -45,6 +45,7 @@
  * Reworked again by Curtis Galloway (galloway@NeXT.com)
  */
 
+#include "config.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "fake_efi.h"
@@ -56,14 +57,7 @@
 #include "modules.h"
 #include "device_tree.h"
 
-#ifndef DEBUG_BOOT2
-	#define DEBUG_BOOT2 0
-#endif
 
-#ifndef DEBUG_INTERRUPTS
-	#define DEBUG_INTERRUPTS 0
-#endif
-
 #if DEBUG_BOOT2
 	#define DBG(x...)	printf(x)
 #else