Header cleanup
Change-Id: Idaf19de3dc75367d49bc01e84e5a9f057c1f8dba
diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
index fb55ea7..93e19b3 100644
--- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
+++ b/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,
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
index 435e837..2d3d963 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/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,
diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp
index 94e279f..cb2351d 100644
--- a/native/jni/jni_common.cpp
+++ b/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>
diff --git a/native/jni/src/correction.cpp b/native/jni/src/correction.cpp
index 921ab0a..8bb27f5 100644
--- a/native/jni/src/correction.cpp
+++ b/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 //
/////////////////////////////