diff --git a/system/stack/pan/pan_api.cc b/system/stack/pan/pan_api.cc
index 643c181976f971d0381d9279798d76180e7a96d2..ac85dd475854370493dda600b4d1a5170cc34e92 100644
--- a/system/stack/pan/pan_api.cc
+++ b/system/stack/pan/pan_api.cc
@@ -23,19 +23,16 @@
  *
  *****************************************************************************/
 
-#include "pan_api.h"
 #include <base/logging.h>
-#include <string.h>
-#include "bnep_api.h"
-#include "bt_common.h"
-#include "bta_sys.h"
-#include "btm_api.h"
-#include "hcidefs.h"
-#include "l2c_api.h"
-#include "pan_int.h"
-#include "sdp_api.h"
-#include "sdpdefs.h"
-#include "stack/btm/btm_sec.h"
+#include <cstdint>
+
+#include "bta/sys/bta_sys.h"
+#include "osi/include/allocator.h"
+#include "stack/include/bnep_api.h"
+#include "stack/include/pan_api.h"
+#include "stack/include/sdp_api.h"
+#include "stack/include/sdpdefs.h"
+#include "stack/pan/pan_int.h"
 
 using bluetooth::Uuid;
 
diff --git a/system/stack/pan/pan_int.h b/system/stack/pan/pan_int.h
index 85581d836fc9a13cb476a2a1e87fc12a4b5aff28..40cde06395471d0fcd7893e5bd12e4e3b2c99701 100644
--- a/system/stack/pan/pan_int.h
+++ b/system/stack/pan/pan_int.h
@@ -25,7 +25,11 @@
 #ifndef PAN_INT_H
 #define PAN_INT_H
 
-#include "pan_api.h"
+#include <cstdint>
+
+#include "stack/include/pan_api.h"
+#include "types/bluetooth/uuid.h"
+#include "types/raw_address.h"
 
 /*
  * This role is used to shutdown the profile. Used internally
diff --git a/system/stack/pan/pan_main.cc b/system/stack/pan/pan_main.cc
index bacd6e1b431647ec6857619d162cb6c724198f65..f816864ebf6d31ee223dd75d7150e8148d9c014f 100644
--- a/system/stack/pan/pan_main.cc
+++ b/system/stack/pan/pan_main.cc
@@ -23,17 +23,15 @@
  *
  ******************************************************************************/
 
-#include <string.h>
-#include "bnep_api.h"
-#include "bt_common.h"
-#include "bt_utils.h"
-#include "hcidefs.h"
-#include "l2c_api.h"
-#include "osi/include/osi.h"
-#include "pan_api.h"
-#include "pan_int.h"
-#include "sdp_api.h"
-#include "sdpdefs.h"
+#include <string.h>  // memset
+
+#include <cstdint>
+
+#include "osi/include/allocator.h"
+#include "osi/include/osi.h"  // UNUSED_ATTR
+#include "stack/include/bnep_api.h"
+#include "stack/include/sdpdefs.h"
+#include "stack/pan/pan_int.h"
 
 using bluetooth::Uuid;
 
diff --git a/system/stack/pan/pan_utils.cc b/system/stack/pan/pan_utils.cc
index f2edcc84373819f30b9f0a2506d1b897b9bdc5a6..fe7038a99edb09650db139b995ae45e47f6aa06d 100644
--- a/system/stack/pan/pan_utils.cc
+++ b/system/stack/pan/pan_utils.cc
@@ -24,18 +24,11 @@
  *****************************************************************************/
 
 #include <base/logging.h>
-#include <stdio.h>
-#include <string.h>
-#include "bnep_api.h"
-#include "bt_common.h"
-#include "btm_api.h"
-#include "hcidefs.h"
-#include "l2c_api.h"
-#include "pan_api.h"
-#include "pan_int.h"
-#include "sdp_api.h"
-#include "sdpdefs.h"
-#include "stack/btm/btm_sec.h"
+#include <cstdint>
+
+#include "stack/include/sdp_api.h"
+#include "stack/pan/pan_int.h"
+#include "types/raw_address.h"
 
 static const uint8_t pan_proto_elem_data[] = {
     0x35, 0x18,       /* data element sequence of length 0x18 bytes */