diff --git a/native/jni/src/suggest/core/dicnode/dic_node.h b/native/jni/src/suggest/core/dicnode/dic_node.h
index cbed2043c..5c56fe81c 100644
--- a/native/jni/src/suggest/core/dicnode/dic_node.h
+++ b/native/jni/src/suggest/core/dicnode/dic_node.h
@@ -18,10 +18,10 @@
 #define LATINIME_DIC_NODE_H
 
 #include "defines.h"
-#include "suggest/core/dicnode/dic_node_state.h"
 #include "suggest/core/dicnode/dic_node_profiler.h"
-#include "suggest/core/dicnode/dic_node_properties.h"
 #include "suggest/core/dicnode/dic_node_release_listener.h"
+#include "suggest/core/dicnode/internal/dic_node_state.h"
+#include "suggest/core/dicnode/internal/dic_node_properties.h"
 #include "suggest/core/dictionary/digraph_utils.h"
 #include "utils/char_utils.h"
 
diff --git a/native/jni/src/suggest/core/dicnode/dic_node_release_listener.h b/native/jni/src/suggest/core/dicnode/dic_node_release_listener.h
index 2a81c3cae..2ca4f21bd 100644
--- a/native/jni/src/suggest/core/dicnode/dic_node_release_listener.h
+++ b/native/jni/src/suggest/core/dicnode/dic_node_release_listener.h
@@ -21,6 +21,8 @@
 
 namespace latinime {
 
+class DicNode;
+
 class DicNodeReleaseListener {
  public:
     DicNodeReleaseListener() {}
diff --git a/native/jni/src/suggest/core/dicnode/dic_node_properties.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_properties.h
similarity index 100%
rename from native/jni/src/suggest/core/dicnode/dic_node_properties.h
rename to native/jni/src/suggest/core/dicnode/internal/dic_node_properties.h
diff --git a/native/jni/src/suggest/core/dicnode/dic_node_state.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_state.h
similarity index 89%
rename from native/jni/src/suggest/core/dicnode/dic_node_state.h
rename to native/jni/src/suggest/core/dicnode/internal/dic_node_state.h
index b1b6266f2..b0fddb724 100644
--- a/native/jni/src/suggest/core/dicnode/dic_node_state.h
+++ b/native/jni/src/suggest/core/dicnode/internal/dic_node_state.h
@@ -18,10 +18,10 @@
 #define LATINIME_DIC_NODE_STATE_H
 
 #include "defines.h"
-#include "suggest/core/dicnode/dic_node_state_input.h"
-#include "suggest/core/dicnode/dic_node_state_output.h"
-#include "suggest/core/dicnode/dic_node_state_prevword.h"
-#include "suggest/core/dicnode/dic_node_state_scoring.h"
+#include "suggest/core/dicnode/internal/dic_node_state_input.h"
+#include "suggest/core/dicnode/internal/dic_node_state_output.h"
+#include "suggest/core/dicnode/internal/dic_node_state_prevword.h"
+#include "suggest/core/dicnode/internal/dic_node_state_scoring.h"
 
 namespace latinime {
 
diff --git a/native/jni/src/suggest/core/dicnode/dic_node_state_input.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_input.h
similarity index 100%
rename from native/jni/src/suggest/core/dicnode/dic_node_state_input.h
rename to native/jni/src/suggest/core/dicnode/internal/dic_node_state_input.h
diff --git a/native/jni/src/suggest/core/dicnode/dic_node_state_output.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_output.h
similarity index 100%
rename from native/jni/src/suggest/core/dicnode/dic_node_state_output.h
rename to native/jni/src/suggest/core/dicnode/internal/dic_node_state_output.h
diff --git a/native/jni/src/suggest/core/dicnode/dic_node_state_prevword.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_prevword.h
similarity index 100%
rename from native/jni/src/suggest/core/dicnode/dic_node_state_prevword.h
rename to native/jni/src/suggest/core/dicnode/internal/dic_node_state_prevword.h
diff --git a/native/jni/src/suggest/core/dicnode/dic_node_state_scoring.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_scoring.h
similarity index 100%
rename from native/jni/src/suggest/core/dicnode/dic_node_state_scoring.h
rename to native/jni/src/suggest/core/dicnode/internal/dic_node_state_scoring.h