diff --git a/src/options.cpp b/src/options.cpp
index 88ca59410..2f15bf559 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -10,7 +10,9 @@
 #include "config.h"
 #include "format.hpp"
 #include "logging.hpp"
+#include "node-ram-cache.hpp"
 #include "options.hpp"
+#include "reprojection.hpp"
 #include "sprompt.hpp"
 
 #include <algorithm>
diff --git a/src/options.hpp b/src/options.hpp
index 38042b5d4..18e569a67 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -10,9 +10,6 @@
  * For a full list of authors see the git log.
  */
 
-#include "node-ram-cache.hpp"
-#include "reprojection.hpp"
-
 #include <osmium/osm/box.hpp>
 
 #include <boost/optional.hpp>
@@ -20,6 +17,8 @@
 #include <string>
 #include <vector>
 
+class reprojection;
+
 /// Variants for generation of hstore column
 enum class hstore_column : char
 {
diff --git a/src/output.hpp b/src/output.hpp
index bb0b81054..13e97d7da 100644
--- a/src/output.hpp
+++ b/src/output.hpp
@@ -22,6 +22,7 @@
 #include <osmium/index/id_set.hpp>
 
 #include "options.hpp"
+#include "osmtypes.hpp"
 #include "thread-pool.hpp"
 
 struct middle_query_t;
diff --git a/tests/common-options.hpp b/tests/common-options.hpp
index 09587c999..6dd9361ce 100644
--- a/tests/common-options.hpp
+++ b/tests/common-options.hpp
@@ -11,6 +11,7 @@
  */
 
 #include "options.hpp"
+#include "reprojection.hpp"
 
 #include "common-pg.hpp"