diff --git a/src/graph/generation/graph_generation.hh b/src/graph/generation/graph_generation.hh
index b99c8b5fc321ebba64e9196580491a5c16731666..2eddf4a4711c4fcf089005fbc5f226028f914396 100644
--- a/src/graph/generation/graph_generation.hh
+++ b/src/graph/generation/graph_generation.hh
@@ -18,8 +18,6 @@
 #ifndef GRAPH_GENERATION_HH
 #define GRAPH_GENERATION_HH
 
-#include <tuple>
-#include <boost/functional/hash.hpp>
 #include <map>
 #include <set>
 #include <iostream>
diff --git a/src/graph/generation/graph_knn.hh b/src/graph/generation/graph_knn.hh
index 097af11c1d72749cfc838c2647117ae47c3bbf7c..ea30310f7c772a39ed20c37aacf95f99ac7a0cad 100644
--- a/src/graph/generation/graph_knn.hh
+++ b/src/graph/generation/graph_knn.hh
@@ -19,7 +19,6 @@
 #define GRAPH_KNN_HH
 
 #include <tuple>
-#include <iostream>
 #include <random>
 #include <boost/functional/hash.hpp>
 
diff --git a/src/graph/generation/graph_lattice.hh b/src/graph/generation/graph_lattice.hh
index 50777e41a48c2695b25c821b972b493dfbb2a828..8d06777f35a58f208cb2bd36760ec184e5d36130 100644
--- a/src/graph/generation/graph_lattice.hh
+++ b/src/graph/generation/graph_lattice.hh
@@ -18,7 +18,6 @@
 #ifndef GRAPH_LATTICE_HH
 #define GRAPH_LATTICE_HH
 
-#include <iostream>
 #include "graph_util.hh"
 
 namespace graph_tool
diff --git a/src/graph/generation/graph_maxent_sbm.hh b/src/graph/generation/graph_maxent_sbm.hh
index b82d9d65079597625b4cf029234c5e74bf366a49..de56ba411827f3a22e1f234ae293903cb5dd849c 100644
--- a/src/graph/generation/graph_maxent_sbm.hh
+++ b/src/graph/generation/graph_maxent_sbm.hh
@@ -19,7 +19,6 @@
 #define GRAPH_MAXENT_SBM_HH
 
 #include <tuple>
-#include <iostream>
 
 #include "graph.hh"
 #include "graph_filtering.hh"
diff --git a/src/graph/generation/graph_rewiring.hh b/src/graph/generation/graph_rewiring.hh
index 49a775ff93a3524fb030b888ebcc29d70d298cf9..24c64a89a59920503b15fdff0f0942cb80fa065b 100644
--- a/src/graph/generation/graph_rewiring.hh
+++ b/src/graph/generation/graph_rewiring.hh
@@ -20,7 +20,6 @@
 
 #include <tuple>
 #include <iostream>
-#include <boost/functional/hash.hpp>
 
 #include "graph.hh"
 #include "graph_filtering.hh"
diff --git a/src/graph/generation/graph_sbm.hh b/src/graph/generation/graph_sbm.hh
index 4de6ce58f33010c5a7a6256a893f46ec3b4b33b4..8562fd4e9591b7367d06d7b109cada7b365b237a 100644
--- a/src/graph/generation/graph_sbm.hh
+++ b/src/graph/generation/graph_sbm.hh
@@ -18,10 +18,6 @@
 #ifndef GRAPH_SBM_HH
 #define GRAPH_SBM_HH
 
-#include <tuple>
-#include <iostream>
-#include <boost/functional/hash.hpp>
-
 #include "graph.hh"
 #include "graph_filtering.hh"
 #include "graph_util.hh"
