diff --git a/src/helpers.cpp b/src/helpers.cpp
index d40078683b..941906a608 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -5,7 +5,7 @@
 #include "engine.h"
 
 #include <new>
-#include "yapf/blob.hpp"
+#include "misc/blob.hpp"
 
 /* Engine list manipulators - current implementation is only C wrapper around CBlobT<EngineID> (see yapf/blob.hpp) */
 
diff --git a/src/yapf/array.hpp b/src/misc/array.hpp
similarity index 100%
rename from src/yapf/array.hpp
rename to src/misc/array.hpp
diff --git a/src/yapf/autocopyptr.hpp b/src/misc/autocopyptr.hpp
similarity index 100%
rename from src/yapf/autocopyptr.hpp
rename to src/misc/autocopyptr.hpp
diff --git a/src/yapf/binaryheap.hpp b/src/misc/binaryheap.hpp
similarity index 100%
rename from src/yapf/binaryheap.hpp
rename to src/misc/binaryheap.hpp
diff --git a/src/yapf/blob.hpp b/src/misc/blob.hpp
similarity index 100%
rename from src/yapf/blob.hpp
rename to src/misc/blob.hpp
diff --git a/src/yapf/countedptr.hpp b/src/misc/countedptr.hpp
similarity index 100%
rename from src/yapf/countedptr.hpp
rename to src/misc/countedptr.hpp
diff --git a/src/yapf/crc32.hpp b/src/misc/crc32.hpp
similarity index 100%
rename from src/yapf/crc32.hpp
rename to src/misc/crc32.hpp
diff --git a/src/yapf/fixedsizearray.hpp b/src/misc/fixedsizearray.hpp
similarity index 100%
rename from src/yapf/fixedsizearray.hpp
rename to src/misc/fixedsizearray.hpp
diff --git a/src/yapf/hashtable.hpp b/src/misc/hashtable.hpp
similarity index 100%
rename from src/yapf/hashtable.hpp
rename to src/misc/hashtable.hpp
diff --git a/src/yapf/nodelist.hpp b/src/yapf/nodelist.hpp
index f51afbfd46..a4d14e934e 100644
--- a/src/yapf/nodelist.hpp
+++ b/src/yapf/nodelist.hpp
@@ -3,9 +3,9 @@
 #ifndef  NODELIST_HPP
 #define  NODELIST_HPP
 
-#include "array.hpp"
-#include "hashtable.hpp"
-#include "binaryheap.hpp"
+#include "../misc/array.hpp"
+#include "../misc/hashtable.hpp"
+#include "../misc/binaryheap.hpp"
 
 /** Hash table based node list multi-container class.
  *  Implements open list, closed list and priority queue for A-star
diff --git a/src/yapf/yapf.hpp b/src/yapf/yapf.hpp
index 5aa63de1a6..bd94dacc68 100644
--- a/src/yapf/yapf.hpp
+++ b/src/yapf/yapf.hpp
@@ -71,12 +71,12 @@ typedef CPerfStartFake CPerfStart;
 //#undef FORCEINLINE
 //#define FORCEINLINE inline
 
-#include "crc32.hpp"
-#include "blob.hpp"
-#include "fixedsizearray.hpp"
-#include "array.hpp"
-#include "hashtable.hpp"
-#include "binaryheap.hpp"
+#include "../misc/crc32.hpp"
+#include "../misc/blob.hpp"
+#include "../misc/fixedsizearray.hpp"
+#include "../misc/array.hpp"
+#include "../misc/hashtable.hpp"
+#include "../misc/binaryheap.hpp"
 #include "nodelist.hpp"
 #include "yapf_base.hpp"
 #include "yapf_node.hpp"
diff --git a/src/yapf/yapf_base.hpp b/src/yapf/yapf_base.hpp
index e474cb1557..e2a0a799ec 100644
--- a/src/yapf/yapf_base.hpp
+++ b/src/yapf/yapf_base.hpp
@@ -5,8 +5,8 @@
 
 #include "../debug.h"
 
-#include "fixedsizearray.hpp"
-#include "blob.hpp"
+#include "../misc/fixedsizearray.hpp"
+#include "../misc/blob.hpp"
 #include "nodelist.hpp"
 
 extern int _total_pf_time_us;