diff --git a/include/CXXGraph/Graph/Algorithm/BellmanFord_impl.hpp b/include/CXXGraph/Graph/Algorithm/BellmanFord_impl.hpp
index 80edd1ae4..83232531e 100644
--- a/include/CXXGraph/Graph/Algorithm/BellmanFord_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/BellmanFord_impl.hpp
@@ -26,6 +26,7 @@
 #include <unordered_map>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 template <typename T>
diff --git a/include/CXXGraph/Graph/Algorithm/BestFirstSearch_impl.hpp b/include/CXXGraph/Graph/Algorithm/BestFirstSearch_impl.hpp
index e75bf2ac7..bb43b773b 100644
--- a/include/CXXGraph/Graph/Algorithm/BestFirstSearch_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/BestFirstSearch_impl.hpp
@@ -34,6 +34,7 @@
 #include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 template <typename T>
diff --git a/include/CXXGraph/Graph/Algorithm/Boruvka_impl.hpp b/include/CXXGraph/Graph/Algorithm/Boruvka_impl.hpp
index 109798d4d..0445cb3ab 100644
--- a/include/CXXGraph/Graph/Algorithm/Boruvka_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Boruvka_impl.hpp
@@ -27,6 +27,7 @@
 #include <unordered_map>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 
diff --git a/include/CXXGraph/Graph/Algorithm/BronKerbosch_impl.hpp b/include/CXXGraph/Graph/Algorithm/BronKerbosch_impl.hpp
index 53e38c4dc..57abe445f 100644
--- a/include/CXXGraph/Graph/Algorithm/BronKerbosch_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/BronKerbosch_impl.hpp
@@ -25,6 +25,7 @@
 #include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 
diff --git a/include/CXXGraph/Graph/Algorithm/Dial_impl.hpp b/include/CXXGraph/Graph/Algorithm/Dial_impl.hpp
index 0c6fa1c79..37f1b5917 100644
--- a/include/CXXGraph/Graph/Algorithm/Dial_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Dial_impl.hpp
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 
diff --git a/include/CXXGraph/Graph/Algorithm/Dijkstra_impl.hpp b/include/CXXGraph/Graph/Algorithm/Dijkstra_impl.hpp
index 6bc6e6b28..af9095dab 100644
--- a/include/CXXGraph/Graph/Algorithm/Dijkstra_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Dijkstra_impl.hpp
@@ -31,6 +31,7 @@
 #include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 template <typename T>
diff --git a/include/CXXGraph/Graph/Algorithm/FloydWarshall_impl.hpp b/include/CXXGraph/Graph/Algorithm/FloydWarshall_impl.hpp
index c6b421d98..c137764d0 100644
--- a/include/CXXGraph/Graph/Algorithm/FloydWarshall_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/FloydWarshall_impl.hpp
@@ -27,6 +27,7 @@
 #include <utility>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 template <typename T>
diff --git a/include/CXXGraph/Graph/Algorithm/HopcroftKarp_impl.hpp b/include/CXXGraph/Graph/Algorithm/HopcroftKarp_impl.hpp
index aad6ac8ee..53b1ee56d 100644
--- a/include/CXXGraph/Graph/Algorithm/HopcroftKarp_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/HopcroftKarp_impl.hpp
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 template <typename T>
diff --git a/include/CXXGraph/Graph/Algorithm/Kahn_impl.hpp b/include/CXXGraph/Graph/Algorithm/Kahn_impl.hpp
index 10888dfc4..45f3cec86 100644
--- a/include/CXXGraph/Graph/Algorithm/Kahn_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Kahn_impl.hpp
@@ -26,6 +26,7 @@
 #include <unordered_map>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 
diff --git a/include/CXXGraph/Graph/Algorithm/Kosaraju_impl.hpp b/include/CXXGraph/Graph/Algorithm/Kosaraju_impl.hpp
index 06b020807..7e34f7017 100644
--- a/include/CXXGraph/Graph/Algorithm/Kosaraju_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Kosaraju_impl.hpp
@@ -27,6 +27,7 @@
 #include <utility>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 
diff --git a/include/CXXGraph/Graph/Algorithm/Kruskal_impl.hpp b/include/CXXGraph/Graph/Algorithm/Kruskal_impl.hpp
index 6b6b65d4b..b669c62d9 100644
--- a/include/CXXGraph/Graph/Algorithm/Kruskal_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Kruskal_impl.hpp
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 
diff --git a/include/CXXGraph/Graph/Algorithm/Prim_impl.hpp b/include/CXXGraph/Graph/Algorithm/Prim_impl.hpp
index d3eb90ed2..243b0b07b 100644
--- a/include/CXXGraph/Graph/Algorithm/Prim_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Prim_impl.hpp
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 
diff --git a/include/CXXGraph/Graph/Algorithm/Tarjan_impl.hpp b/include/CXXGraph/Graph/Algorithm/Tarjan_impl.hpp
index c73156ee5..5c59f7d6d 100644
--- a/include/CXXGraph/Graph/Algorithm/Tarjan_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Tarjan_impl.hpp
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 
diff --git a/include/CXXGraph/Graph/Algorithm/TopologicalSort_impl.hpp b/include/CXXGraph/Graph/Algorithm/TopologicalSort_impl.hpp
index 01fa7d9a3..d3fe18e22 100644
--- a/include/CXXGraph/Graph/Algorithm/TopologicalSort_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/TopologicalSort_impl.hpp
@@ -25,6 +25,7 @@
 #include <unordered_map>
 
 #include "CXXGraph/Graph/Graph_decl.h"
