pybricks: reduce unused includes

This is a first quick pass over all modules/types.

Author: laurensvalk

pybricks/common.h

@@ -8,10 +8,10 @@
 
 #if PYBRICKS_PY_COMMON
 
-#include <pybricks/util_pb/pb_device.h>
-
 #include "py/obj.h"
 
+#include <pybricks/util_pb/pb_device.h>
+
 // pybricks._common.ColorLight()
 const mp_obj_type_t pb_type_ColorLight;
 mp_obj_t common_ColorLight_obj_make_new(pb_device_t *pbdev);

pybricks/common/pb_type_battery.c

@@ -5,10 +5,12 @@
 
 #if PYBRICKS_PY_COMMON
 
-#include "py/obj.h"
+#include <pbdrv/battery.h>
 
 #include <pbio/button.h>
 
+#include "py/obj.h"
+
 #include <pybricks/common.h>
 #include <pybricks/parameters.h>
 #include <pybricks/util_pb/pb_error.h>
@@ -17,9 +19,6 @@
 // an instance of a Battery type. That would make it consistent with the other
 // C types and the high level Python API.
 
-#include <pybricks/util_pb/pb_error.h>
-#include <pbdrv/battery.h>
-
 STATIC mp_obj_t battery_voltage(void) {
     uint16_t volt;
     pb_assert(pbdrv_battery_get_voltage_now(&volt));

pybricks/common/pb_type_colorlight.c

@@ -8,11 +8,11 @@
 #include <pbio/light.h>
 #include <pbio/color.h>
 
+#include "py/obj.h"
+
 #include <pybricks/common.h>
 #include <pybricks/parameters.h>
 
-#include "py/obj.h"
-
 #include <pybricks/util_pb/pb_error.h>
 #include <pybricks/util_mp/pb_obj_helper.h>
 #include <pybricks/util_mp/pb_kwarg_helper.h>

pybricks/common/pb_type_control.c

@@ -5,11 +5,12 @@
 
 #if PYBRICKS_PY_COMMON_MOTORS
 
-#include <pybricks/common.h>
 #include <pbio/control.h>
 
 #include "py/obj.h"
 
+#include <pybricks/common.h>
+
 #include <pybricks/util_pb/pb_error.h>
 #include <pybricks/util_mp/pb_obj_helper.h>
 #include <pybricks/util_mp/pb_kwarg_helper.h>

pybricks/common/pb_type_dcmotor.c

@@ -5,8 +5,6 @@
 
 #if PYBRICKS_PY_COMMON_MOTORS
 
-#include <inttypes.h>
-
 #include "py/mphal.h"
 
 #include <pybricks/common.h>

pybricks/common/pb_type_keypad.c

@@ -5,12 +5,13 @@
 
 #if PYBRICKS_PY_COMMON
 
-#include "py/obj.h"
-
 #include <pbio/button.h>
 
+#include "py/obj.h"
+
 #include <pybricks/common.h>
 #include <pybricks/parameters.h>
+
 #include <pybricks/util_pb/pb_error.h>
 
 // TODO: buttons are currently a module due to the legacy C API, but should be

pybricks/common/pb_type_lightarray.c

@@ -5,10 +5,10 @@
 
 #if PYBRICKS_PY_COMMON
 
-#include <pybricks/common.h>
-
 #include "py/obj.h"
 
+#include <pybricks/common.h>
+
 #include <pybricks/util_pb/pb_error.h>
 #include <pybricks/util_mp/pb_obj_helper.h>
 #include <pybricks/util_mp/pb_kwarg_helper.h>

pybricks/common/pb_type_logger.c

@@ -5,9 +5,9 @@
 
 #if PYBRICKS_PY_COMMON_MOTORS
 
+#include <inttypes.h>
 #include <stdbool.h>
 #include <string.h>
-#include <inttypes.h>
 
 #include <pbio/config.h>
 #include <pbio/logger.h>

pybricks/common/pb_type_motor.c

@@ -5,10 +5,8 @@
 
 #if PYBRICKS_PY_COMMON_MOTORS
 
-#include <inttypes.h>
-
-#include <pbio/servo.h>
 #include <pbio/motorpoll.h>
+#include <pbio/servo.h>
 
 #include "py/mphal.h"
 #include "py/obj.h"

pybricks/ev3devices.h

@@ -5,10 +5,11 @@
 #define PYBRICKS_INCLUDED_PYBRICKS_EV3DEVICES_H
 
 #include "py/mpconfig.h"
-#include "py/obj.h"
 
 #if PYBRICKS_PY_EV3DEVICES
 
+#include "py/obj.h"
+
 const mp_obj_module_t pb_module_ev3devices;
 
 const mp_obj_type_t pb_type_ev3devices_ColorSensor;