diff --git a/src/graph/generation/graph_triangulation.hh b/src/graph/generation/graph_triangulation.hh
index 14ede93ff810d2c333a2de7b3dc2bf293bbfacfe..5998d149f0240d359e4fc3ed0a3f44f88354a979 100644
--- a/src/graph/generation/graph_triangulation.hh
+++ b/src/graph/generation/graph_triangulation.hh
@@ -23,8 +23,6 @@
 #ifndef GRAPH_TRIANGULATION_HH
 #define GRAPH_TRIANGULATION_HH
 
-#include <tuple>
-
 #include "graph_util.hh"
 #include "hash_map_wrap.hh"
 
diff --git a/src/graph/gml.hh b/src/graph/gml.hh
index 2aba063129d31bd60ac7f55a3c91231fd484ddcd..94e547d4ffa098ce137ce596bbe50bd74f25b6b0 100644
--- a/src/graph/gml.hh
+++ b/src/graph/gml.hh
@@ -22,29 +22,18 @@
 
 #include <boost/config/warning_disable.hpp>
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
-#include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/variant/recursive_variant.hpp>
 #include <boost/variant/get.hpp>
 #include <boost/spirit/include/support_istream_iterator.hpp>
-#include <boost/foreach.hpp>
-
-#include <boost/regex/pending/unicode_iterator.hpp>
 
 #include <boost/algorithm/string/replace.hpp>
 
 #include <boost/property_map/dynamic_property_map.hpp>
-#include <boost/tuple/tuple.hpp>
 #include <boost/graph/graph_traits.hpp>
-#include <boost/graph/properties.hpp>
 
 #include <boost/python.hpp>
 
 #include <iostream>
-#include <fstream>
 #include <string>
 #include <vector>
 #include <unordered_map>
diff --git a/src/graph/graph_adaptor.hh b/src/graph/graph_adaptor.hh
index 62984b1bc10a968ac152ec4ae481ad170dbadc29..33807a39a0d66920bd1f8ef898e38700bed72a13 100644
--- a/src/graph/graph_adaptor.hh
+++ b/src/graph/graph_adaptor.hh
@@ -18,12 +18,9 @@
 #ifndef GRAPH_ADAPTOR_HH
 #define GRAPH_ADAPTOR_HH
 
-#include <list>
-
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
 #include <boost/graph/graph_traits.hpp>
-#include <boost/graph/properties.hpp>
 
 #include "transform_iterator.hh"
 
diff --git a/src/graph/graph_adjacency.hh b/src/graph/graph_adjacency.hh
index b91836ec112ed4a6aa4d32b1162ae6c4c95b1826..e937380e9057b0ab728a66062edf344a4ed52df3 100644
--- a/src/graph/graph_adjacency.hh
+++ b/src/graph/graph_adjacency.hh
@@ -21,14 +21,11 @@
 #include <vector>
 #include <deque>
 #include <utility>
-#include <numeric>
-#include <tuple>
 #include <boost/iterator.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/range/irange.hpp>
 #include <boost/property_map/property_map.hpp>
 #include <boost/graph/properties.hpp>
-#include <boost/iterator/transform_iterator.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 
 #ifdef __clang__
diff --git a/src/graph/graph_filtered.hh b/src/graph/graph_filtered.hh
index ff3175cf59fe6713756b8fe428ea168cbeb2a1cd..31eeb6674d1629d693cf12cfce4dcc1a220e2c50 100644
--- a/src/graph/graph_filtered.hh
+++ b/src/graph/graph_filtered.hh
@@ -30,7 +30,6 @@
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
 #include <boost/graph/adjacency_iterator.hpp>
-#include <boost/graph/detail/set_adaptor.hpp>
 #include <boost/iterator/filter_iterator.hpp>
 #include <boost/graph/filtered_graph.hpp> // for predicate classes
 
diff --git a/src/graph/graph_properties.hh b/src/graph/graph_properties.hh
index 728a03137276daae3333b1a20f4da3f01112a157..bf16a3d7190a550e843e3fe48c0ca0426698c3e1 100644
--- a/src/graph/graph_properties.hh
+++ b/src/graph/graph_properties.hh
@@ -18,11 +18,8 @@
 #ifndef GRAPH_PROPERTIES_HH
 #define GRAPH_PROPERTIES_HH
 
