diff --git a/benchmark/BFS_BM.cpp b/benchmark/BFS_BM.cpp
index 301ab316d..47c6fba3a 100644
--- a/benchmark/BFS_BM.cpp
+++ b/benchmark/BFS_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/BellmanFord_BM.cpp b/benchmark/BellmanFord_BM.cpp
index b444091a5..721fe9464 100644
--- a/benchmark/BellmanFord_BM.cpp
+++ b/benchmark/BellmanFord_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/Boruvka_BM.cpp b/benchmark/Boruvka_BM.cpp
index 484ea5eaf..2e93d45a0 100644
--- a/benchmark/Boruvka_BM.cpp
+++ b/benchmark/Boruvka_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/Connectivity_BM.cpp b/benchmark/Connectivity_BM.cpp
index 4cb57de1a..ef068b60f 100644
--- a/benchmark/Connectivity_BM.cpp
+++ b/benchmark/Connectivity_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/CycleCheck_BM.cpp b/benchmark/CycleCheck_BM.cpp
index 3145c6930..34e332a7f 100644
--- a/benchmark/CycleCheck_BM.cpp
+++ b/benchmark/CycleCheck_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/DFS_BM.cpp b/benchmark/DFS_BM.cpp
index e01e1c697..650f67e7c 100644
--- a/benchmark/DFS_BM.cpp
+++ b/benchmark/DFS_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/Dial_BM.cpp b/benchmark/Dial_BM.cpp
index 9119a0b1f..5851123b7 100644
--- a/benchmark/Dial_BM.cpp
+++ b/benchmark/Dial_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/Dijkstra_BM.cpp b/benchmark/Dijkstra_BM.cpp
index 90913c0c5..e4aa17d71 100644
--- a/benchmark/Dijkstra_BM.cpp
+++ b/benchmark/Dijkstra_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/EulerPath_BM.cpp b/benchmark/EulerPath_BM.cpp
index 735e5c0af..007f5921a 100644
--- a/benchmark/EulerPath_BM.cpp
+++ b/benchmark/EulerPath_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/FordFulkerson_BM.cpp b/benchmark/FordFulkerson_BM.cpp
index fd11563f7..5202e5393 100644
--- a/benchmark/FordFulkerson_BM.cpp
+++ b/benchmark/FordFulkerson_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/GraphSlicing_BM.cpp b/benchmark/GraphSlicing_BM.cpp
index baf51bf42..826286dbc 100644
--- a/benchmark/GraphSlicing_BM.cpp
+++ b/benchmark/GraphSlicing_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/Graph_BM.cpp b/benchmark/Graph_BM.cpp
index a3817f0f5..f2062f5c1 100644
--- a/benchmark/Graph_BM.cpp
+++ b/benchmark/Graph_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/Kosaraju_BM.cpp b/benchmark/Kosaraju_BM.cpp
index 691517529..a1dae4890 100644
--- a/benchmark/Kosaraju_BM.cpp
+++ b/benchmark/Kosaraju_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/Kruskal_BM.cpp b/benchmark/Kruskal_BM.cpp
index bb1a1cd24..708d2017d 100644
--- a/benchmark/Kruskal_BM.cpp
+++ b/benchmark/Kruskal_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/Partition_BM.cpp b/benchmark/Partition_BM.cpp
index 9d2354480..27567f51c 100644
--- a/benchmark/Partition_BM.cpp
+++ b/benchmark/Partition_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/Prim_BM.cpp b/benchmark/Prim_BM.cpp
index 933b0d91c..fdbf531d9 100644
--- a/benchmark/Prim_BM.cpp
+++ b/benchmark/Prim_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/TopologicalSort_BM.cpp b/benchmark/TopologicalSort_BM.cpp
index d19218d9b..fca6e8af1 100644
--- a/benchmark/TopologicalSort_BM.cpp
+++ b/benchmark/TopologicalSort_BM.cpp
@@ -1,5 +1,7 @@
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "Utilities.hpp"
 
diff --git a/benchmark/Utilities.hpp b/benchmark/Utilities.hpp
index 89900f5fb..d24f6bf0a 100644
--- a/benchmark/Utilities.hpp
+++ b/benchmark/Utilities.hpp
@@ -1,7 +1,9 @@
 #ifndef __UTILITIES_H__
 #define __UTILITIES_H__
 #include <ctime>
+#include <map>
 #include <random>
+#include <string>
 
 #include "CXXGraph/CXXGraph.hpp"
 
diff --git a/examples/DialExample/dial_example.cpp b/examples/DialExample/dial_example.cpp
index 918ab117e..655565aa4 100644
--- a/examples/DialExample/dial_example.cpp
+++ b/examples/DialExample/dial_example.cpp
@@ -1,6 +1,8 @@
 #include <CXXGraph/CXXGraph.hpp>
 #include <cmath>
+#include <iostream>
 #include <memory>
+#include <vector>
 
 using std::make_shared;
 
diff --git a/examples/DijkstraExample/dijkstra_example.cpp b/examples/DijkstraExample/dijkstra_example.cpp
index bbece6e60..1d4475ce1 100644
--- a/examples/DijkstraExample/dijkstra_example.cpp
+++ b/examples/DijkstraExample/dijkstra_example.cpp
@@ -1,4 +1,5 @@
 #include <CXXGraph/CXXGraph.hpp>
