Index: branches/ErmaC/Enoch/i386/libsaio/xml.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/xml.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/xml.c	(revision 2853)
@@ -22,15 +22,12 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+#include "config.h"
 #include "bootstruct.h"
 #include "libsaio.h"
 #include "sl.h"
 #include "xml.h"
 
-#ifndef DEBUG_XML
-	#define DEBUG_XML 0
-#endif
-
 #if DEBUG_XML
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/exfat.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/exfat.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/exfat.c	(revision 2853)
@@ -35,6 +35,7 @@
  * from similar ntfs.c funcs as fallback (if not NTFS, maybe it's EXFAT).
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "sl.h"
 
@@ -42,9 +43,6 @@
 #pragma mark Preprocessor Definitions
 #pragma mark -
 
-#ifndef DEBUG_EXFAT
-	#define DEBUG_EXFAT 0
-#endif
 
 #if DEBUG_EXFAT
 	#define DBG(x...)		printf(x)
Index: branches/ErmaC/Enoch/i386/libsaio/bootstruct.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/bootstruct.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/bootstruct.c	(revision 2853)
@@ -26,14 +26,11 @@
  * All rights reserved.
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
 
-#ifndef DEBUG_BOOTSTRUCT
-	#define DEBUG_BOOTSTRUCT 0
-#endif
-
 #if DEBUG_BOOTSTRUCT
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/acpi_patcher.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/acpi_patcher.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/acpi_patcher.c	(revision 2853)
@@ -3,6 +3,7 @@
  * 2010 mojodojo, 2012 slice
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
@@ -15,10 +16,6 @@
 #include "aml_generator.h"
 #include "state_generator.h"
 
-#ifndef DEBUG_ACPI
-	#define DEBUG_ACPI 0
-#endif
-
 #if DEBUG_ACPI==2
 	#define DBG(x...)  {printf(x); sleep(1);}
 #elif DEBUG_ACPI==1
Index: branches/ErmaC/Enoch/i386/libsaio/spd.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/spd.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/spd.c	(revision 2853)
@@ -6,6 +6,7 @@
  * System profiler fix and other fixes by Mozodojo.
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "pci.h"
 #include "platform.h"
@@ -15,10 +16,6 @@
 #include "bootstruct.h"
 #include "memvendors.h"
 
-#ifndef DEBUG_SPD
-	#define DEBUG_SPD 0
-#endif
-
 #if DEBUG_SPD
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/pci_root.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/pci_root.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/pci_root.c	(revision 2853)
@@ -2,14 +2,11 @@
  * Copyright 2009 netkas
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
 
-#ifndef DEBUG_PCIROOT
-#define DEBUG_PCIROOT 1
-#endif
-
 #if DEBUG_PCIROOT
 #define DBG(x...)  printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/usb.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/usb.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/usb.c	(revision 2853)
@@ -7,15 +7,12 @@
  *
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "pci.h"
 
-#ifndef DEBUG_USB
-	#define DEBUG_USB 0
-#endif
-
 #if DEBUG_USB
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/device_inject.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/device_inject.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/device_inject.c	(revision 2853)
@@ -5,6 +5,7 @@
  *	Cleaned and merged by iNDi
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
@@ -13,10 +14,6 @@
 #include "device_inject.h"
 #include "convert.h"
 
-#ifndef DEBUG_INJECT
-	#define DEBUG_INJECT 0
-#endif
-
 #if DEBUG_INJECT
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/dram_controllers.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/dram_controllers.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/dram_controllers.c	(revision 2853)
@@ -13,16 +13,13 @@
  * http://www.canardpc.com - http://www.memtest.org
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "bootstruct.h"
 #include "pci.h"
 #include "platform.h"
 #include "dram_controllers.h"
 
-#ifndef DEBUG_DRAM
-	#define DEBUG_DRAM 0
-#endif
-
 #if DEBUG_DRAM
 	#define DBG(x...) printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/pci_setup.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/pci_setup.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/pci_setup.c	(revision 2853)
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
@@ -4,10 +5,6 @@
 #include "pci.h"
 #include "modules.h"
 
-#ifndef DEBUG_PCI_SETUP
-	#define DEBUG_PCI_SETUP 0
-#endif
-
 #if DEBUG_PCI_SETUP
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/smbios.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/smbios.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/smbios.c	(revision 2853)
@@ -5,17 +5,13 @@
  *
  */
 
-
+#include "config.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "smbios_getters.h"
 // Bungo
 #include "convert.h"
 
-#ifndef DEBUG_SMBIOS
-    #define DEBUG_SMBIOS 0
-#endif
-
 #if DEBUG_SMBIOS
     #define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/smbios_decode.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/smbios_decode.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/smbios_decode.c	(revision 2853)
@@ -5,20 +5,17 @@
  *
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "smbios.h"
 // Bungo:
 #include "boot.h"
 #include "bootstruct.h"
 
-#ifndef DEBUG_SMBIOS
-#define DEBUG_SMBIOS 0
-#endif
-
 #if DEBUG_SMBIOS
-#define DBG(x...)	printf(x)
+	#define DBG(x...)	printf(x)
 #else
-#define DBG(x...)	msglog(x)
+	#define DBG(x...)	msglog(x)
 #endif
 
 extern char *getSMBStringForField(SMBStructHeader *structHeader, uint8_t field);
Index: branches/ErmaC/Enoch/i386/libsaio/hpet.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/hpet.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/hpet.c	(revision 2853)
@@ -6,14 +6,11 @@
  * High Precision Event Timer (HPET)
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "pci.h"
 #include "hpet.h"
 
-#ifndef DEBUG_HPET
-	#define DEBUG_HPET 0
-#endif
-
 #if DEBUG_HPET
 	#define DBG(x...) printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/biosfn.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/biosfn.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/biosfn.c	(revision 2853)
@@ -40,14 +40,11 @@
     - Added ebiosEjectMedia
  */
 
+#include "config.h"
 #include "bootstruct.h"
 #include "libsaio.h"
 
 
-#ifndef MEMRANGE
-	#define MEMRANGE 1
-#endif
-
 #if MEMRANGE
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/libsaio/state_generator.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/state_generator.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/state_generator.c	(revision 2853)
@@ -9,6 +9,7 @@
  *
  */
 
+#include "config.h"
 #include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
@@ -21,16 +22,12 @@
 #include "aml_generator.h"
 #include "state_generator.h"
 
-#ifndef DEBUG_STATE
-#define DEBUG_STATE 0
-#endif
-
 #if DEBUG_STATE==2
 #define DBG(x...)  {printf(x); sleep(1);}
 #elif DEBUG_STATE==1
-#define DBG(x...)  printf(x)
+	#define DBG(x...)  printf(x)
 #else
-#define DBG(x...)  msglog(x)
+	#define DBG(x...)  msglog(x)
 #endif
 
 uint8_t acpi_cpu_count	= 0;
Index: branches/ErmaC/Enoch/i386/libsaio/fake_efi.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/fake_efi.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/libsaio/fake_efi.c	(revision 2853)
@@ -2,6 +2,8 @@
 /*
  * Copyright 2007 David F. Elliott.	 All rights reserved.
  */
+
+#include "config.h"
 #include "saio_types.h"
 #include "libsaio.h"
 #include "boot.h"
@@ -19,14 +21,6 @@
 #include "sl.h"
 #include "vers.h"
 
-#ifndef DEBUG_EFI
-	#define DEBUG_EFI 0
-#endif
-
-#ifndef RANDOMSEED
-	#define RANDOMSEED 0
-#endif
-
 #if DEBUG_EFI
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/boot2/config.h
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/config.h	(revision 2852)
+++ branches/ErmaC/Enoch/i386/boot2/config.h	(revision 2853)
@@ -13,6 +13,15 @@
 #define DEBUG_BOOT2 0
 #define DEBUG_INTERRUPTS 0
 
+////////////////////////////////// hpet.c
+#define DEBUG_HPET 0
+
+////////////////////////////////// modules.c
+#define CONFIG_MODULE_DEBUG 0
+
+////////////////////////////////// acpi_patcher.c 0 - 1 - 2
+#define DEBUG_ACPI 0
+
 ////////////////////////////////// ati.c
 #define DEBUG_ATI 0
 
@@ -23,11 +32,56 @@
 #define DEBUG_GMA 0
 #define REPLACE_DEVICE_ID 0
 
+////////////////////////////////// usb.c
+#define DEBUG_USB 0
+
+////////////////////////////////// gui.c
+#define DEBUG_GUI 0
+
+////////////////////////////////// pci_root.c
+#define DEBUG_PCIROOT 1
+
+////////////////////////////////// pci_setup.c
+#define DEBUG_PCI_SETUP 0
+
+////////////////////////////////// smbios.c
+////////////////////////////////// smbios_decode.c
+#define DEBUG_SMBIOS 0
+
+////////////////////////////////// spd.c
+#define DEBUG_SPD 0
+
+////////////////////////////////// state_generator.c
+#define DEBUG_STATE 0
+
+////////////////////////////////// biosfn.c
+#define MEMRANGE 1
+
+////////////////////////////////// bootstruct.c
+#define DEBUG_BOOTSTRUCT 0
+
 ////////////////////////////////// cpu.c
 #define DEBUG_CPU 0
 
+////////////////////////////////// device_inject.c
+#define DEBUG_INJECT 0
+
+////////////////////////////////// dram_controllers.c
+#define DEBUG_DRAM 0
+
+////////////////////////////////// exfat.c
+#define DEBUG_EXFAT 0
+
+////////////////////////////////// fake_efi.c
+#define DEBUG_EFI 0
+#define RANDOMSEED 0
+
 ////////////////////////////////// hda.c
 #define DEBUG_HDA 0
 #define DEBUG_CODEC 0
 
+////////////////////////////////// xml.c
+#define DEBUG_XML 0
+
+
 #endif /* config_h */
Index: branches/ErmaC/Enoch/i386/boot2/modules.c
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/modules.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/boot2/modules.c	(revision 2853)
@@ -2,6 +2,8 @@
  * Copyright 2010-2015 Evan Lojewski. All rights reserved.
  *
  */
+
+#include "config.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "modules.h"
@@ -12,11 +14,7 @@
 #include <string.h>
 
 #ifdef CONFIG_MODULES
-#ifndef CONFIG_MODULE_DEBUG
-#define CONFIG_MODULE_DEBUG 0
-#endif
 
-
 #if CONFIG_MODULE_DEBUG
 #define DBG(x...)	printf(x)
 #define DBGPAUSE()	getchar()
Index: branches/ErmaC/Enoch/i386/boot2/gui.c
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/gui.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/boot2/gui.c	(revision 2853)
@@ -8,15 +8,12 @@
  *
  */
 
+#include "config.h"
 #include "gui.h"
 #include "term.h"
 #include "appleboot.h"
 #include "vers.h"
 
-#ifndef DEBUG_GUI
-	#define DEBUG_GUI 0
-#endif
-
 #if DEBUG_GUI
 	#define DBG(x...)	printf(x)
 #else
Index: branches/ErmaC/Enoch/i386/boot2/options.c
===================================================================
--- branches/ErmaC/Enoch/i386/boot2/options.c	(revision 2852)
+++ branches/ErmaC/Enoch/i386/boot2/options.c	(revision 2853)
@@ -33,9 +33,9 @@
 #include "modules.h"
 
 #if DEBUG
-#define DBG(x...)	printf(x)
+	#define DBG(x...)	printf(x)
 #else
-#define DBG(x...)	msglog(x)
+	#define DBG(x...)	msglog(x)
 #endif
 
 char		gMacOSVersion[OSVERSTRLEN];
Index: branches/ErmaC/Enoch/package/po/it.po
===================================================================
--- branches/ErmaC/Enoch/package/po/it.po	(revision 2852)
+++ branches/ErmaC/Enoch/package/po/it.po	(revision 2853)
@@ -3600,7 +3600,7 @@
 #~ msgstr "Intel Azul AAPL,ig-platform-id"
 
 #~ msgid "Set one AAPL,ig-platform-id to use for your Intel HD5000."
-#~ msgstr "Scegli un AAPL,ig-platform-id da usare per la tua Intel HD5000."
+#~ msgstr "Scegli un AAPL,ig-platform-id da usare per la tua Intel HD 5000."
 
 #~ msgid "Set 0000260c for Intel HD5000 (Mobile) AAPL,ig-platform-id."
 #~ msgstr "Imposta l'AAPL,ig-platform-id a 0000260c per schede grafiche Intel HD5000 (Mobile)."