diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 6fcada5d26..145999e2a6 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -275,10 +275,8 @@ SetIncludePropertiesVariables HAIKU ;
 HAIKU_ASFLAGS = ;
 
 # C/C++ flags
-HAIKU_KERNEL_CCFLAGS += -finline -fno-builtin
-	-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) ;
-HAIKU_KERNEL_C++FLAGS += -finline -fno-builtin -fno-exceptions
-	-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) ;
+HAIKU_KERNEL_CCFLAGS += -finline -fno-builtin ;
+HAIKU_KERNEL_C++FLAGS += -finline -fno-builtin -fno-exceptions ;
 HAIKU_KERNEL_DEFINES += _KERNEL_MODE ;
 
 if $(HAIKU_GCC_VERSION[1]) >= 3 {
@@ -561,9 +559,9 @@ if $(HOST_PLATFORM) != cygwin {
 }
 
 HOST_KERNEL_CCFLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
-	-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
+	-D_KERNEL_MODE ;
 HOST_KERNEL_C++FLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
-	-fno-exceptions -DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
+	-fno-exceptions -D_KERNEL_MODE ;
 HOST_KERNEL_DEFINES += _KERNEL_MODE ;
 
 HOST_KERNEL_PIC_CCFLAGS = -fno-pic ;
diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage
index 9740d56b53..c3ca520767 100644
--- a/build/jam/FloppyBootImage
+++ b/build/jam/FloppyBootImage
@@ -12,7 +12,7 @@ if $(TARGET_ARCH) = x86 {
 }
 
 local GPL_ONLY = ;
-if $(INCLUDE_GPL_ADDONS) = 1 {
+if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
 	GPL_ONLY = "" ;
 }
 
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 3a7fb2e1d7..8cf203141e 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -14,7 +14,7 @@ if $(TARGET_ARCH) = x86 {
 }
 
 local GPL_ONLY = ;
-if $(INCLUDE_GPL_ADDONS) = 1 {
+if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
 	GPL_ONLY = "" ;
 }
 
@@ -164,7 +164,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
 	pegasus $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900
 	$(X86_ONLY)via_rhine wb840 $(X86_ONLY)ipro100 $(X86_ONLY)nforce
 	#vlance
-	$(X86_ONLY)marvell_yukon $(X86_ONLY)syskonnect $(X86_ONLY)vt612x 
+	$(X86_ONLY)marvell_yukon $(X86_ONLY)syskonnect $(X86_ONLY)vt612x
 	$(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx
 	usb_ecm usb_asix
 
diff --git a/build/jam/MiscRules b/build/jam/MiscRules
index 776b71198a..3c3571f545 100644
--- a/build/jam/MiscRules
+++ b/build/jam/MiscRules
@@ -62,7 +62,7 @@ rule SubIncludeGPL
 {
 	# SubInclude rule that can be used to conditionally include GPL licensed
 	# add-ons
-	if $(INCLUDE_GPL_ADDONS) = 1 {
+	if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
 		SubInclude $(1) ;
 	}
 }
diff --git a/build/jam/NetBootArchive b/build/jam/NetBootArchive
index 4ba98a1089..27c41f2702 100644
--- a/build/jam/NetBootArchive
+++ b/build/jam/NetBootArchive
@@ -10,7 +10,7 @@ if $(TARGET_ARCH) = x86 {
 }
 
 local GPL_ONLY = ;
-if $(INCLUDE_GPL_ADDONS) = 1 {
+if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
 	GPL_ONLY = "" ;
 }
 
diff --git a/configure b/configure
index 9669e7dbdb..664194310a 100755
--- a/configure
+++ b/configure
@@ -26,8 +26,6 @@ options:
                               To disable building the alternative libraries
                               the variable HAIKU_ADD_ALTERNATIVE_GCC_LIBS can be
                               unset in the UserBuildConfig file.
-  --bochs-debug               Enables bochs serial debug emulation (activated
-                              via kernel settings file).
   --build-cross-tools <build tools dir>
                               Assume cross compilation. <build tools dir>
                               defines the location of the build tools sources.
@@ -267,7 +265,6 @@ haikuSharedLibSupCxx=
 haikuCxxHeadersDir=
 hostGCCVersion=`gcc -dumpversion`
 hostGCCMachine=`gcc -dumpmachine`
-bochsDebug=0
 includeGPLAddOns=0
 includePatentedCode=0
 include3rdParty=0
@@ -315,7 +312,6 @@ while [ $# -gt 0 ] ; do
 			cd $currentDir
 			shift 2
 			;;
-		--bochs-debug)	bochsDebug=1; shift 1;;
 		--build-cross-tools) assertparam "$1" $#; buildCrossTools=$2; shift 2;;
 		--build-cross-tools-gcc4)
 			assertparams "$1" 2 $#
@@ -474,8 +470,7 @@ cat << EOF > "$buildOutputDir/BuildConfig"
 TARGET_PLATFORM 			?= "${target}" ;
 HOST_PLATFORM				?= "${buildPlatform}" ;
 
