diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index 3f05c3b57c699..f040f11ffac46 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -1,5 +1,11 @@ #define LOG_TAG "BitmapFactory" +#include +#include +#include +#include +#include + #include "BitmapFactory.h" #include "CreateJavaOutputStreamAdaptor.h" #include "GraphicsJNI.h" @@ -21,10 +27,6 @@ #include #include #include -#include -#include -#include -#include jfieldID gOptions_justBoundsFieldID; jfieldID gOptions_sampleSizeFieldID; diff --git a/core/jni/android/graphics/ImageDecoder.cpp b/core/jni/android/graphics/ImageDecoder.cpp index 98162af7d27b8..e7f123e038f63 100644 --- a/core/jni/android/graphics/ImageDecoder.cpp +++ b/core/jni/android/graphics/ImageDecoder.cpp @@ -14,6 +14,9 @@ * limitations under the License. */ +#include +#include + #include "Bitmap.h" #include "BitmapFactory.h" #include "ByteBufferStreamAdaptor.h" @@ -33,7 +36,6 @@ #include #include -#include using namespace android; diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp index 236ee6123cde4..7634547ae0bf1 100644 --- a/core/jni/android_os_SELinux.cpp +++ b/core/jni/android_os_SELinux.cpp @@ -15,6 +15,10 @@ */ #define LOG_TAG "SELinuxJNI" + +#include +#include + #include #include @@ -22,7 +26,6 @@ #include "core_jni_helpers.h" #include "selinux/selinux.h" #include "selinux/android.h" -#include #include #include #include diff --git a/core/jni/android_text_Hyphenator.cpp b/core/jni/android_text_Hyphenator.cpp index de307737493eb..7e36b808fb81f 100644 --- a/core/jni/android_text_Hyphenator.cpp +++ b/core/jni/android_text_Hyphenator.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include #include #include diff --git a/core/jni/com_android_internal_os_AtomicDirectory.cpp b/core/jni/com_android_internal_os_AtomicDirectory.cpp index 76b0fc1672641..112aa78f800c9 100644 --- a/core/jni/com_android_internal_os_AtomicDirectory.cpp +++ b/core/jni/com_android_internal_os_AtomicDirectory.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include + #include #include "jni.h" diff --git a/native/android/sharedmem.cpp b/native/android/sharedmem.cpp index 4410bd6fbeed3..338b280a8ebea 100644 --- a/native/android/sharedmem.cpp +++ b/native/android/sharedmem.cpp @@ -16,6 +16,9 @@ #include +#include +#include + #include #include #include @@ -23,7 +26,6 @@ #include #include -#include static struct { jclass clazz;