5 files changed, 9 insertions, 2 deletions
diff --git a/src/misc/array.hpp b/src/misc/array.hpp
index 5ae836a08..f5a602155 100644
--- a/src/misc/array.hpp
+++ b/src/misc/array.hpp
@@ -13,6 +13,7 @@
 #define  ARRAY_HPP
 
 #include "fixedsizearray.hpp"
+#include "str.hpp"
 
 /** Flexible array with size limit. Implemented as fixed size
  *  array of fixed size arrays */
diff --git a/src/misc/blob.hpp b/src/misc/blob.hpp
index 17e3a5947..d475231b6 100644
--- a/src/misc/blob.hpp
+++ b/src/misc/blob.hpp
@@ -14,6 +14,7 @@
 
 #include "../core/alloc_func.hpp"
 #include "../core/mem_func.hpp"
+#include <new>
 
 /** Base class for simple binary blobs.
  *  Item is byte.
diff --git a/src/misc/dbg_helpers.h b/src/misc/dbg_helpers.h
index 56eebb247..670548d35 100644
--- a/src/misc/dbg_helpers.h
+++ b/src/misc/dbg_helpers.h
@@ -12,13 +12,16 @@
 #ifndef DBG_HELPERS_H
 #define DBG_HELPERS_H
 
-#include <new>
 #include <map>
 #include <stack>
 
-#include "blob.hpp"
 #include "str.hpp"
 
+#include "../direction_type.h"
+#include "../signal_type.h"
+#include "../tile_type.h"
+#include "../track_type.h"
+
 /** Helper template class that provides C array length and item type */
 template <typename T> struct ArrayT;
 
diff --git a/src/misc/fixedsizearray.hpp b/src/misc/fixedsizearray.hpp
index b17755c5e..3e39cc4d9 100644
--- a/src/misc/fixedsizearray.hpp
+++ b/src/misc/fixedsizearray.hpp
@@ -12,6 +12,7 @@
 #ifndef  FIXEDSIZEARRAY_HPP
 #define  FIXEDSIZEARRAY_HPP
 
+#include "../core/alloc_func.hpp"
 
 /** fixed size array
  *  Upon construction it preallocates fixed size block of memory
diff --git a/src/misc/str.hpp b/src/misc/str.hpp
index 64e401adb..8ef8e8f87 100644
--- a/src/misc/str.hpp
+++ b/src/misc/str.hpp
@@ -14,6 +14,7 @@
 
 #include <errno.h>
 #include <stdarg.h>
+#include "blob.hpp"
 #include "../string_func.h"
 
 /** Blob based case sensitive ANSI/UTF-8 string */