+#include <iostream>
 #include <memory>
 
 using std::make_shared;
diff --git a/examples/FloydWarshallExample/floyd_warshall.cpp b/examples/FloydWarshallExample/floyd_warshall.cpp
index 20e661d42..d545d293e 100644
--- a/examples/FloydWarshallExample/floyd_warshall.cpp
+++ b/examples/FloydWarshallExample/floyd_warshall.cpp
@@ -1,4 +1,5 @@
 #include <CXXGraph/CXXGraph.hpp>
+#include <iostream>
 #include <memory>
 
 using std::make_shared;
diff --git a/examples/PartitionExample/partition_example.cpp b/examples/PartitionExample/partition_example.cpp
index f0fbae37b..775ca5c79 100644
--- a/examples/PartitionExample/partition_example.cpp
+++ b/examples/PartitionExample/partition_example.cpp
@@ -1,6 +1,7 @@
 #include <cstdlib>
 #include <ctime>
-#include <iterator>
+#include <iostream>
+#include <string>
 
 #include "CXXGraph/CXXGraph.hpp"
 
diff --git a/examples/PrimExample/prim_example.cpp b/examples/PrimExample/prim_example.cpp
index cef3d8f8c..181fd6d8b 100644
--- a/examples/PrimExample/prim_example.cpp
+++ b/examples/PrimExample/prim_example.cpp
@@ -1,4 +1,5 @@
 #include <CXXGraph/CXXGraph.hpp>
+#include <iostream>
 #include <memory>
 
 using std::make_shared;
diff --git a/include/CXXGraph/Edge/DirectedEdge_decl.h b/include/CXXGraph/Edge/DirectedEdge_decl.h
index 844312c5c..92837db3d 100644
--- a/include/CXXGraph/Edge/DirectedEdge_decl.h
+++ b/include/CXXGraph/Edge/DirectedEdge_decl.h
@@ -22,6 +22,10 @@
 
 #pragma once
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include "Edge_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Edge/DirectedEdge_impl.hpp b/include/CXXGraph/Edge/DirectedEdge_impl.hpp
index cfaf20932..4b622b006 100644
--- a/include/CXXGraph/Edge/DirectedEdge_impl.hpp
+++ b/include/CXXGraph/Edge/DirectedEdge_impl.hpp
@@ -22,6 +22,9 @@
 
 #pragma once
 
+#include <string>
+#include <utility>
+
 #include "DirectedEdge_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Edge/DirectedWeightedEdge_decl.h b/include/CXXGraph/Edge/DirectedWeightedEdge_decl.h
index 8aa9627bd..a28076235 100644
--- a/include/CXXGraph/Edge/DirectedWeightedEdge_decl.h
+++ b/include/CXXGraph/Edge/DirectedWeightedEdge_decl.h
@@ -21,6 +21,10 @@
 
 #pragma once
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include "DirectedEdge_decl.h"
 #include "Weighted.h"
 
diff --git a/include/CXXGraph/Edge/DirectedWeightedEdge_impl.hpp b/include/CXXGraph/Edge/DirectedWeightedEdge_impl.hpp
index 6b7909cd6..83d1f5306 100644
--- a/include/CXXGraph/Edge/DirectedWeightedEdge_impl.hpp
+++ b/include/CXXGraph/Edge/DirectedWeightedEdge_impl.hpp
@@ -21,6 +21,9 @@
 
 #pragma once
 
+#include <string>
+#include <utility>
+
 #include "DirectedWeightedEdge_decl.h"
 #include "Weighted.h"
 
diff --git a/include/CXXGraph/Edge/Edge_decl.h b/include/CXXGraph/Edge/Edge_decl.h
index 40222b9c0..deb1202b4 100644
--- a/include/CXXGraph/Edge/Edge_decl.h
+++ b/include/CXXGraph/Edge/Edge_decl.h
@@ -24,6 +24,7 @@
 
 #include <memory>
 #include <optional>
+#include <string>
 #include <utility>
 
 #include "CXXGraph/Node/Node.h"
diff --git a/include/CXXGraph/Edge/Edge_impl.hpp b/include/CXXGraph/Edge/Edge_impl.hpp
index 88cbc3a00..48ec9d103 100644
--- a/include/CXXGraph/Edge/Edge_impl.hpp
+++ b/include/CXXGraph/Edge/Edge_impl.hpp
@@ -22,6 +22,10 @@
 
 #pragma once
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include "CXXGraph/Edge/Edge_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Edge/UndirectedEdge_decl.h b/include/CXXGraph/Edge/UndirectedEdge_decl.h
index ac0ac9fb6..f5f0337be 100644
--- a/include/CXXGraph/Edge/UndirectedEdge_decl.h
+++ b/include/CXXGraph/Edge/UndirectedEdge_decl.h
@@ -22,6 +22,10 @@
 
 #pragma once
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include "Edge_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Edge/UndirectedEdge_impl.hpp b/include/CXXGraph/Edge/UndirectedEdge_impl.hpp
index 91bf1cbb4..cd9920f89 100644
--- a/include/CXXGraph/Edge/UndirectedEdge_impl.hpp
+++ b/include/CXXGraph/Edge/UndirectedEdge_impl.hpp
@@ -22,6 +22,9 @@
 
 #pragma once
 
