Header cleanup

Change-Id: Idaf19de3dc75367d49bc01e84e5a9f057c1f8dba

native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp

@@ -21,11 +21,6 @@
 #include "jni_common.h"
 #include "proximity_info.h"
 
-#include <cassert>
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
-
 namespace latinime {
 
 static jlong latinime_Keyboard_setProximityInfo(JNIEnv *env, jobject object,

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

@@ -17,30 +17,24 @@
 #define LOG_TAG "LatinIME: jni: BinaryDictionary"
 
 #include "binary_format.h"
-#include "correction.h"
 #include "com_android_inputmethod_latin_BinaryDictionary.h"
+#include "correction.h"
 #include "defines.h"
 #include "dictionary.h"
 #include "jni.h"
 #include "jni_common.h"
-#include "proximity_info.h"
-
-#include <cassert>
-#include <cerrno>
-#include <cstdio>
 
 #ifdef USE_MMAP_FOR_DICTIONARY
 #include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 #else // USE_MMAP_FOR_DICTIONARY
 #include <cstdlib>
 #endif // USE_MMAP_FOR_DICTIONARY
 
 namespace latinime {
 
+class ProximityInfo;
+
 void releaseDictBuf(void *dictBuf, const size_t length, int fd);
 
 static jlong latinime_BinaryDictionary_open(JNIEnv *env, jobject object,

native/jni/jni_common.cpp

@@ -21,6 +21,7 @@
 #include "com_android_inputmethod_latin_NativeUtils.h"
 #include "defines.h"
 #include "jni.h"
+#include "jni_common.h"
 #include "proximity_info.h"
 
 #include <cassert>

native/jni/src/correction.cpp

@@ -25,11 +25,12 @@
 #include "correction.h"
 #include "defines.h"
 #include "dictionary.h"
-#include "proximity_info.h"
 #include "proximity_info_state.h"
 
 namespace latinime {
 
+class ProximityInfo;
+
 /////////////////////////////
 // edit distance funcitons //
 /////////////////////////////