diff --git a/cmds/hid/jni/com_android_commands_hid_Device.cpp b/cmds/hid/jni/com_android_commands_hid_Device.cpp index 107dc863ef66..9d442126fac4 100644 --- a/cmds/hid/jni/com_android_commands_hid_Device.cpp +++ b/cmds/hid/jni/com_android_commands_hid_Device.cpp @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/services/core/jni/com_android_server_ConsumerIrService.cpp b/services/core/jni/com_android_server_ConsumerIrService.cpp index e9c944d32b54..2ca348b3ae46 100644 --- a/services/core/jni/com_android_server_ConsumerIrService.cpp +++ b/services/core/jni/com_android_server_ConsumerIrService.cpp @@ -17,14 +17,14 @@ #define LOG_TAG "ConsumerIrService" #include "jni.h" -#include "JNIHelp.h" +#include #include "android_runtime/AndroidRuntime.h" #include #include #include #include -#include +#include using ::android::hardware::ir::V1_0::IConsumerIr; using ::android::hardware::ir::V1_0::ConsumerIrFreqRange; diff --git a/services/core/jni/com_android_server_GraphicsStatsService.cpp b/services/core/jni/com_android_server_GraphicsStatsService.cpp index 61c53e6d30b3..8385020844bb 100644 --- a/services/core/jni/com_android_server_GraphicsStatsService.cpp +++ b/services/core/jni/com_android_server_GraphicsStatsService.cpp @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/services/core/jni/com_android_server_location_ContextHubService.cpp b/services/core/jni/com_android_server_location_ContextHubService.cpp index d59bc10b72da..d90b011357ef 100644 --- a/services/core/jni/com_android_server_location_ContextHubService.cpp +++ b/services/core/jni/com_android_server_location_ContextHubService.cpp @@ -38,7 +38,7 @@ #include #include "core_jni_helpers.h" -#include "JNIHelp.h" +#include using android::hardware::contexthub::V1_0::AsyncEventType; using android::hardware::contexthub::V1_0::ContextHub; diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp index 4fb2ae368ae2..1f1324acc463 100644 --- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp @@ -20,7 +20,7 @@ #include -#include "JNIHelp.h" +#include #include "jni.h" #include "hardware_legacy/power.h" #include "utils/Log.h" diff --git a/services/core/jni/com_android_server_power_PowerManagerService.cpp b/services/core/jni/com_android_server_power_PowerManagerService.cpp index 2db7dbee647f..39f90ca47995 100644 --- a/services/core/jni/com_android_server_power_PowerManagerService.cpp +++ b/services/core/jni/com_android_server_power_PowerManagerService.cpp @@ -22,7 +22,7 @@ #include "JNIHelp.h" #include "jni.h" -#include +#include #include