diff --git a/bluetooth/include/bdroid_buildcfg.h b/bluetooth/include/bdroid_buildcfg.h
index 931b0e4..2c71801 100644
--- a/bluetooth/include/bdroid_buildcfg.h
+++ b/bluetooth/include/bdroid_buildcfg.h
@@ -23,11 +23,17 @@
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
 
-#pragma push_macro("PROPERTY_VALUE_MAX")
-
-#include <cutils/properties.h>
+#include <stdint.h>
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+int property_get(const char *key, char *value, const char *default_value);
+#ifdef __cplusplus
+}
+#endif
+
 #include "osi/include/osi.h"
 
 typedef struct {
@@ -40,7 +46,7 @@ static const device_t devices[] = {
 
 static inline const char *BtmGetDefaultName()
 {
-    char product_device[PROPERTY_VALUE_MAX];
+    char product_device[92];
     property_get("ro.product.device", product_device, "");
 
     for (unsigned int i = 0; i < ARRAY_SIZE(devices); i++) {
@@ -65,6 +71,4 @@ static inline const char *BtmGetDefaultName()
 #define BT_CLEAN_TURN_ON_DISABLED 1
 #define AVDT_NUM_SEPS 35
 
-#pragma pop_macro("PROPERTY_VALUE_MAX")
-
 #endif