-#include <typeinfo>
 #include <string>
 #include <vector>
-#include <memory>
-#include <random>
 #include <unordered_map>
 #include <boost/functional/hash.hpp>
 #include <boost/python/object.hpp>
diff --git a/src/graph/graph_properties_copy_imp1.cc b/src/graph/graph_properties_copy_imp1.cc
index e2f4c5380c259b007cd71edae764520610927787..c438fd664d9603e061051748f887cc5ba3efa961 100644
--- a/src/graph/graph_properties_copy_imp1.cc
+++ b/src/graph/graph_properties_copy_imp1.cc
@@ -19,9 +19,6 @@
 #include "graph_filtering.hh"
 #include "graph_properties.hh"
 
-#include <boost/mpl/contains.hpp>
-#include <boost/python/extract.hpp>
-
 #include "graph_properties_copy.hh"
 
 using namespace std;
diff --git a/src/graph/graph_python_interface.hh b/src/graph/graph_python_interface.hh
index 364832ce5cc8937fa8b55632c02f5e3ba6b02fb5..5e1235f5656d7009f3e506eeabd4c367166f2ef2 100644
--- a/src/graph/graph_python_interface.hh
+++ b/src/graph/graph_python_interface.hh
@@ -33,8 +33,6 @@ namespace std
 }
 
 #include <boost/graph/graph_traits.hpp>
-#include <boost/mpl/logical.hpp>
-#include <boost/iterator/iterator_facade.hpp>
 
 #include <boost/version.hpp>
 #if (BOOST_VERSION >= 104000)
@@ -42,7 +40,6 @@ namespace std
 #else
 #   include <boost/dynamic_property_map.hpp>
 #endif
-#include <type_traits>
 
 #include "graph.hh"
 #include "graph_filtering.hh"
diff --git a/src/graph/graph_python_interface_imp1.cc b/src/graph/graph_python_interface_imp1.cc
index b0e05203f62b16018bd7a284c5435e209ead7c34..eaaf53f70a0a8ebc6c4ea0ea167934c20a6024db 100644
--- a/src/graph/graph_python_interface_imp1.cc
+++ b/src/graph/graph_python_interface_imp1.cc
@@ -23,7 +23,6 @@
 
 #include <boost/python.hpp>
 #include <boost/python/stl_iterator.hpp>
-#include <set>
 
 
 using namespace std;
diff --git a/src/graph/graph_reverse.hh b/src/graph/graph_reverse.hh
index 0a803515eec814a28a647a0e432b62e35f2cadfc..4bd15b8e3d35f651220dbc907c6b4b55d4648668 100644
--- a/src/graph/graph_reverse.hh
+++ b/src/graph/graph_reverse.hh
@@ -24,9 +24,6 @@
 # define GRAPH_REVERSE
 
 #include <boost/graph/adjacency_iterator.hpp>
-#include <boost/graph/properties.hpp>
-#include <boost/iterator/transform_iterator.hpp>
-#include <boost/mpl/if.hpp>
 #include <utility>
 
 #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
diff --git a/src/graph/graphml.cpp b/src/graph/graphml.cpp
index 3c5deddef84bebdd4a4bde446bb84a1c15bb0583..8fa89eafd399a96249ffd38e1d5107ec21b501d5 100644
--- a/src/graph/graphml.cpp
+++ b/src/graph/graphml.cpp
@@ -9,7 +9,6 @@
 //           Andrew Lumsdaine
 //           Tiago de Paula Peixoto
 
-#include <boost/python.hpp>
 #include <expat.h>
 #include <boost/graph/graphml.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/src/graph/histogram.hh b/src/graph/histogram.hh