+#include <string>
+#include <utility>
+
 #include "UndirectedEdge_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h b/include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h
index 18a54e6cb..613fa7fa5 100644
--- a/include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h
+++ b/include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h
@@ -22,6 +22,10 @@
 
 #pragma once
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include "UndirectedEdge_decl.h"
 #include "Weighted.h"
 
diff --git a/include/CXXGraph/Edge/UndirectedWeightedEdge_impl.hpp b/include/CXXGraph/Edge/UndirectedWeightedEdge_impl.hpp
index a36265c28..b03ad55ce 100644
--- a/include/CXXGraph/Edge/UndirectedWeightedEdge_impl.hpp
+++ b/include/CXXGraph/Edge/UndirectedWeightedEdge_impl.hpp
@@ -22,6 +22,9 @@
 
 #pragma once
 
+#include <string>
+#include <utility>
+
 #include "UndirectedWeightedEdge_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/BellmanFord_impl.hpp b/include/CXXGraph/Graph/Algorithm/BellmanFord_impl.hpp
index 15dae4f8f..80edd1ae4 100644
--- a/include/CXXGraph/Graph/Algorithm/BellmanFord_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/BellmanFord_impl.hpp
@@ -23,6 +23,7 @@
 #pragma once
 
 #include <algorithm>
+#include <unordered_map>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 
diff --git a/include/CXXGraph/Graph/Algorithm/BestFirstSearch_impl.hpp b/include/CXXGraph/Graph/Algorithm/BestFirstSearch_impl.hpp
index 81011472f..e75bf2ac7 100644
--- a/include/CXXGraph/Graph/Algorithm/BestFirstSearch_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/BestFirstSearch_impl.hpp
@@ -25,9 +25,13 @@
 #include <algorithm>
 #include <atomic>
 #include <condition_variable>
+#include <memory>
 #include <mutex>
 #include <queue>
 #include <thread>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 
diff --git a/include/CXXGraph/Graph/Algorithm/Boruvka_impl.hpp b/include/CXXGraph/Graph/Algorithm/Boruvka_impl.hpp
index bdd55ab6f..109798d4d 100644
--- a/include/CXXGraph/Graph/Algorithm/Boruvka_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Boruvka_impl.hpp
@@ -24,6 +24,8 @@
 
 #include <limits.h>
 
+#include <unordered_map>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/BreadthFirstSearch_impl.hpp b/include/CXXGraph/Graph/Algorithm/BreadthFirstSearch_impl.hpp
index 155bb9448..041b24f77 100644
--- a/include/CXXGraph/Graph/Algorithm/BreadthFirstSearch_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/BreadthFirstSearch_impl.hpp
@@ -23,6 +23,8 @@
 #pragma once
 
 #include <algorithm>
+#include <queue>
+#include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 
diff --git a/include/CXXGraph/Graph/Algorithm/BronKerbosch_impl.hpp b/include/CXXGraph/Graph/Algorithm/BronKerbosch_impl.hpp
index f32978fe1..53e38c4dc 100644
--- a/include/CXXGraph/Graph/Algorithm/BronKerbosch_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/BronKerbosch_impl.hpp
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <vector>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/Connectivity_impl.hpp b/include/CXXGraph/Graph/Algorithm/Connectivity_impl.hpp
index d684c7fa5..dfe18c5d6 100644
--- a/include/CXXGraph/Graph/Algorithm/Connectivity_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Connectivity_impl.hpp
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <unordered_map>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/CycleDetection_impl.hpp b/include/CXXGraph/Graph/Algorithm/CycleDetection_impl.hpp
index 13954ab70..f72ed3b7b 100644
--- a/include/CXXGraph/Graph/Algorithm/CycleDetection_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/CycleDetection_impl.hpp
@@ -23,6 +23,10 @@
 #pragma once
 
 #include <algorithm>
+#include <memory>
+#include <queue>
+#include <unordered_map>
+#include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 
diff --git a/include/CXXGraph/Graph/Algorithm/DepthFirstSearch_impl.hpp b/include/CXXGraph/Graph/Algorithm/DepthFirstSearch_impl.hpp
index 7a417faf7..2ac9129f7 100644
--- a/include/CXXGraph/Graph/Algorithm/DepthFirstSearch_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/DepthFirstSearch_impl.hpp
@@ -23,6 +23,8 @@
 #pragma once
 
 #include <algorithm>
+#include <memory>
+#include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 
diff --git a/include/CXXGraph/Graph/Algorithm/Dial_impl.hpp b/include/CXXGraph/Graph/Algorithm/Dial_impl.hpp
index d1679c0d8..0c6fa1c79 100644
--- a/include/CXXGraph/Graph/Algorithm/Dial_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Dial_impl.hpp
@@ -23,6 +23,10 @@
 #pragma once
 
 #include <algorithm>
