7 files changed, 18 insertions, 25 deletions
diff --git a/driver/fingerprint/fpc/bep/fpc_misc.c b/driver/fingerprint/fpc/bep/fpc_misc.c
index 6b716e0524..f78a429233 100644
--- a/driver/fingerprint/fpc/bep/fpc_misc.c
+++ b/driver/fingerprint/fpc/bep/fpc_misc.c
@@ -5,12 +5,12 @@
 
 /* FPC Platform Abstraction Layer */
 
+#include <stdint.h>
+#include <stddef.h>
+
 #include "shared_mem.h"
 #include "uart.h"
 
-#include <stddef.h>
-#include <stdint.h>
-
 void __unused *fpc_malloc(uint32_t size)
 {
 	char *data;
diff --git a/driver/fingerprint/fpc/bep/fpc_private.c b/driver/fingerprint/fpc/bep/fpc_private.c
index 70aa8fe8c5..ac20e10758 100644
--- a/driver/fingerprint/fpc/bep/fpc_private.c
+++ b/driver/fingerprint/fpc/bep/fpc_private.c
@@ -3,7 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include "driver/fingerprint/fpc/fpc_sensor.h"
+#include <stdint.h>
+#include <stddef.h>
+
 #include "fpc_bio_algorithm.h"
 #include "fpsensor.h"
 #include "gpio.h"
@@ -11,8 +13,7 @@
 #include "system.h"
 #include "util.h"
 
-#include <stddef.h>
-#include <stdint.h>
+#include "driver/fingerprint/fpc/fpc_sensor.h"
 
 /* Console output macros */
 #define CPRINTF(format, args...) cprintf(CC_FP, format, ##args)
diff --git a/driver/fingerprint/fpc/bep/fpc_private.h b/driver/fingerprint/fpc/bep/fpc_private.h
index df8b8eeea6..ca5b98fa8e 100644
--- a/driver/fingerprint/fpc/bep/fpc_private.h
+++ b/driver/fingerprint/fpc/bep/fpc_private.h
@@ -8,10 +8,6 @@
 #ifndef __CROS_EC_FPC_PRIVATE_H
 #define __CROS_EC_FPC_PRIVATE_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
 
 typedef struct {
@@ -50,8 +46,4 @@ int fp_sensor_maintenance(uint8_t *image_data,
  */
 int fpc_get_hwid(uint16_t *id);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __CROS_EC_FPC_PRIVATE_H */
diff --git a/driver/fingerprint/fpc/bep/fpc_sensor_spi.c b/driver/fingerprint/fpc/bep/fpc_sensor_spi.c
index 565b29c69d..752b9909bc 100644
--- a/driver/fingerprint/fpc/bep/fpc_sensor_spi.c
+++ b/driver/fingerprint/fpc/bep/fpc_sensor_spi.c
@@ -5,17 +5,18 @@
 
 /* FPC Platform Abstraction Layer */
 
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
 #include "console.h"
-#include "driver/fingerprint/fpc/fpc_sensor.h"
-#include "fpc_sensor_spi.h"
 #include "fpsensor.h"
+#include "fpc_sensor_spi.h"
 #include "gpio.h"
 #include "spi.h"
 #include "util.h"
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
+#include "driver/fingerprint/fpc/fpc_sensor.h"
 
 /* Console output macros */
 #define CPRINTF(format, args...) cprintf(CC_FP, format, ##args)
diff --git a/driver/fingerprint/fpc/bep/fpc_sensor_spi.h b/driver/fingerprint/fpc/bep/fpc_sensor_spi.h
index 015bc03dae..ad7e5411d8 100644
--- a/driver/fingerprint/fpc/bep/fpc_sensor_spi.h
+++ b/driver/fingerprint/fpc/bep/fpc_sensor_spi.h
@@ -14,9 +14,8 @@
  * fingerprint sensor.
  */
 
-#include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
+#include <stdbool.h>
 
 typedef bool (*fpc_wfi_check_t)(void);
 
diff --git a/driver/fingerprint/fpc/bep/fpc_timebase.c b/driver/fingerprint/fpc/bep/fpc_timebase.c
index c34b9e27db..a63a4c3d6d 100644
--- a/driver/fingerprint/fpc/bep/fpc_timebase.c
+++ b/driver/fingerprint/fpc/bep/fpc_timebase.c
@@ -5,11 +5,11 @@
 
 /* FPC Platform Abstraction Layer */
 
+#include <stdint.h>
+
 #include "fpc_timebase.h"
 #include "timer.h"
 
-#include <stdint.h>
-
 uint32_t __unused fpc_timebase_get_tick(void)
 {
 	clock_t time;
diff --git a/driver/fingerprint/fpc/bep/fpc_timebase.h b/driver/fingerprint/fpc/bep/fpc_timebase.h
index 35cf67fed2..ce9018461b 100644
--- a/driver/fingerprint/fpc/bep/fpc_timebase.h
+++ b/driver/fingerprint/fpc/bep/fpc_timebase.h
@@ -13,10 +13,10 @@
  * Supplies tick counter and wait operation(s).
  */
 
-#include "common.h"
-
 #include <stdint.h>
 
+#include "common.h"
+
 /**
  * @brief Reads the system tick counter.
  *