index e375594698df2c5d1324080709eb9cb548e7afd9..e57238278d99e7bc9a5abafc5aad1e795e11d3e4 100644
--- a/src/graph/histogram.hh
+++ b/src/graph/histogram.hh
@@ -28,8 +28,6 @@
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/int.hpp>
 
-#include <boost/python/object.hpp>
-
 //
 // This is a generic multidimensional histogram type
 //
diff --git a/src/graph/inference/blockmodel/graph_blockmodel_multiflip_mcmc.hh b/src/graph/inference/blockmodel/graph_blockmodel_multiflip_mcmc.hh
index 46d297d111d0863c9216e8e36c303d3e7e4fd626..1fef761fbc103663b1d7126252804802c936c138 100644
--- a/src/graph/inference/blockmodel/graph_blockmodel_multiflip_mcmc.hh
+++ b/src/graph/inference/blockmodel/graph_blockmodel_multiflip_mcmc.hh
@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <algorithm>
-#include <queue>
 
 #include "graph_tool.hh"
 #include "../support/graph_state.hh"
diff --git a/src/graph/inference/blockmodel/graph_blockmodel_partition.hh b/src/graph/inference/blockmodel/graph_blockmodel_partition.hh
index b6165a74e2a1c77554e8aaff6b68c5c1b94100c6..0af1cb29a6ba194a8ead2d0a14869adf2b839714 100644
--- a/src/graph/inference/blockmodel/graph_blockmodel_partition.hh
+++ b/src/graph/inference/blockmodel/graph_blockmodel_partition.hh
@@ -23,6 +23,8 @@
 
 #include "hash_map_wrap.hh"
 