+#include <deque>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 
diff --git a/include/CXXGraph/Graph/Algorithm/Dijkstra_impl.hpp b/include/CXXGraph/Graph/Algorithm/Dijkstra_impl.hpp
index 8f2d4a438..6bc6e6b28 100644
--- a/include/CXXGraph/Graph/Algorithm/Dijkstra_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Dijkstra_impl.hpp
@@ -23,6 +23,12 @@
 #pragma once
 
 #include <algorithm>
+#include <map>
+#include <queue>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 
diff --git a/include/CXXGraph/Graph/Algorithm/EulerianPath_impl.hpp b/include/CXXGraph/Graph/Algorithm/EulerianPath_impl.hpp
index 4cf67a5c0..fa4887dee 100644
--- a/include/CXXGraph/Graph/Algorithm/EulerianPath_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/EulerianPath_impl.hpp
@@ -22,6 +22,9 @@
 
 #pragma once
 
+#include <memory>
+#include <vector>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/FloydWarshall_impl.hpp b/include/CXXGraph/Graph/Algorithm/FloydWarshall_impl.hpp
index a7282af1f..c6b421d98 100644
--- a/include/CXXGraph/Graph/Algorithm/FloydWarshall_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/FloydWarshall_impl.hpp
@@ -22,6 +22,10 @@
 
 #pragma once
 
+#include <string>
+#include <unordered_map>
+#include <utility>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/FordFulkerson_impl.hpp b/include/CXXGraph/Graph/Algorithm/FordFulkerson_impl.hpp
index c0ad641f7..2ab396676 100644
--- a/include/CXXGraph/Graph/Algorithm/FordFulkerson_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/FordFulkerson_impl.hpp
@@ -23,6 +23,8 @@
 #pragma once
 
 #include <algorithm>
+#include <queue>
+#include <unordered_map>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 
diff --git a/include/CXXGraph/Graph/Algorithm/HopcroftKarp_impl.hpp b/include/CXXGraph/Graph/Algorithm/HopcroftKarp_impl.hpp
index dad2c508f..aad6ac8ee 100644
--- a/include/CXXGraph/Graph/Algorithm/HopcroftKarp_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/HopcroftKarp_impl.hpp
@@ -24,6 +24,9 @@
 
 #include <iostream>
 #include <queue>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 
diff --git a/include/CXXGraph/Graph/Algorithm/Kahn_impl.hpp b/include/CXXGraph/Graph/Algorithm/Kahn_impl.hpp
index 5bfe0f347..10888dfc4 100644
--- a/include/CXXGraph/Graph/Algorithm/Kahn_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Kahn_impl.hpp
@@ -22,6 +22,9 @@
 
 #pragma once
 
+#include <queue>
+#include <unordered_map>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/Kosaraju_impl.hpp b/include/CXXGraph/Graph/Algorithm/Kosaraju_impl.hpp
index 7ee2b7f2c..06b020807 100644
--- a/include/CXXGraph/Graph/Algorithm/Kosaraju_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Kosaraju_impl.hpp
@@ -23,6 +23,8 @@
 #pragma once
 
 #include <stack>
+#include <unordered_map>
+#include <utility>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 
diff --git a/include/CXXGraph/Graph/Algorithm/Kruskal_impl.hpp b/include/CXXGraph/Graph/Algorithm/Kruskal_impl.hpp
index 01a5b356e..6b6b65d4b 100644
--- a/include/CXXGraph/Graph/Algorithm/Kruskal_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Kruskal_impl.hpp
@@ -22,6 +22,11 @@
 
 #pragma once
 
+#include <queue>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/Prim_impl.hpp b/include/CXXGraph/Graph/Algorithm/Prim_impl.hpp
index 1ad0ddcd8..d3eb90ed2 100644
--- a/include/CXXGraph/Graph/Algorithm/Prim_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Prim_impl.hpp
@@ -22,6 +22,12 @@
 
 #pragma once
 
+#include <queue>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/Tarjan_impl.hpp b/include/CXXGraph/Graph/Algorithm/Tarjan_impl.hpp
index a589bb184..c73156ee5 100644
--- a/include/CXXGraph/Graph/Algorithm/Tarjan_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/Tarjan_impl.hpp
@@ -22,6 +22,11 @@
 
 #pragma once
 
+#include <stack>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/TopologicalSort_impl.hpp b/include/CXXGraph/Graph/Algorithm/TopologicalSort_impl.hpp
index d05a57c74..01fa7d9a3 100644
--- a/include/CXXGraph/Graph/Algorithm/TopologicalSort_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/TopologicalSort_impl.hpp
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <unordered_map>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/TransitiveReduction_impl.hpp b/include/CXXGraph/Graph/Algorithm/TransitiveReduction_impl.hpp
index c749e0b86..8b27465b4 100644
--- a/include/CXXGraph/Graph/Algorithm/TransitiveReduction_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/TransitiveReduction_impl.hpp
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <unordered_set>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Algorithm/WelshPowellColoring_impl.hpp b/include/CXXGraph/Graph/Algorithm/WelshPowellColoring_impl.hpp
index c1cb8c87a..f125bfc79 100644
--- a/include/CXXGraph/Graph/Algorithm/WelshPowellColoring_impl.hpp
+++ b/include/CXXGraph/Graph/Algorithm/WelshPowellColoring_impl.hpp
@@ -7,6 +7,11 @@
 
 #pragma once
 
