diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h
index d6f6e3e..40ccc60 100644
--- a/include/hardware/bluetooth.h
+++ b/include/hardware/bluetooth.h
@@ -22,20 +22,12 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
-#include <hardware/hardware.h>
-
 #include <bluetooth/uuid.h>
 #include <raw_address.h>
 
 __BEGIN_DECLS
 
-/**
- * The Bluetooth Hardware Module ID
- */
-
-#define BT_HARDWARE_MODULE_ID "bluetooth"
-#define BT_STACK_MODULE_ID "bluetooth"
-
+#define BLUETOOTH_INTERFACE_STRING "bluetoothInterface"
 
 /** Bluetooth profile interface IDs */
 
@@ -592,18 +584,6 @@
     void (*interop_database_add)(uint16_t feature, const RawAddress *addr, size_t len);
 } bt_interface_t;
 
-/** TODO: Need to add APIs for Service Discovery, Service authorization and
-  *       connection management. Also need to add APIs for configuring
-  *       properties of remote bonded devices such as name, UUID etc. */
-
-typedef struct {
-    struct hw_device_t common;
-    const bt_interface_t* (*get_bluetooth_interface)();
-} bluetooth_device_t;
-
-typedef bluetooth_device_t bluetooth_module_t;
-
-
 __END_DECLS
 
 #endif /* ANDROID_INCLUDE_BLUETOOTH_H */
diff --git a/include/hardware/hardware.h b/include/hardware/hardware.h
index 5ba37e9..bf076f6 100644
--- a/include/hardware/hardware.h
+++ b/include/hardware/hardware.h
@@ -20,10 +20,8 @@
 #include <stdint.h>
 #include <sys/cdefs.h>
 
-#ifndef _HW_DONT_INCLUDE_CORE_
 #include <cutils/native_handle.h>
 #include <system/graphics.h>
-#endif // _HW_DONT_INCLUDE_CORE_
 
 __BEGIN_DECLS