legacy: Re-include stack/pan

Bug: 197478351
Tag: #refactor
Test: gd/cert/run

Change-Id: Ic2242aa8981572c190039046466e6527cedeab63

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;
 

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

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;
 

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 */