diff --git a/Makefile b/Makefile
index 6ddaf47..df24277 100644
--- a/Makefile
+++ b/Makefile
@@ -33,21 +33,21 @@ $(OUTPUT): $(OBJECTS)
 install: all
 	$(info Installing MakeGen to /usr/bin/)
 	@cp $(OUTPUT) /usr/bin/makegen
-$(OBJPATH)/ConfigFile.o : src/ConfigFile.cpp src/Common.h src/ConfigFile.h src/FileUtils.h  src/Utils.h 
+$(OBJPATH)/ConfigFile.o : src/ConfigFile.cpp src/ConfigFile.h src/FileUtils.h src/Common.h src/Utils.h 
 	$(info -[16%]- $<)
 	$(CC) $(CFLAGS) -o $@ $<
 $(OBJPATH)/HFileGen.o : src/HFileGen.cpp src/FileUtils.h src/Common.h src/Utils.h src/ConfigFile.h src/HFileGen.h 
 	$(info -[33%]- $<)
 	$(CC) $(CFLAGS) -o $@ $<
-$(OBJPATH)/IncludeDeps.o : src/IncludeDeps.cpp src/Common.h src/IncludeDeps.h src/ConfigFile.h src/FileUtils.h  src/Utils.h  
+$(OBJPATH)/IncludeDeps.o : src/IncludeDeps.cpp src/Common.h src/IncludeDeps.h src/ConfigFile.h src/FileUtils.h  src/Utils.h 
 	$(info -[50%]- $<)
 	$(CC) $(CFLAGS) -o $@ $<
-$(OBJPATH)/Makefile.o : src/Makefile.cpp src/Common.h src/FileUtils.h  src/Utils.h src/ConfigFile.h src/IncludeDeps.h    src/Makefile.h  
+$(OBJPATH)/Makefile.o : src/Makefile.cpp src/IncludeDeps.h src/ConfigFile.h src/FileUtils.h src/Common.h src/Utils.h  src/Makefile.h  
 	$(info -[66%]- $<)
 	$(CC) $(CFLAGS) -o $@ $<
 $(OBJPATH)/Utils.o : src/Utils.cpp src/FileUtils.h src/Common.h src/Utils.h src/ConfigFile.h 
 	$(info -[83%]- $<)
 	$(CC) $(CFLAGS) -o $@ $<
-$(OBJPATH)/main.o : src/main.cpp src/Common.h src/ConfigFile.h src/FileUtils.h  src/Utils.h  src/HFileGen.h  src/IncludeDeps.h    src/Makefile.h  src/Timer.h
+$(OBJPATH)/main.o : src/main.cpp src/Common.h src/ConfigFile.h src/FileUtils.h  src/Utils.h  src/HFileGen.h  src/Makefile.h  src/Timer.h
 	$(info -[100%]- $<)
 	$(CC) $(CFLAGS) -o $@ $<
diff --git a/src/Common.h b/src/Common.h
index 65fcabf..cec2180 100755
--- a/src/Common.h
+++ b/src/Common.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <iostream>
-#include <string>
 
 #define BIT(x) (1<<x)
 
diff --git a/src/ConfigFile.cpp b/src/ConfigFile.cpp
index c5b0967..78cbe05 100755
--- a/src/ConfigFile.cpp
+++ b/src/ConfigFile.cpp
@@ -1,10 +1,9 @@
 #include "ConfigFile.h"
 
-#include <fstream>
-#include <map>
-#include "Common.h"
 #include "FileUtils.h"
 
+#include <fstream>
+
 #define FLAG_NONE 0
 #define FLAG_VECTOR 1
 #define FLAG_STRING 2
diff --git a/src/ConfigFile.h b/src/ConfigFile.h
index e320d96..3d9b36b 100755
--- a/src/ConfigFile.h
+++ b/src/ConfigFile.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <vector>
-#include <string>
-#include <optional>
 #include <map>
+#include <optional>
+#include <string>
+#include <vector>
 
 static const std::string CONFIG_FILENAME = "makegen.conf";
 
diff --git a/src/HFileGen.h b/src/HFileGen.h
index ab877fe..03585a6 100644
--- a/src/HFileGen.h
+++ b/src/HFileGen.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "ConfigFile.h"
-#include <map> 
 
 class HFileGen 
 {
diff --git a/src/IncludeDeps.cpp b/src/IncludeDeps.cpp
index 34447c2..8e90cf7 100755
--- a/src/IncludeDeps.cpp
+++ b/src/IncludeDeps.cpp
@@ -1,4 +1,5 @@
 #include "IncludeDeps.h"
+
 #include "Common.h"
 
 std::set<std::string> IncludeDeps::printSet;
diff --git a/src/IncludeDeps.h b/src/IncludeDeps.h
index b399e6f..065b9b9 100755
--- a/src/IncludeDeps.h
+++ b/src/IncludeDeps.h
@@ -2,10 +2,7 @@
 
 #include "ConfigFile.h"
 #include "FileUtils.h"
-#include "Utils.h"
 
-#include <exception>
-#include <fstream>
 #include <iostream>
 #include <map>
 #include <set>
diff --git a/src/Makefile.cpp b/src/Makefile.cpp
index 64846f6..6243afe 100755
--- a/src/Makefile.cpp
+++ b/src/Makefile.cpp
@@ -1,12 +1,8 @@
 #include "Makefile.h"
 
-#include "Common.h"
-#include "FileUtils.h"
 #include "IncludeDeps.h"
 #include "Utils.h"
 
-#include <cstring>
-#include <dirent.h>
 #include <fstream>
 #include <map>
 
diff --git a/src/Makefile.h b/src/Makefile.h
index 768f0b9..6191711 100755
--- a/src/Makefile.h
+++ b/src/Makefile.h
@@ -2,9 +2,6 @@
 
 #include "ConfigFile.h"
 
-#include <set>
-#include <map>
-
 class Makefile
 {
   public:
diff --git a/src/Utils.h b/src/Utils.h
index 21c5def..cacedac 100644
--- a/src/Utils.h
+++ b/src/Utils.h
@@ -2,7 +2,6 @@
 
 #include "ConfigFile.h"
 
-#include <map>
 #include <set>
 #include <string>
 
diff --git a/src/main.cpp b/src/main.cpp
index a54b164..a8a5799 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,18 +2,10 @@
 #include "ConfigFile.h"
 #include "FileUtils.h"
 #include "HFileGen.h"
-#include "IncludeDeps.h"
 #include "Makefile.h"
 #include "Timer.h"
 
 #include <cmath>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <map>
-#include <string>
-#include <sys/sysinfo.h>
-#include <vector>
 #include <thread>
 
 #define RETURN_IF(x, b) \