diff --git a/system/stack/include/a2dp_api.h b/system/stack/include/a2dp_api.h
index 56e259c8c2a193125d8583ef19af7c3b51f8e2b3..c11889b8ad7b27082029f117e5eb52038ade98e9 100644
--- a/system/stack/include/a2dp_api.h
+++ b/system/stack/include/a2dp_api.h
@@ -23,11 +23,12 @@
 #ifndef A2DP_API_H
 #define A2DP_API_H
 
-#include <inttypes.h>
+#include <cstdint>
 
-#include "a2dp_constants.h"
-#include "a2dp_error_codes.h"
-#include "sdp_api.h"
+#include "stack/include/a2dp_constants.h"
+#include "stack/include/a2dp_error_codes.h"
+#include "stack/include/sdp_api.h"
+#include "types/raw_address.h"
 
 /*****************************************************************************
  *  constants
diff --git a/system/stack/include/avrc_api.h b/system/stack/include/avrc_api.h
index 7796ae0b65d3c56b9cf0102eab2fea31901b9fcf..825a05fb951f5b7bdcbfaaa14ec7902d7c191813 100644
--- a/system/stack/include/avrc_api.h
+++ b/system/stack/include/avrc_api.h
@@ -24,13 +24,13 @@
 #ifndef AVRC_API_H
 #define AVRC_API_H
 
-#include "avct_api.h"
-#include "avrc_defs.h"
-#include "bt_target.h"
-#include "sdp_api.h"
-
 #include <base/callback.h>
 
+#include "bt_target.h"
+#include "stack/include/avct_api.h"
+#include "stack/include/avrc_defs.h"
+#include "stack/include/sdp_api.h"
+
 /*****************************************************************************
  *  constants
  ****************************************************************************/
diff --git a/system/stack/include/hidd_api.h b/system/stack/include/hidd_api.h
index 90a8bc1a0b28d029aafc5ba06ec876906adf2121..e0d55243cf91c4eb537eda1c167770f8635940e4 100644
--- a/system/stack/include/hidd_api.h
+++ b/system/stack/include/hidd_api.h
@@ -19,8 +19,8 @@
 #ifndef HIDD_API_H
 #define HIDD_API_H
 
-#include "hiddefs.h"
-#include "sdp_api.h"
+#include "stack/include/hiddefs.h"
+#include "stack/include/sdp_api.h"
 
 /*****************************************************************************
  *  Type Definitions
diff --git a/system/stack/include/hiddefs.h b/system/stack/include/hiddefs.h
index 6657bda39febcba632fc2a97951d96e85acec4e5..0fd78f931eeb0b74450a4446c6a7ac7e653ca391 100644
--- a/system/stack/include/hiddefs.h
+++ b/system/stack/include/hiddefs.h
@@ -25,9 +25,9 @@
 #ifndef HIDDEFS_H
 #define HIDDEFS_H
 
-#include <string>
+#include <cstring>
 
-#include "sdp_api.h"
+#include "stack/include/sdp_api.h"
 /*
  * tHID_STATUS: HID result codes, returned by HID and device and host functions.
 */
diff --git a/system/stack/include/hidh_api.h b/system/stack/include/hidh_api.h
index 71a053382354e155ff4e6d2e2a28333b84a28d8a..b6cf80b53249f6bc7182ca3a03f24b232ad8fe52 100644
--- a/system/stack/include/hidh_api.h
+++ b/system/stack/include/hidh_api.h
@@ -18,8 +18,8 @@
 #ifndef HIDH_API_H
 #define HIDH_API_H
 
-#include "hiddefs.h"
-#include "sdp_api.h"
+#include "stack/include/hiddefs.h"
+#include "stack/include/sdp_api.h"
 
 /*****************************************************************************
  *  Constants