diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 15bfbbe6d..e4a4682b0 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -48,8 +48,9 @@ LATIN_IME_JNI_SRC_FILES := \
 LATIN_IME_CORE_SRC_FILES := \
     correction.cpp \
     unigram_dictionary.cpp \
-    words_priority_queue.cpp \
     suggest/core/suggest.cpp \
+    $(addprefix obsolete/, \
+        words_priority_queue.cpp \
     $(addprefix suggest/core/dicnode/, \
         dic_node.cpp \
         dic_node_utils.cpp \
diff --git a/native/jni/src/words_priority_queue.cpp b/native/jni/src/obsolete/words_priority_queue.cpp
similarity index 98%
rename from native/jni/src/words_priority_queue.cpp
rename to native/jni/src/obsolete/words_priority_queue.cpp
index 7e18d0f87..563cf918e 100644
--- a/native/jni/src/words_priority_queue.cpp
+++ b/native/jni/src/obsolete/words_priority_queue.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "words_priority_queue.h"
+#include "obsolete/words_priority_queue.h"
 
 namespace latinime {
 
diff --git a/native/jni/src/words_priority_queue.h b/native/jni/src/obsolete/words_priority_queue.h
similarity index 100%
rename from native/jni/src/words_priority_queue.h
rename to native/jni/src/obsolete/words_priority_queue.h
diff --git a/native/jni/src/words_priority_queue_pool.h b/native/jni/src/obsolete/words_priority_queue_pool.h
similarity index 98%
rename from native/jni/src/words_priority_queue_pool.h
rename to native/jni/src/obsolete/words_priority_queue_pool.h
index 2cd210a05..bf04568db 100644
--- a/native/jni/src/words_priority_queue_pool.h
+++ b/native/jni/src/obsolete/words_priority_queue_pool.h
@@ -18,7 +18,7 @@
 #define LATINIME_WORDS_PRIORITY_QUEUE_POOL_H
 
 #include "defines.h"
-#include "words_priority_queue.h"
+#include "obsolete/words_priority_queue.h"
 
 namespace latinime {
 
diff --git a/native/jni/src/unigram_dictionary.cpp b/native/jni/src/unigram_dictionary.cpp
index 5820a1d0e..39b3d4918 100644
--- a/native/jni/src/unigram_dictionary.cpp
+++ b/native/jni/src/unigram_dictionary.cpp
@@ -19,6 +19,8 @@
 #define LOG_TAG "LatinIME: unigram_dictionary.cpp"
 
 #include "defines.h"
+#include "obsolete/words_priority_queue.h"
+#include "obsolete/words_priority_queue_pool.h"
 #include "suggest/core/dictionary/binary_dictionary_info.h"
 #include "suggest/core/dictionary/binary_format.h"
 #include "suggest/core/dictionary/dictionary.h"
@@ -28,8 +30,6 @@
 #include "suggest/core/layout/proximity_info.h"
 #include "utils/char_utils.h"
 #include "unigram_dictionary.h"
-#include "words_priority_queue.h"
-#include "words_priority_queue_pool.h"
 
 namespace latinime {