diff --git a/headers/private/bluetooth/btDebug.h b/headers/private/bluetooth/btDebug.h
index d6af83f416..119138dc7b 100644
--- a/headers/private/bluetooth/btDebug.h
+++ b/headers/private/bluetooth/btDebug.h
@@ -37,15 +37,6 @@
 #pragma mark - Kernel Auxiliary Stuff -
 #endif
 
-/* tricking bits */
-#define SET_BIT(byte,bit_mask)			{byte|=bit_mask;}
-#define CLEAR_BIT(byte,bit_mask)		{byte&=~bit_mask;}
-#define GET_BIT(byte,bit_mask)			((byte&bit_mask)!=0)
-#define TOOGLE_BIT(byte,bit_mask)		{byte^=bit_mask;}
-
-//#define TEST_AND_SET(byte,bit_mask)     (((byte|=bit_mask)&bit_mask)!=0) 
-//#define TEST_AND_CLEAR(byte,bit_mask)   (((byte&=~bit_mask)&bit_mask)!=0) 
-
 static inline uint32 TEST_AND_SET(uint32 *byte, uint32 bit_mask) {
 
 	uint32 val = (*byte&bit_mask)!=0;
diff --git a/headers/private/kernel/kernel.h b/headers/private/kernel/kernel.h
index c77719bb99..07273e6565 100644
--- a/headers/private/kernel/kernel.h
+++ b/headers/private/kernel/kernel.h
@@ -70,6 +70,9 @@
 #define CHECK_BIT(a, b) ((a) & (1 << (b)))
 #define SET_BIT(a, b) ((a) | (1 << (b)))
 #define CLEAR_BIT(a, b) ((a) & (~(1 << (b))))
+#define GET_BIT(a, b) ((a & b) != 0)
+#define TOOGLE_BIT(a, b) (a ^= b)
+
 
 /* during kernel startup, interrupts are disabled (among other things) */
 extern bool gKernelStartup;
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/Jamfile b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/Jamfile
index 5f105245bc..a295d2f4b0 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/Jamfile
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/Jamfile
@@ -3,6 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers bluetooth h2 h2generic ;
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders net kernel bluetooth ;
+UsePrivateKernelHeaders ;
 
 local r5_src =  ;
 if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
index 88366928e5..3c0aecf883 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include <kernel.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.cpp b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.cpp
index 8f75e48b4d..088ffbad69 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.cpp
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.cpp
@@ -15,6 +15,7 @@
 
 #include <ByteOrder.h>
 
+#include <kernel.h>
 #include <string.h>
 
 //#define DUMP_BUFFERS
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.cpp b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.cpp
index ac4ebb9479..fac20e09cd 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.cpp
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.cpp
@@ -8,6 +8,7 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/HCI/btHCI_transport.h>
+#include <kernel.h>
 
 #include "h2generic.h"
 #include "h2upper.h"