1 files changed, 5 insertions, 12 deletions
diff --git a/bta/pan/bta_pan_main.cc b/bta/pan/bta_pan_main.cc
index 09df88f2e..779a8a234 100644
--- a/bta/pan/bta_pan_main.cc
+++ b/bta/pan/bta_pan_main.cc
@@ -21,21 +21,14 @@
  *  This file contains the PAN main functions and state machine.
  *
  ******************************************************************************/
+#include <cstdint>
 
-#include "bt_target.h"
+#include "bt_target.h"  // Must be first to define build configuration
 
 #if (BTA_PAN_INCLUDED == TRUE)
 
-#include <string.h>
-
-#include "bt_common.h"
-#include "bta_api.h"
-#include "bta_pan_api.h"
-#include "bta_pan_int.h"
-#include "bta_sys.h"
-#include "osi/include/osi.h"
-#include "pan_api.h"
-#include "utl.h"
+#include "bta/pan/bta_pan_int.h"
+#include "osi/include/osi.h"  // UNUSED_ATTR
 
 /*****************************************************************************
  * Constants and types
@@ -314,7 +307,7 @@ tBTA_PAN_SCB* bta_pan_scb_by_handle(uint16_t handle) {
  * Returns          void
  *
  ******************************************************************************/
-bool bta_pan_hdl_event(BT_HDR* p_msg) {
+bool bta_pan_hdl_event(BT_HDR_RIGID* p_msg) {
   tBTA_PAN_SCB* p_scb;
   bool freebuf = true;