+#include <map>
+#include <memory>
+#include <utility>
+#include <vector>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/Graph_decl.h b/include/CXXGraph/Graph/Graph_decl.h
index 7c5156c5b..ab6ee2a05 100644
--- a/include/CXXGraph/Graph/Graph_decl.h
+++ b/include/CXXGraph/Graph/Graph_decl.h
@@ -36,6 +36,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <vector>
 
 #include "CXXGraph/Edge/DirectedEdge.h"
 #include "CXXGraph/Edge/DirectedWeightedEdge.h"
diff --git a/include/CXXGraph/Graph/Graph_impl.hpp b/include/CXXGraph/Graph/Graph_impl.hpp
index bd6c5cc7c..07d79bba6 100644
--- a/include/CXXGraph/Graph/Graph_impl.hpp
+++ b/include/CXXGraph/Graph/Graph_impl.hpp
@@ -24,6 +24,12 @@
 
 #include <algorithm>
 #include <deque>
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
 
 #include "CXXGraph/Graph/Graph_decl.h"
 #include "CXXGraph/Utility/ConstString.hpp"
diff --git a/include/CXXGraph/Graph/IO/IOUtility_impl.hpp b/include/CXXGraph/Graph/IO/IOUtility_impl.hpp
index af1bc7df5..349b70a29 100644
--- a/include/CXXGraph/Graph/IO/IOUtility_impl.hpp
+++ b/include/CXXGraph/Graph/IO/IOUtility_impl.hpp
@@ -22,6 +22,9 @@
 
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/IO/InputOperation_impl.hpp b/include/CXXGraph/Graph/IO/InputOperation_impl.hpp
index 0a2258167..6348ad5dd 100644
--- a/include/CXXGraph/Graph/IO/InputOperation_impl.hpp
+++ b/include/CXXGraph/Graph/IO/InputOperation_impl.hpp
@@ -22,6 +22,10 @@
 
 #pragma once
 
