diff --git a/include/download.h b/include/download.h
index 285790e..cd5aa62 100644
--- a/include/download.h
+++ b/include/download.h
@@ -1,11 +1,12 @@
 #ifndef DYNAMIC_PROGRAM_DOWNLOAD_H
 #define DYNAMIC_PROGRAM_DOWNLOAD_H
 
-#include <boost/json.hpp>
-#include <cpr/cpr.h>
 #include <iostream>
-#include <fstream>
 #include <variant>
+#include <vector>
+#include <memory>
+
+#include <boost/json.hpp>
 
 #include "game_state.h"
 #include "myassert.h"
diff --git a/include/game_state.h b/include/game_state.h
index e379f15..1c5fa0f 100644
--- a/include/game_state.h
+++ b/include/game_state.h
@@ -2,18 +2,17 @@
 #define DYNAMIC_PROGRAM_GAME_STATE_H
 
 #include <array>
-#include <stack>
-#include <cstdint>
-#include <algorithm>
-#include <cstddef>
-#include <unordered_map>
 #include <bitset>
-#include <vector>
+#include <cstdint>
 #include <limits>
-#include <optional>
-#include <boost/container/static_vector.hpp>
 #include <list>
+#include <optional>
 #include <ostream>
+#include <stack>
+#include <unordered_map>
+#include <vector>
+
+#include <boost/container/static_vector.hpp>
 #include <boost/rational.hpp>
 
 
diff --git a/include/game_state.hpp b/include/game_state.hpp
index 00bceb7..0bac7f7 100644
--- a/include/game_state.hpp
+++ b/include/game_state.hpp
@@ -1,9 +1,7 @@
 #include <algorithm>
-#include <iterator>
+
 #include "myassert.h"
 #include "game_state.h"
-#include <vector>
-#include <map>
 
 namespace Hanabi {
 
diff --git a/src/download.cpp b/src/download.cpp
index cbb7e76..8ffe0a8 100644
--- a/src/download.cpp
+++ b/src/download.cpp
@@ -1,5 +1,7 @@
-#include "download.h"
 #include <boost/json/src.hpp>
+#include <cpr/cpr.h>
+
+#include "download.h"
 
 
 // This helper function deduces the type and assigns the value with the matching key
diff --git a/src/main.cpp b/src/main.cpp
index ee9a624..75391b6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,16 +1,9 @@
-//
-// Created by maximilian on 7/13/23.
-//
-
-#include <boost/rational.hpp>
-#include <cstdint>
 #include <iostream>
-#include <optional>
 #include <vector>
+#include <variant>
 
 #include "game_state.h"
 #include "download.h"
-#include "myassert.h"
 #include "cli_interface.h"