-BOCHS_DEBUG_HACK					?= "${bochsDebug}" ;
-INCLUDE_GPL_ADDONS					?= "${includeGPLAddOns}" ;
+HAIKU_INCLUDE_GPL_ADDONS			?= "${includeGPLAddOns}" ;
 HAIKU_INCLUDE_PATENTED_CODE			?= "${includePatentedCode}" ;
 HAIKU_INCLUDE_3RDPARTY				?= "${include3rdParty}" ;
 HAIKU_ENABLE_MULTIUSER				?= "${enableMultiuser}" ;
diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile
index a433dbb42a..cc7672fe14 100644
--- a/src/add-ons/media/plugins/ffmpeg/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -87,7 +87,7 @@ if $(TARGET_ARCH) = x86 {
 	HAIKU_FFMPEG_DEFINES += HAVE_VIS=1 ;
 }
 
-if $(INCLUDE_GPL_ADDONS) = 1 {
+if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
 	HAIKU_FFMPEG_DEFINES += CONFIG_GPL=1 ;
 } else {
 	HAIKU_FFMPEG_DEFINES += CONFIG_GPL=0 ;
diff --git a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
index 038bafe11d..072a392d39 100644
--- a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
@@ -33,7 +33,7 @@ if $(HAIKU_FFMPEG_USE_MMX) = 1 {
 		fft_mmx.nasm
 		dsputil_yasm.nasm
 	;
-	if $(INCLUDE_GPL_ADDONS) = 1 {
+	if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
 		mmxSources +=
 			idct_mmx.c
 		;
@@ -49,7 +49,7 @@ if $(HAIKU_FFMPEG_USE_SSSE3) = 1 {
 		vp3dsp_sse2.c
 		vp6dsp_sse2.c
 	;
-	if $(INCLUDE_GPL_ADDONS) = 1 {
+	if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
 		sseSources +=
 			h264_idct_sse2.nasm
 			h264_deblock_sse2.nasm
diff --git a/src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile b/src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile
index 6b042a0cb0..e8a65761fa 100644
--- a/src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile
@@ -12,7 +12,7 @@ local archSources ;
 archSources = ;
 
 if $(TARGET_ARCH) = x86 {
-	if $(INCLUDE_GPL_ADDONS) = 1 {
+	if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
 		archSources += yuv2rgb_mmx.c ;
 		SubDirHdrs [ FDirName $(SUBDIR) $(TARGET_ARCH) ] ;
 	}
diff --git a/src/system/kernel/arch/x86/arch_debug_console.cpp b/src/system/kernel/arch/x86/arch_debug_console.cpp
index cf782c106d..d165b8a721 100644
--- a/src/system/kernel/arch/x86/arch_debug_console.cpp
+++ b/src/system/kernel/arch/x86/arch_debug_console.cpp
@@ -23,16 +23,6 @@
 #include <stdlib.h>
 
 
-/* If you've enabled Bochs debug output in the kernel driver
- * settings and has defined this, serial debug output will be
- * disabled and redirected to Bochs.
- * Define this only if not used as compile parameter.
- */
-#ifndef BOCHS_DEBUG_HACK
-#	define BOCHS_DEBUG_HACK 0
-#endif
-
-
 enum serial_register_offsets {
 	SERIAL_TRANSMIT_BUFFER		= 0,
 	SERIAL_RECEIVE_BUFFER		= 0,
@@ -74,9 +64,6 @@ static uint16 sSerialBasePort = 0x3f8;
 	// COM1 is the default debug output port
 
 static bool sKeyboardHandlerInstalled = false;
-#if BOCHS_DEBUG_HACK
-static bool sBochsOutput = false;
-#endif
 
 static spinlock sSerialOutputSpinlock = B_SPINLOCK_INITIALIZER;
 
@@ -84,13 +71,6 @@ static spinlock sSerialOutputSpinlock = B_SPINLOCK_INITIALIZER;
 static void
 put_char(const char c)
 {
-#if BOCHS_DEBUG_HACK
-	if (sBochsOutput) {
-		out8(c, 0xe9);
-		return;
-	}
-#endif
-
 	// wait until the transmitter empty bit is set
 	while ((in8(sSerialBasePort + SERIAL_LINE_STATUS) & 0x20) == 0)
 		asm volatile ("pause;");
@@ -319,11 +299,6 @@ arch_debug_blue_screen_getchar(void)
 char
 arch_debug_serial_getchar(void)
 {
-#if BOCHS_DEBUG_HACK
-	if (sBochsOutput)
-		return arch_debug_blue_screen_getchar();
-#endif
-
 	while ((in8(sSerialBasePort + SERIAL_LINE_STATUS) & 0x1) == 0)
 		asm volatile ("pause;");
 
@@ -419,12 +394,8 @@ arch_debug_console_init_settings(kernel_args *args)
 	// get debug settings
 	handle = load_driver_settings("kernel");
 	if (handle != NULL) {
-		const char *value;
-
-#if BOCHS_DEBUG_HACK
-		sBochsOutput = get_driver_boolean_parameter(handle, "bochs_debug_output", false, false);
-#endif
-		value = get_driver_parameter(handle, "serial_debug_port", NULL, NULL);
+		const char *value = get_driver_parameter(handle, "serial_debug_port",
+			NULL, NULL);
 		if (value != NULL) {
 			int32 number = strtol(value, NULL, 0);
 			if (number >= MAX_SERIAL_PORTS) {