diff --git a/lemon/adaptors.h b/lemon/adaptors.h
--- a/lemon/adaptors.h
+++ b/lemon/adaptors.h
@@ -30,6 +30,7 @@
 #include <lemon/bits/variant.h>
 
 #include <lemon/bits/graph_adaptor_extender.h>
+#include <lemon/bits/map_extender.h>
 #include <lemon/tolerance.h>
 
 #include <algorithm>
diff --git a/lemon/bits/edge_set_extender.h b/lemon/bits/edge_set_extender.h
--- a/lemon/bits/edge_set_extender.h
+++ b/lemon/bits/edge_set_extender.h
@@ -19,8 +19,10 @@
 #ifndef LEMON_BITS_EDGE_SET_EXTENDER_H
 #define LEMON_BITS_EDGE_SET_EXTENDER_H
 
+#include <lemon/core.h>
 #include <lemon/error.h>
 #include <lemon/bits/default_map.h>
+#include <lemon/bits/map_extender.h>
 
 ///\ingroup digraphbits
 ///\file
diff --git a/lemon/bits/path_dump.h b/lemon/bits/path_dump.h
--- a/lemon/bits/path_dump.h
+++ b/lemon/bits/path_dump.h
@@ -19,6 +19,9 @@
 #ifndef LEMON_BITS_PRED_MAP_PATH_H
 #define LEMON_BITS_PRED_MAP_PATH_H
 
+#include <lemon/core.h>
+#include <lemon/concept_check.h>
+
 namespace lemon {
 
   template <typename _Digraph, typename _PredMap>
diff --git a/lemon/bits/solver_bits.h b/lemon/bits/solver_bits.h
--- a/lemon/bits/solver_bits.h
+++ b/lemon/bits/solver_bits.h
@@ -19,6 +19,8 @@
 #ifndef LEMON_BITS_SOLVER_BITS_H
 #define LEMON_BITS_SOLVER_BITS_H
 
+#include <vector>
+
 namespace lemon {
 
   namespace _solver_bits {
diff --git a/lemon/concepts/heap.h b/lemon/concepts/heap.h
--- a/lemon/concepts/heap.h
+++ b/lemon/concepts/heap.h
@@ -24,6 +24,7 @@
 #define LEMON_CONCEPT_HEAP_H
 
 #include <lemon/core.h>
+#include <lemon/concept_check.h>
 
 namespace lemon {
 
diff --git a/lemon/elevator.h b/lemon/elevator.h
--- a/lemon/elevator.h
+++ b/lemon/elevator.h
@@ -27,6 +27,7 @@
 ///for labeling items in push-relabel type algorithms.
 ///
 
+#include <lemon/core.h>
 #include <lemon/bits/traits.h>
 
 namespace lemon {
diff --git a/lemon/suurballe.h b/lemon/suurballe.h
--- a/lemon/suurballe.h
+++ b/lemon/suurballe.h
@@ -27,6 +27,8 @@
 #include <vector>
 #include <lemon/bin_heap.h>
 #include <lemon/path.h>
+#include <lemon/list_graph.h>
+#include <lemon/maps.h>
 
 namespace lemon {