+#include <boost/range/counting_range.hpp>
+
 namespace graph_tool
 {
 
diff --git a/src/graph/inference/graph_latent_multigraph.hh b/src/graph/inference/graph_latent_multigraph.hh
index eb148477d793d6a8bdfe86f4dd4e529c1828286a..5efbc7927a3cbe847a66a22300cb11998a491768 100644
--- a/src/graph/inference/graph_latent_multigraph.hh
+++ b/src/graph/inference/graph_latent_multigraph.hh
@@ -18,10 +18,7 @@
 #ifndef GRAPH_LATENT_MULTIGRAPH_HH
 #define GRAPH_LATENT_MULTIGRAPH_HH
 
-#include <tuple>
 #include <iostream>
-#include <fstream>
-#include <iomanip>
 
 #include "graph_tool.hh"
 #include "hash_map_wrap.hh"
diff --git a/src/graph/inference/graph_modularity.hh b/src/graph/inference/graph_modularity.hh
index f0e8c0c9f4d7882ebf91600e81afec1dcac8a364..4562f180c52798b9d10edcb2c92b6e0aeed66ca2 100644
--- a/src/graph/inference/graph_modularity.hh
+++ b/src/graph/inference/graph_modularity.hh
@@ -18,11 +18,6 @@
 #ifndef GRAPH_MODULARITY_HH
 #define GRAPH_MODULARITY_HH
 
-#include <tuple>
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-
 #include "graph_tool.hh"
 #include "hash_map_wrap.hh"
 
diff --git a/src/graph/inference/layers/graph_blockmodel_layers_util.hh b/src/graph/inference/layers/graph_blockmodel_layers_util.hh
index a3e76a40fd4f8e42511e146907264642152f6c9e..7b0761d3f04b99aacc3cfe17101b0fa5daa51a81 100644
--- a/src/graph/inference/layers/graph_blockmodel_layers_util.hh
+++ b/src/graph/inference/layers/graph_blockmodel_layers_util.hh
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <vector>
-
 namespace graph_tool
 {
 using namespace boost;
diff --git a/src/graph/inference/loops/bundled_vacate_loop.hh b/src/graph/inference/loops/bundled_vacate_loop.hh
index 2837520e46e49d86a8c3c2391f4e983584ed3b58..6d12d7d470cf8346c600054ba971d12a2cb882b4 100644
--- a/src/graph/inference/loops/bundled_vacate_loop.hh
+++ b/src/graph/inference/loops/bundled_vacate_loop.hh
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <iostream>
 #include <queue>
 
 #include <tuple>
diff --git a/src/graph/inference/loops/gibbs_loop.hh b/src/graph/inference/loops/gibbs_loop.hh
index 45793eac662553a8a757cdd17a52465eebf3be1c..b591de9b1b96b560f41bc6913bf90e437f0bf951 100644
--- a/src/graph/inference/loops/gibbs_loop.hh
+++ b/src/graph/inference/loops/gibbs_loop.hh
@@ -20,9 +20,6 @@
 
 #include "config.h"
 
-#include <iostream>
-#include <queue>
-
 #include <tuple>
 
 #include "hash_map_wrap.hh"
diff --git a/src/graph/inference/loops/mcmc_loop.hh b/src/graph/inference/loops/mcmc_loop.hh
index a069b36a82ab8f1cb211a815e8e9b989ecd2c64b..0b990284f5d993c5ac9ad6a745b192d010a2961b 100644
--- a/src/graph/inference/loops/mcmc_loop.hh
+++ b/src/graph/inference/loops/mcmc_loop.hh
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <iostream>
-#include <queue>
 
 #include <tuple>
 
diff --git a/src/graph/inference/support/graph_state.hh b/src/graph/inference/support/graph_state.hh
index c147a3fb550871ef1cc7efecbc35911c71d28a5e..c61327e9410ecee149b91fbf20ae8f1f9c8d264c 100644
--- a/src/graph/inference/support/graph_state.hh
+++ b/src/graph/inference/support/graph_state.hh
@@ -22,18 +22,13 @@
 #include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
 #include <boost/preprocessor/seq/for_each_i.hpp>
 #include <boost/preprocessor/stringize.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/arithmetic/dec.hpp>
 #include <boost/preprocessor/seq/transform.hpp>
 #include <boost/preprocessor/seq/filter.hpp>
 #include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/comparison/not_equal.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/facilities/empty.hpp>
 #include <boost/preprocessor/seq/first_n.hpp>
 
 #include "graph.hh"
diff --git a/src/graph/inference/support/int_part.hh b/src/graph/inference/support/int_part.hh
index dab255e26dc85ff6c97c0eded6591082b11291d0..c632edddc51ba384ace58971673bb14b702758d9 100644
--- a/src/graph/inference/support/int_part.hh
+++ b/src/graph/inference/support/int_part.hh
@@ -10,8 +10,6 @@
 
 #include "config.h"
 
-#include <cmath>
-#include <iostream>
 #include <boost/multi_array.hpp>
 
 #include "cache.hh"
diff --git a/src/graph/inference/support/util.hh b/src/graph/inference/support/util.hh
index 8d6b15fff3af2f49a7b603ba6a7a5b1144f16376..8d0ff2b80b7138331e8e4b0f6c4004be7b21ee5b 100644
--- a/src/graph/inference/support/util.hh
+++ b/src/graph/inference/support/util.hh
@@ -21,12 +21,9 @@
 #include "config.h"
 
 #include <cmath>
-#include <iostream>
 
 #include "cache.hh"
 
-#include <boost/range/counting_range.hpp>
-
 namespace graph_tool
 {
 using namespace boost;
diff --git a/src/graph/inference/uncertain/graph_blockmodel_sample_edge.hh b/src/graph/inference/uncertain/graph_blockmodel_sample_edge.hh
index f9d00d7632cf4e66d556ce9a1b06851e1713c75f..39979c658c574573ef80b212a84f786365d3b18c 100644
--- a/src/graph/inference/uncertain/graph_blockmodel_sample_edge.hh
+++ b/src/graph/inference/uncertain/graph_blockmodel_sample_edge.hh
@@ -19,7 +19,6 @@
 #define GRAPH_SBM_SAMPLE_EDGE_HH
 
 #include <tuple>
-#include <iostream>
 
 #include "graph.hh"
 #include "graph_filtering.hh"
diff --git a/src/graph/inference/uncertain/graph_blockmodel_uncertain_marginal.hh b/src/graph/inference/uncertain/graph_blockmodel_uncertain_marginal.hh
index cd5ddddf7e9e71ebf5b354a1c43c2c4a3b320386..aeff2fc7e63e52b983a339691d6a47f38dea5451 100644
--- a/src/graph/inference/uncertain/graph_blockmodel_uncertain_marginal.hh
+++ b/src/graph/inference/uncertain/graph_blockmodel_uncertain_marginal.hh
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <vector>
-
 #include "../support/graph_state.hh"
 #include "../blockmodel/graph_blockmodel_util.hh"
 #include "graph_blockmodel_sample_edge.hh"
diff --git a/src/graph/layout/graph_arf.hh b/src/graph/layout/graph_arf.hh
index e7a5559672ffbf0b0e8269e6b4832548c51475f6..40256f7b641b130ca42b95a667c9249ee2a89deb 100644
--- a/src/graph/layout/graph_arf.hh
+++ b/src/graph/layout/graph_arf.hh
@@ -18,9 +18,6 @@
 #ifndef GRAPH_ARF_HH
 #define GRAPH_ARF_HH
 
-#include <limits>
-#include <iostream>
-
 namespace graph_tool
 {
 using namespace std;
diff --git a/src/graph/mpl_nested_loop.hh b/src/graph/mpl_nested_loop.hh
index 106cc58538c4a21457b011596daf8efee68a3e2c..55aaa8750436fc5391c3c1a26b4709c556587d58 100644
--- a/src/graph/mpl_nested_loop.hh
+++ b/src/graph/mpl_nested_loop.hh
@@ -18,11 +18,6 @@
 #ifndef NESTED_FOR_LOOP_HH
 #define NESTED_FOR_LOOP_HH
 
-#include <boost/mpl/for_each.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/empty.hpp>
-#include <boost/any.hpp>
-
 namespace boost
 {
 namespace mpl
diff --git a/src/graph/numpy_bind.hh b/src/graph/numpy_bind.hh
index 29e517c120c061808c7b18ab17aa33183740db6e..a1a249e7204a7fa695b965c554564b31c25a20ac 100644
--- a/src/graph/numpy_bind.hh
+++ b/src/graph/numpy_bind.hh
@@ -34,10 +34,8 @@
 #include <boost/multi_array.hpp>
 
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/vector.hpp>
 #include <boost/mpl/map.hpp>
 #include <boost/mpl/pair.hpp>
-#include <boost/mpl/for_each.hpp>
 
 #include "demangle.hh"
 
diff --git a/src/graph/random.cc b/src/graph/random.cc
index b6076a11be20d48d2af77fdf93319f0b051b51d7..f92d7aea9d0feb4a0a981fe11065c1f8125851a2 100644
--- a/src/graph/random.cc
+++ b/src/graph/random.cc
@@ -19,6 +19,8 @@
 #include "random.hh"
 #include "parallel_rng.hh"
 
+#include <random>
+
 rng_t get_rng(size_t seed)
 {
     parallel_rng<rng_t>::clear();
diff --git a/src/graph/random.hh b/src/graph/random.hh
index c05c408ea4401e632222f733fc3ea6d37dbb4f62..aa8deea154b1a69c6b7a75ded48491fca2bd81d7 100644
--- a/src/graph/random.hh
+++ b/src/graph/random.hh
@@ -18,7 +18,6 @@
 #ifndef RANDOM_HH
 #define RANDOM_HH
 
-#include <random>
 #include "pcg_random.hpp"
 
 //typedef std::mt19937_64 rng_t;
diff --git a/src/graph/read_graphviz_new.cpp b/src/graph/read_graphviz_new.cpp
index b1f675670e99fc8b727f491a6ff053283587e47a..630e36f78c77a071c504fd47aefde2d08432be3b 100644
--- a/src/graph/read_graphviz_new.cpp
+++ b/src/graph/read_graphviz_new.cpp
@@ -31,18 +31,12 @@
 #else
 #   include <boost/dynamic_property_map.hpp>
 #endif
-#include <boost/graph/graph_traits.hpp>
-#include <boost/detail/workaround.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
-#include <algorithm>
-#include <exception> // for std::exception
 #include <string>
 #include <vector>
 #include <set>
 #include <utility>
 #include <map>
-#include <iostream>
-#include <cstdlib>
 #include <boost/throw_exception.hpp>
 #include <boost/regex.hpp>
 #include <boost/graph/graphviz.hpp>
diff --git a/src/graph/stats/graph_parallel.cc b/src/graph/stats/graph_parallel.cc
index b608ad540679cef13a051ce0db67187517568fc2..6ae7118966d95bbfc30f3360fb87400f47db92ca 100644
--- a/src/graph/stats/graph_parallel.cc
+++ b/src/graph/stats/graph_parallel.cc
@@ -23,8 +23,6 @@
 
 #include <boost/python.hpp>
 
-#include <iostream>
-
 using namespace std;
 using namespace boost;
 using namespace graph_tool;
diff --git a/src/graph/str_repr.hh b/src/graph/str_repr.hh
index 65fae6e0cc51ebdee967db021d6b1f8fc2d558af..057013e0ace435ec6620f9f97ac49be676e3cebb 100644
--- a/src/graph/str_repr.hh
+++ b/src/graph/str_repr.hh
@@ -18,7 +18,6 @@
 #ifndef STR_REPR_HH
 #define STR_REPR_HH
 
-#include <iostream>
 #include <clocale>
 #include <sstream>
 #include <boost/lexical_cast.hpp>
diff --git a/src/graph/topology/graph_bipartite_weighted_matching.hh b/src/graph/topology/graph_bipartite_weighted_matching.hh
index 0fdbc8098cf685ebab927c1f98cc9a69dd5d2757..5fe31903b35b5cc93c61f455fb22aa2bc545241c 100644
--- a/src/graph/topology/graph_bipartite_weighted_matching.hh
+++ b/src/graph/topology/graph_bipartite_weighted_matching.hh
@@ -20,7 +20,6 @@
 
 #include <stack>
 #include <boost/graph/breadth_first_search.hpp>
-#include <boost/graph/max_cardinality_matching.hpp>
 #include "idx_map.hh"
 
 namespace graph_tool
diff --git a/src/graph/topology/graph_matching.cc b/src/graph/topology/graph_matching.cc
index 15797dc1d70ccd4e143a49d1cbcc81f5c76dffa6..b46e5bd7f905e57464fd7db9318b9850a47faa8c 100644
--- a/src/graph/topology/graph_matching.cc
+++ b/src/graph/topology/graph_matching.cc
@@ -19,7 +19,6 @@
 #include "graph.hh"
 #include "graph_properties.hh"
 
-#include <boost/graph/max_cardinality_matching.hpp>
 #include <boost/graph/maximum_weighted_matching.hpp>
 
 #include "graph_bipartite_weighted_matching.hh"
diff --git a/src/graph/topology/graph_transitive_closure.cc b/src/graph/topology/graph_transitive_closure.cc
index d419f057e9de5ed4c44f10ddefc3693f58d7beb5..3856551308bff2dc7e3d69ef520e7f20d4f07c34 100644
--- a/src/graph/topology/graph_transitive_closure.cc
+++ b/src/graph/topology/graph_transitive_closure.cc
@@ -15,7 +15,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-#include <boost/python.hpp>
 #include <boost/graph/transitive_closure.hpp>
 
 #include "graph.hh"