+#include <string>
+#include <unordered_map>
+#include <utility>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Graph/IO/OutputOperation_impl.hpp b/include/CXXGraph/Graph/IO/OutputOperation_impl.hpp
index a3b6a975a..9aa6dcc3a 100644
--- a/include/CXXGraph/Graph/IO/OutputOperation_impl.hpp
+++ b/include/CXXGraph/Graph/IO/OutputOperation_impl.hpp
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <string>
+
 #include "CXXGraph/Graph/Graph_decl.h"
 
 namespace CXXGraph {
diff --git a/include/CXXGraph/Node/Node_decl.h b/include/CXXGraph/Node/Node_decl.h
index 0f29629de..e8b6e2b07 100644
--- a/include/CXXGraph/Node/Node_decl.h
+++ b/include/CXXGraph/Node/Node_decl.h
@@ -22,6 +22,7 @@
 
 #pragma once
 #include <iostream>
+#include <string>
 
 #include "CXXGraph/Utility/id_t.hpp"
 
diff --git a/include/CXXGraph/Node/Node_impl.hpp b/include/CXXGraph/Node/Node_impl.hpp
index c93507308..3deed5d18 100644
--- a/include/CXXGraph/Node/Node_impl.hpp
+++ b/include/CXXGraph/Node/Node_impl.hpp
@@ -21,6 +21,7 @@
 #define __CXXGRAPH_NODE_IMPL_H__
 
 #include <iomanip>
+#include <string>
 
 #include "Node_decl.h"
 
diff --git a/include/CXXGraph/Partitioning/CoordinatedPartitionState.hpp b/include/CXXGraph/Partitioning/CoordinatedPartitionState.hpp
index be2c638a8..c4ac51ea9 100644
--- a/include/CXXGraph/Partitioning/CoordinatedPartitionState.hpp
+++ b/include/CXXGraph/Partitioning/CoordinatedPartitionState.hpp
@@ -23,6 +23,7 @@
 #pragma once
 
 #include <algorithm>
+#include <map>
 #include <memory>
 #include <mutex>
 #include <set>
diff --git a/include/CXXGraph/Partitioning/CoordinatedRecord.hpp b/include/CXXGraph/Partitioning/CoordinatedRecord.hpp
index 5da31407a..0c0ecf6e7 100644
--- a/include/CXXGraph/Partitioning/CoordinatedRecord.hpp
+++ b/include/CXXGraph/Partitioning/CoordinatedRecord.hpp
@@ -22,6 +22,9 @@
 
 #pragma once
 
+#include <algorithm>
+#include <memory>
+#include <mutex>
 #include <set>
 
 #include "CXXGraph/Utility/Typedef.hpp"
diff --git a/include/CXXGraph/Partitioning/EBV.hpp b/include/CXXGraph/Partitioning/EBV.hpp
index 28554a8f0..f6ee64c24 100644
--- a/include/CXXGraph/Partitioning/EBV.hpp
+++ b/include/CXXGraph/Partitioning/EBV.hpp
@@ -20,10 +20,12 @@
 #ifndef __CXXGRAPH_PARTITIONING_EBV_H__
 #define __CXXGRAPH_PARTITIONING_EBV_H__
 
-#include <memory>
 #pragma once
 
 #include <chrono>
+#include <cmath>
+#include <map>
+#include <memory>
 #include <unordered_map>
 
 #include "CXXGraph/Edge/Edge.h"
diff --git a/include/CXXGraph/Partitioning/EdgeBalancedVertexCut.hpp b/include/CXXGraph/Partitioning/EdgeBalancedVertexCut.hpp
index 2c3606dd5..7e3141d00 100644
--- a/include/CXXGraph/Partitioning/EdgeBalancedVertexCut.hpp
+++ b/include/CXXGraph/Partitioning/EdgeBalancedVertexCut.hpp
@@ -20,10 +20,11 @@
 #ifndef __CXXGRAPH_PARTITIONING_EDGEBALANCEDVERTEXCUT_H__
 #define __CXXGRAPH_PARTITIONING_EDGEBALANCEDVERTEXCUT_H__
 
-#include <memory>
 #pragma once
 
 #include <chrono>
+#include <cmath>
+#include <memory>
 
 #include "CXXGraph/Edge/Edge.h"
 #include "CXXGraph/Partitioning/Utility/Globals.hpp"
diff --git a/include/CXXGraph/Partitioning/GreedyVertexCut.hpp b/include/CXXGraph/Partitioning/GreedyVertexCut.hpp
index 635f755ce..c2bba4474 100644
--- a/include/CXXGraph/Partitioning/GreedyVertexCut.hpp
+++ b/include/CXXGraph/Partitioning/GreedyVertexCut.hpp
@@ -20,13 +20,17 @@
 #ifndef __CXXGRAPH_PARTITIONING_GREEDYVERTEXCUT_H__
 #define __CXXGRAPH_PARTITIONING_GREEDYVERTEXCUT_H__
 
-#include <memory>
 #pragma once
 
 #include <limits.h>
 
+#include <algorithm>
 #include <chrono>
+#include <cmath>
+#include <memory>
 #include <random>
+#include <set>
+#include <vector>
 
 #include "CXXGraph/Edge/Edge.h"
 #include "CXXGraph/Partitioning/Utility/Globals.hpp"
diff --git a/include/CXXGraph/Partitioning/HDRF.hpp b/include/CXXGraph/Partitioning/HDRF.hpp
index 7c1ddc726..c062960fd 100644
--- a/include/CXXGraph/Partitioning/HDRF.hpp
+++ b/include/CXXGraph/Partitioning/HDRF.hpp
@@ -20,11 +20,12 @@
 #ifndef __CXXGRAPH_PARTITIONING_HDRF_H__
 #define __CXXGRAPH_PARTITIONING_HDRF_H__
 
-#include <memory>
 #pragma once
 
 #include <chrono>
+#include <memory>
 #include <random>
+#include <vector>
 
 #include "CXXGraph/Edge/Edge.h"
 #include "CXXGraph/Partitioning/Utility/Globals.hpp"
diff --git a/include/CXXGraph/Partitioning/PartitionState.hpp b/include/CXXGraph/Partitioning/PartitionState.hpp
index 6138c3ef2..1901d1a00 100644
--- a/include/CXXGraph/Partitioning/PartitionState.hpp
+++ b/include/CXXGraph/Partitioning/PartitionState.hpp
@@ -23,6 +23,8 @@
 #pragma once
 
 #include <memory>
+#include <set>
+#include <vector>
 
 #include "Record.hpp"
 
diff --git a/include/CXXGraph/Partitioning/PartitionStrategy.hpp b/include/CXXGraph/Partitioning/PartitionStrategy.hpp
index 93b732d75..95f951064 100644
--- a/include/CXXGraph/Partitioning/PartitionStrategy.hpp
+++ b/include/CXXGraph/Partitioning/PartitionStrategy.hpp
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "CXXGraph/Edge/Edge.h"
 #include "PartitionState.hpp"
 
diff --git a/include/CXXGraph/Partitioning/Partitioner.hpp b/include/CXXGraph/Partitioning/Partitioner.hpp
index a66259fda..451999443 100644
--- a/include/CXXGraph/Partitioning/Partitioner.hpp
+++ b/include/CXXGraph/Partitioning/Partitioner.hpp
@@ -20,8 +20,10 @@
 #ifndef __CXXGRAPH_PARTITIONING_PARTITIONER_H__
 #define __CXXGRAPH_PARTITIONING_PARTITIONER_H__
 
-#include <memory>
 #pragma once
+
+#include <memory>
+#include <unordered_map>
 #include <vector>
 
 #include "CXXGraph/Edge/Edge.h"
diff --git a/include/CXXGraph/Partitioning/Utility/Globals.hpp b/include/CXXGraph/Partitioning/Utility/Globals.hpp
old mode 100755
new mode 100644
index c031cac79..52296e509
--- a/include/CXXGraph/Partitioning/Utility/Globals.hpp
+++ b/include/CXXGraph/Partitioning/Utility/Globals.hpp
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <iostream>
+#include <string>
 #include <thread>
 
 #include "CXXGraph/Partitioning/PartitionAlgorithm.hpp"
diff --git a/include/CXXGraph/Partitioning/WeightBalancedLibra.hpp b/include/CXXGraph/Partitioning/WeightBalancedLibra.hpp
index 0662c0f73..6aad6db71 100644
--- a/include/CXXGraph/Partitioning/WeightBalancedLibra.hpp
+++ b/include/CXXGraph/Partitioning/WeightBalancedLibra.hpp
@@ -23,6 +23,10 @@
 #pragma once
 
 #include <chrono>
+#include <cmath>
+#include <memory>
+#include <set>
+#include <unordered_map>
 
 #include "CXXGraph/Edge/Edge.h"
 #include "CXXGraph/Partitioning/Utility/Globals.hpp"
diff --git a/include/CXXGraph/Utility/Reader.hpp b/include/CXXGraph/Utility/Reader.hpp
index be36a5c8b..bcabd78bd 100644
--- a/include/CXXGraph/Utility/Reader.hpp
+++ b/include/CXXGraph/Utility/Reader.hpp
@@ -22,6 +22,8 @@
 
 #pragma once  // This is to make sure that this header is only included once
 
+#include <fstream>
+
 namespace CXXGraph {
 // Foward declaration
 template <typename T>
diff --git a/include/CXXGraph/Utility/Typedef.hpp b/include/CXXGraph/Utility/Typedef.hpp
index f43783703..dcb06289f 100644
--- a/include/CXXGraph/Utility/Typedef.hpp
+++ b/include/CXXGraph/Utility/Typedef.hpp
@@ -25,6 +25,7 @@
 #include <memory>
 #include <string>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 #include "ConstValue.hpp"
diff --git a/include/CXXGraph/Utility/Writer.hpp b/include/CXXGraph/Utility/Writer.hpp
index 1173b8c03..45c5f21da 100755
--- a/include/CXXGraph/Utility/Writer.hpp
+++ b/include/CXXGraph/Utility/Writer.hpp
@@ -22,6 +22,8 @@
 
 #pragma once  // This is to make sure that this header is only included once
 
+#include <fstream>
+
 namespace CXXGraph {
 
 template <typename T>
diff --git a/test/BFSTest.cpp b/test/BFSTest.cpp
index 9e84337d4..161142bc4 100644
--- a/test/BFSTest.cpp
+++ b/test/BFSTest.cpp
@@ -1,4 +1,8 @@
+#include <memory>
 #include <random>
+#include <set>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "CXXGraph/CXXGraph.hpp"
diff --git a/test/BinaryIOTest.cpp b/test/BinaryIOTest.cpp
index 52c2136c8..c3dfd6b09 100644
--- a/test/BinaryIOTest.cpp
+++ b/test/BinaryIOTest.cpp
@@ -1,4 +1,5 @@
 #include <memory>
+#include <string>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
diff --git a/test/DFSTest.cpp b/test/DFSTest.cpp
index da3217c9c..3a6fa8420 100644
--- a/test/DFSTest.cpp
+++ b/test/DFSTest.cpp
@@ -1,4 +1,5 @@
 #include <memory>
+#include <vector>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
diff --git a/test/DialTest.cpp b/test/DialTest.cpp
index 5b0fc165c..9e72089f8 100644
--- a/test/DialTest.cpp
+++ b/test/DialTest.cpp
@@ -1,4 +1,5 @@
 #include <memory>
+#include <string>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
diff --git a/test/DijkstraTest.cpp b/test/DijkstraTest.cpp
index b6ffa960a..89d845f58 100644
--- a/test/DijkstraTest.cpp
+++ b/test/DijkstraTest.cpp
@@ -1,4 +1,6 @@
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
diff --git a/test/DirectedEdgeTest.cpp b/test/DirectedEdgeTest.cpp
index b78785bb6..f9767351d 100644
--- a/test/DirectedEdgeTest.cpp
+++ b/test/DirectedEdgeTest.cpp
@@ -1,15 +1,6 @@
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
 
-// Smart pointers alias
-template <typename T>
-using unique = std::unique_ptr<T>;
-template <typename T>
-using shared = std::shared_ptr<T>;
-
-using std::make_shared;
-using std::make_unique;
-
 TEST(DirectedEdgeTest, Constructor_1) {
   CXXGraph::Node<int> node1("1", 1);
   CXXGraph::Node<int> node2("2", 2);
diff --git a/test/DirectedWeightedEdgeTest.cpp b/test/DirectedWeightedEdgeTest.cpp
index 8fa5493a7..a61f2f83a 100644
--- a/test/DirectedWeightedEdgeTest.cpp
+++ b/test/DirectedWeightedEdgeTest.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
 
diff --git a/test/EdgeTest.cpp b/test/EdgeTest.cpp
index 8b24cae2b..d06b81917 100644
--- a/test/EdgeTest.cpp
+++ b/test/EdgeTest.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
 
diff --git a/test/FWTest.cpp b/test/FWTest.cpp
index a99005b4c..6de88d8fc 100644
--- a/test/FWTest.cpp
+++ b/test/FWTest.cpp
@@ -1,5 +1,7 @@
 #include <map>
 #include <memory>
+#include <string>
+#include <unordered_map>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
diff --git a/test/GraphSlicingTest.cpp b/test/GraphSlicingTest.cpp
index a214e8387..2b8a441bf 100644
--- a/test/GraphSlicingTest.cpp
+++ b/test/GraphSlicingTest.cpp
@@ -1,4 +1,5 @@
 #include <memory>
+#include <vector>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
diff --git a/test/GraphTest.cpp b/test/GraphTest.cpp
index 92c18032c..d3e1fb905 100644
--- a/test/GraphTest.cpp
+++ b/test/GraphTest.cpp
@@ -1,5 +1,6 @@
-
+#include <map>
 #include <memory>
+#include <string>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
diff --git a/test/HopcroftKarpTest.cpp b/test/HopcroftKarpTest.cpp
index 0fa309c22..c428c57a4 100644
--- a/test/HopcroftKarpTest.cpp
+++ b/test/HopcroftKarpTest.cpp
@@ -1,4 +1,6 @@
 #include <memory>
+#include <set>
+#include <string>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
diff --git a/test/KahnTest.cpp b/test/KahnTest.cpp
index 62bd6d9f1..4b6355568 100644
--- a/test/KahnTest.cpp
+++ b/test/KahnTest.cpp
@@ -1,4 +1,5 @@
 #include <memory>
+#include <unordered_map>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
diff --git a/test/NodeTest.cpp b/test/NodeTest.cpp
index 8da433469..869f5513b 100644
--- a/test/NodeTest.cpp
+++ b/test/NodeTest.cpp
@@ -1,3 +1,8 @@
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
 
diff --git a/test/RWOutputTest.cpp b/test/RWOutputTest.cpp
index c7f446970..ab02b44c7 100644
--- a/test/RWOutputTest.cpp
+++ b/test/RWOutputTest.cpp
@@ -1,6 +1,8 @@
 #include <fstream>
 #include <memory>
 #include <optional>
+#include <string>
+#include <unordered_map>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "CXXGraph/Utility/SecureRandom.hpp"
diff --git a/test/TarjanTest.cpp b/test/TarjanTest.cpp
index ff7d4501f..778e10592 100644
--- a/test/TarjanTest.cpp
+++ b/test/TarjanTest.cpp
@@ -1,3 +1,4 @@
+#include <memory>
 #include <random>
 #include <vector>
 
@@ -6,8 +7,6 @@
 
 // Smart pointers alias
 template <typename T>
-using unique = std::unique_ptr<T>;
-template <typename T>
 using shared = std::shared_ptr<T>;
 
 using std::make_shared;
diff --git a/test/TopologicalSortTest.cpp b/test/TopologicalSortTest.cpp
index 491987387..6b6c30822 100644
--- a/test/TopologicalSortTest.cpp
+++ b/test/TopologicalSortTest.cpp
@@ -1,4 +1,5 @@
 #include <memory>
+#include <unordered_map>
 
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
diff --git a/test/UndirectedEdgeTest.cpp b/test/UndirectedEdgeTest.cpp
index edb8fe264..2c80240d8 100644
--- a/test/UndirectedEdgeTest.cpp
+++ b/test/UndirectedEdgeTest.cpp
@@ -1,15 +1,6 @@
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
 
-// Smart pointers alias
-template <typename T>
-using unique = std::unique_ptr<T>;
-template <typename T>
-using shared = std::shared_ptr<T>;
-
-using std::make_shared;
-using std::make_unique;
-
 TEST(UndirectedEdgeTest, Constructor_1) {
   CXXGraph::Node<int> node1("1", 1);
   CXXGraph::Node<int> node2("2", 2);
diff --git a/test/UndirectedWeightedEdgeTest.cpp b/test/UndirectedWeightedEdgeTest.cpp
index 66a8a7abe..3ae0e9f4f 100644
--- a/test/UndirectedWeightedEdgeTest.cpp
+++ b/test/UndirectedWeightedEdgeTest.cpp
@@ -1,15 +1,6 @@
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
 
-// Smart pointers alias
-template <typename T>
-using unique = std::unique_ptr<T>;
-template <typename T>
-using shared = std::shared_ptr<T>;
-
-using std::make_shared;
-using std::make_unique;
-
 TEST(UndirectedWeightedEdgeTest, Constructor_1) {
   CXXGraph::Node<int> node1("1", 1);
   CXXGraph::Node<int> node2("2", 2);
diff --git a/test/UnionFindTest.cpp b/test/UnionFindTest.cpp
index 95f456c15..e28eab876 100644
--- a/test/UnionFindTest.cpp
+++ b/test/UnionFindTest.cpp
@@ -1,3 +1,6 @@
+#include <memory>
+#include <unordered_map>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
 
diff --git a/test/Utilities.hpp b/test/Utilities.hpp
index 5f3bc8719..f5ee76712 100644
--- a/test/Utilities.hpp
+++ b/test/Utilities.hpp
@@ -1,6 +1,7 @@
 #ifndef __UTILITIES_H__
 #define __UTILITIES_H__
 #include <ctime>
+#include <map>
 #include <memory>
 #include <random>
 
diff --git a/test/main.cpp b/test/main.cpp
index 813f5570e..ba5e47b1e 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -1,3 +1,5 @@
+#include <iostream>
+
 #include "CXXGraph/CXXGraph.hpp"
 #include "gtest/gtest.h"
 /*************** EXAMPLE START   ********************