ble_mesh: Clean up included header files

components/bt/esp_ble_mesh/mesh_models/server/device_property.c

@@ -12,11 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string.h>
-#include <stdint.h>
-
-#include "mesh_types.h"
-
 #include "server_common.h"
 #include "device_property.h"
 

components/bt/esp_ble_mesh/mesh_models/server/generic_server.c

@@ -6,24 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdbool.h>
 #include <errno.h>
 
-#include "osi/mutex.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh_common.h"
-#include "mesh.h"
 #include "access.h"
-#include "model_opcode.h"
 #include "transport.h"
-
-#include "server_common.h"
-#include "state_binding.h"
+#include "model_opcode.h"
 #include "state_transition.h"
 #include "device_property.h"
 

components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h

@@ -17,10 +17,7 @@
 
 #include <string.h>
 #include <stdint.h>
-
-#include "mesh_buf.h"
 #include "mesh_access.h"
-#include "mesh_kernel.h"
 
 #define BLE_MESH_SERVER_RSP_MAX_LEN         384
 

components/bt/esp_ble_mesh/mesh_models/server/include/state_binding.h

@@ -9,6 +9,8 @@
 #ifndef _STATE_BINDING_H_
 #define _STATE_BINDING_H_
 
+#include "mesh_access.h"
+
 typedef enum {
     GENERIC_ONOFF_STATE,
     GENERIC_LEVEL_STATE,

components/bt/esp_ble_mesh/mesh_models/server/include/state_transition.h

@@ -11,6 +11,7 @@
 
 #include "server_common.h"
 #include "generic_server.h"
+#include "sensor_server.h"
 #include "lighting_server.h"
 #include "time_scene_server.h"
 

components/bt/esp_ble_mesh/mesh_models/server/include/time_scene_server.h

@@ -15,8 +15,6 @@
 #ifndef _TIME_SCENE_SERVER_H_
 #define _TIME_SCENE_SERVER_H_
 
-#include "mesh_slist.h"
-#include "mesh_kernel.h"
 #include "server_common.h"
 
 /**

components/bt/esp_ble_mesh/mesh_models/server/lighting_server.c

@@ -6,21 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <string.h>
-#include <stdbool.h>
 #include <errno.h>
 
-#include "osi/mutex.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh.h"
 #include "access.h"
+#include "transport.h"
 #include "model_opcode.h"
-
-#include "server_common.h"
-#include "state_binding.h"
 #include "state_transition.h"
 #include "device_property.h"
 

components/bt/esp_ble_mesh/mesh_models/server/sensor_server.c

@@ -12,22 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string.h>
-#include <stdbool.h>
 #include <errno.h>
 
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh.h"
 #include "access.h"
-#include "model_opcode.h"
 #include "transport.h"
-
-#include "server_common.h"
-#include "state_binding.h"
+#include "model_opcode.h"
 #include "state_transition.h"
-#include "sensor_server.h"
 #include "device_property.h"
 
 #include "btc_ble_mesh_sensor_model.h"

components/bt/esp_ble_mesh/mesh_models/server/server_common.c

@@ -12,22 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string.h>
 #include <errno.h>
-#include <stdbool.h>
 
-#include "osi/allocator.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
 #include "mesh.h"
 #include "access.h"
-#include "model_opcode.h"
-
-#include "server_common.h"
-#include "state_binding.h"
-#include "state_transition.h"
+#include "mesh_common.h"
+#include "generic_server.h"
+#include "lighting_server.h"
 
 /**
  * According to Mesh Model Spec:

components/bt/esp_ble_mesh/mesh_models/server/state_binding.c

@@ -6,22 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <string.h>
-#include <stdint.h>
 #include <errno.h>
-#include <stdbool.h>
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh.h"
 
 #include "model_opcode.h"
-#include "server_common.h"
 #include "state_binding.h"
 #include "state_transition.h"
-#include "generic_server.h"
-#include "lighting_server.h"
 
 #define MINDIFF (2.25e-308)
 

components/bt/esp_ble_mesh/mesh_models/server/state_transition.c

@@ -6,22 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <string.h>
-#include <errno.h>
-#include <stdbool.h>
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh.h"
 #include "model_opcode.h"
-
-#include "server_common.h"
-#include "state_binding.h"
 #include "state_transition.h"
-#include "generic_server.h"
-#include "lighting_server.h"
-#include "time_scene_server.h"
 
 #include "btc_ble_mesh_generic_model.h"
 #include "btc_ble_mesh_lighting_model.h"

components/bt/esp_ble_mesh/mesh_models/server/time_scene_server.c

@@ -12,24 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string.h>
-#include <stdbool.h>
 #include <errno.h>
 
-#include "osi/mutex.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh.h"
 #include "access.h"
-#include "model_opcode.h"
 #include "transport.h"
-
-#include "server_common.h"
-#include "state_binding.h"
+#include "model_opcode.h"
 #include "state_transition.h"
-#include "time_scene_server.h"
 
 #include "btc_ble_mesh_time_scene_model.h"