Merge pull request #816 from cspiegel/header-cleanup

Do a bit of header cleanup
garglk · Feb 18, 2024 · cc06d21 · cc06d21
2 parents fc52d71 + cb212a5
commit cc06d21
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/garglk/event.cpp b/garglk/event.cpp
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <deque>
 #include <list>
+#include <mutex>
 
 #include "glk.h"
 #include "garglk.h"

diff --git a/garglk/imgload.cpp b/garglk/imgload.cpp
@@ -17,9 +17,6 @@
 // along with Gargoyle; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#include <array>
-#include <cstdio>
-#include <fstream>
 #include <functional>
 #include <memory>
 #include <stdexcept>
@@ -30,6 +27,9 @@
 #ifdef GARGLK_CONFIG_JPEG_TURBO
 #include <turbojpeg.h>
 #else
+#include <array>
+#include <cstdio>
+
 // jpeglib.h requires these to be defined.
 using std::size_t;
 using std::FILE;

diff --git a/garglk/launcher.cpp b/garglk/launcher.cpp
@@ -18,18 +18,15 @@
 // along with Gargoyle; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#include <algorithm>
+#include <array>
 #include <cctype>
+#include <cstdint>
 #include <fstream>
-#include <iomanip>
 #include <ios>
-#include <memory>
 #include <regex>
-#include <set>
 #include <sstream>
 #include <stdexcept>
 #include <string>
-#include <type_traits>
 #include <unordered_map>
 #include <utility>
 #include <vector>

diff --git a/garglk/sndsdl.cpp b/garglk/sndsdl.cpp
@@ -30,7 +30,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <functional>
-#include <new>
 #include <string>
 #include <utility>
 #include <vector>

diff --git a/garglk/zbleep.cpp b/garglk/zbleep.cpp
@@ -1,7 +1,6 @@
 #include <cmath>
 #include <cstdint>
 #include <fstream>
-#include <map>
 #include <string>
 #include <vector>