clean up imports

include/command_line_interface.h

@@ -3,7 +3,7 @@
 
 #include <variant>
 #include <boost/optional.hpp>
-#include "game_state.h"
+#include "hanabi_types.hpp"
 
 
 namespace Hanabi {

include/download.h

@@ -3,13 +3,11 @@
 
 #include <iostream>
 #include <variant>
-#include <vector>
+#include <optional>
-#include <memory>
 
 #include <boost/json.hpp>
 
-#include "game_state.h"
+#include "game_interface.h"
-#include "myassert.h"
 
 namespace Download {
 

include/game_interface.h

@@ -6,6 +6,7 @@
 #include <vector>
 #include <unordered_map>
 #include <memory>
+
 #include "hanabi_types.hpp"
 
 

include/null_buffer.h

@@ -1,7 +1,7 @@
 #ifndef DYNAMIC_PROGRAM_NULL_BUFFER_H
 #define DYNAMIC_PROGRAM_NULL_BUFFER_H
 
-#include <ostream>
+#include <iosfwd>
 
 namespace NullBuffer {
 

include/parse_game.h

@@ -3,7 +3,7 @@
 
 #include <boost/json.hpp>
 
-#include "game_state.h"
+#include "game_interface.h"
 
 namespace Hanabi {
   // These are overloads that the boost/json library uses for parsing.

include/state_explorer.h

@@ -2,7 +2,7 @@
 #define DYNAMIC_PROGRAM_CLI_INTERFACE_H
 
 #include <memory>
-#include "game_state.h"
+#include "game_interface.h"
 
 namespace Hanabi {
     void cli(const std::shared_ptr<HanabiStateIF>& game);

src/check_games.cpp

@@ -1,6 +1,5 @@
 #include <iostream>
 
-#include "game_state.h"
 #include "download.h"
 
 void check_games(unsigned num_players, unsigned max_draw_pile_size, unsigned first_game = 0, unsigned last_game = 9999) {

src/command_line_interface.cpp

@@ -1,8 +1,10 @@
-#include "command_line_interface.h"
+#include <boost/program_options.hpp>
+
 #include "download.h"
 #include "null_buffer.h"
 #include "state_explorer.h"
-#include "boost/program_options.hpp"
+
+#include "command_line_interface.h"
 
 namespace bpo = boost::program_options;
 

src/download.cpp

@@ -2,6 +2,7 @@
 #include <cpr/cpr.h>
 
 #include "parse_game.h"
+#include "game_state.h"
 
 #include "download.h"
 

src/game_interface.cpp

@@ -1,6 +1,7 @@
-#include "game_interface.h"
 #include "myassert.h"
 
+#include "game_interface.h"
+
 namespace Hanabi {
 
   std::ostream &operator<<(std::ostream &os, HanabiStateIF const &hanabi_state)

src/main.cpp

@@ -1,4 +1,5 @@
 #include <optional>
+
 #include "command_line_interface.h"
 
 

src/parse_game.cpp

@@ -1,5 +1,7 @@
 #include "parse_game.h"
 
+#include "myassert.h"
+
 namespace Parsing {
   // This helper function deduces the type and assigns the value with the matching key
   template<class T>

src/state_explorer.cpp

@@ -1,17 +1,15 @@
-#include <cstdio>
-#include <numeric>
-#include <ios>
 #include <cmath>
 #include <csignal>
 #include <iomanip>
-#include <readline/readline.h>
-#include <ranges>
-#include <readline/history.h>
 #include <iostream>
 #include <memory>
-#include <cmath>
+#include <numeric>
+#include <ranges>
+
+#include <readline/readline.h>
+#include <readline/history.h>
+
 #include "game_state.h"
-#include <myassert.h>
 
 namespace Hanabi {