4 files changed, 4 insertions, 16 deletions
diff --git a/driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h b/driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h
index 834f7394e4..7dda6d46de 100644
--- a/driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h
+++ b/driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h
@@ -5,11 +5,8 @@
 #ifndef BIOD_BIO_ALGORITHM_H_
 #define BIOD_BIO_ALGORITHM_H_
 
-#include <stddef.h>
 #include <stdint.h>
 
-#include <sys/types.h>
-
 enum bio_algorithm_type {
 	BIO_ALGORITHM_FINGERPRINT,
 	BIO_ALGORITHM_IRIS,
diff --git a/driver/fingerprint/fpc/libfp/fpc_private.c b/driver/fingerprint/fpc/libfp/fpc_private.c
index 8b1ceff405..fcc0180784 100644
--- a/driver/fingerprint/fpc/libfp/fpc_private.c
+++ b/driver/fingerprint/fpc/libfp/fpc_private.c
@@ -3,9 +3,10 @@
  * found in the LICENSE file.
  */
 
+#include <stddef.h>
+#include <sys/types.h>
 #include "common.h"
 #include "console.h"
-#include "driver/fingerprint/fpc/fpc_sensor.h"
 #include "fpc_bio_algorithm.h"
 #include "fpc_private.h"
 #include "fpsensor.h"
@@ -16,9 +17,7 @@
 #include "timer.h"
 #include "util.h"
 
-#include <stddef.h>
-
-#include <sys/types.h>
+#include "driver/fingerprint/fpc/fpc_sensor.h"
 
 #define CPRINTF(format, args...) cprintf(CC_FP, format, ##args)
 #define CPRINTS(format, args...) cprints(CC_FP, format, ##args)
diff --git a/driver/fingerprint/fpc/libfp/fpc_private.h b/driver/fingerprint/fpc/libfp/fpc_private.h
index a1fe0e47a2..19ac3b7a13 100644
--- a/driver/fingerprint/fpc/libfp/fpc_private.h
+++ b/driver/fingerprint/fpc/libfp/fpc_private.h
@@ -8,10 +8,6 @@
 #ifndef __CROS_EC_FPC_PRIVATE_H
 #define __CROS_EC_FPC_PRIVATE_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* External error codes from FPC's sensor library */
 enum fpc_error_code_external {
 	FPC_ERROR_NONE = 0,
@@ -161,8 +157,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/libfp/fpc_sensor_pal.c b/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c
index a856e0afaf..c0578bc09b 100644
--- a/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c
+++ b/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c
@@ -6,8 +6,8 @@
 
 #include "common.h"
 #include "console.h"
-#include "fpc_sensor_pal.h"
 #include "fpsensor.h"
+#include "fpc_sensor_pal.h"
 #include "shared_mem.h"
 #include "spi.h"
 #include "timer.h"