+#include "CXXGraph/Utility/ConstString.hpp"
 
 namespace CXXGraph {
 
diff --git a/include/CXXGraph/Partitioning/EBV.hpp b/include/CXXGraph/Partitioning/EBV.hpp
index f6ee64c24..8972af008 100644
--- a/include/CXXGraph/Partitioning/EBV.hpp
+++ b/include/CXXGraph/Partitioning/EBV.hpp
@@ -30,6 +30,7 @@
 
 #include "CXXGraph/Edge/Edge.h"
 #include "CXXGraph/Partitioning/Utility/Globals.hpp"
+#include "CoordinatedPartitionState.hpp"
 #include "PartitionStrategy.hpp"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Partitioning/EdgeBalancedVertexCut.hpp b/include/CXXGraph/Partitioning/EdgeBalancedVertexCut.hpp
index 7e3141d00..20119b57d 100644
--- a/include/CXXGraph/Partitioning/EdgeBalancedVertexCut.hpp
+++ b/include/CXXGraph/Partitioning/EdgeBalancedVertexCut.hpp
@@ -28,6 +28,7 @@
 
 #include "CXXGraph/Edge/Edge.h"
 #include "CXXGraph/Partitioning/Utility/Globals.hpp"
+#include "CoordinatedPartitionState.hpp"
 #include "PartitionStrategy.hpp"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Partitioning/GreedyVertexCut.hpp b/include/CXXGraph/Partitioning/GreedyVertexCut.hpp
index c2bba4474..faabee6fb 100644
--- a/include/CXXGraph/Partitioning/GreedyVertexCut.hpp
+++ b/include/CXXGraph/Partitioning/GreedyVertexCut.hpp
@@ -34,6 +34,7 @@
 
 #include "CXXGraph/Edge/Edge.h"
 #include "CXXGraph/Partitioning/Utility/Globals.hpp"
+#include "CoordinatedPartitionState.hpp"
 #include "PartitionStrategy.hpp"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Partitioning/HDRF.hpp b/include/CXXGraph/Partitioning/HDRF.hpp
index c062960fd..640be3584 100644
--- a/include/CXXGraph/Partitioning/HDRF.hpp
+++ b/include/CXXGraph/Partitioning/HDRF.hpp
@@ -29,6 +29,7 @@
 
 #include "CXXGraph/Edge/Edge.h"
 #include "CXXGraph/Partitioning/Utility/Globals.hpp"
+#include "CoordinatedPartitionState.hpp"
 #include "PartitionStrategy.hpp"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Partitioning/PartitionState.hpp b/include/CXXGraph/Partitioning/PartitionState.hpp
index 1901d1a00..9a5292ae4 100644
--- a/include/CXXGraph/Partitioning/PartitionState.hpp
+++ b/include/CXXGraph/Partitioning/PartitionState.hpp
@@ -26,6 +26,7 @@
 #include <set>
 #include <vector>
 
+#include "CXXGraph/Utility/id_t.hpp"
 #include "Record.hpp"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Partitioning/WeightBalancedLibra.hpp b/include/CXXGraph/Partitioning/WeightBalancedLibra.hpp
index 6aad6db71..7d398b077 100644
--- a/include/CXXGraph/Partitioning/WeightBalancedLibra.hpp
+++ b/include/CXXGraph/Partitioning/WeightBalancedLibra.hpp
@@ -30,6 +30,7 @@
 
 #include "CXXGraph/Edge/Edge.h"
 #include "CXXGraph/Partitioning/Utility/Globals.hpp"
+#include "CoordinatedPartitionState.hpp"
 #include "PartitionStrategy.hpp"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Utility/id_t.hpp b/include/CXXGraph/Utility/id_t.hpp
index 403fff67f..d36649d87 100644
--- a/include/CXXGraph/Utility/id_t.hpp
+++ b/include/CXXGraph/Utility/id_t.hpp
@@ -12,6 +12,6 @@ static_assert(IS_UNSIGNED(CXXGRAPH_ID_TYPE),
 
 typedef CXXGRAPH_ID_TYPE id_t;
 #else
-typedef size_t id_t;
+typedef std::size_t id_t;
 #endif
 }  // namespace CXXGraph