From 2bd25157923ddd439714287a88e5a6432132ac7b Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Mon, 31 Oct 2022 21:37:34 -0600
Subject: [PATCH] all: cleanup unused includes (Clion - detect not directly
 used)

---
 bspinfo/main.cc        |  3 ---
 common/bspfile.cc      |  2 --
 common/cmdlib.cc       |  4 ----
 common/decompile.cc    |  1 -
 common/entdata.cc      |  2 --
 common/fs.cc           |  1 -
 common/imglib.cc       |  1 -
 common/log.cc          |  1 -
 light/bounce.cc        |  7 -------
 light/entities.cc      |  1 -
 light/light.cc         |  4 ----
 light/litfile.cc       |  2 --
 light/phong.cc         |  5 -----
 light/surflight.cc     |  4 ----
 light/trace.cc         |  6 ------
 light/trace_embree.cc  |  4 ----
 qbsp/brush.cc          |  1 -
 qbsp/brushbsp.cc       |  2 --
 qbsp/csg.cc            |  1 -
 qbsp/faces.cc          |  2 --
 qbsp/main.cc           |  1 -
 qbsp/portals.cc        |  3 ---
 qbsp/prtfile.cc        |  2 --
 qbsp/qbsp.cc           |  5 -----
 qbsp/tree.cc           |  1 -
 tests/test_common.cc   |  2 --
 tests/test_entities.cc |  1 -
 tests/test_qbsp.cc     |  2 --
 tests/test_qbsp_q2.cc  | 10 ----------
 vis/flow.cc            |  1 -
 vis/soundpvs.cc        |  2 --
 vis/vis.cc             |  2 --
 32 files changed, 86 deletions(-)

diff --git a/bspinfo/main.cc b/bspinfo/main.cc
index a0e16bcb..e0627b90 100644
--- a/bspinfo/main.cc
+++ b/bspinfo/main.cc
@@ -21,16 +21,13 @@
 #include <common/cmdlib.hh>
 #include <common/bspfile.hh>
 
-#include <sstream>
 #include <fstream>
-#include <iomanip>
 #include <fmt/ostream.h>
 #include <common/json.hh>
 #include "common/fs.hh"
 
 #include "common/polylib.hh"
 #include "common/bsputils.hh"
-#include "common/imglib.hh"
 
 static void PrintBSPTextureUsage(const mbsp_t &bsp)
 {
diff --git a/common/bspfile.cc b/common/bspfile.cc
index 44256efc..3768e179 100644
--- a/common/bspfile.cc
+++ b/common/bspfile.cc
@@ -894,8 +894,6 @@ struct gamedef_hl_t : public gamedef_q1_like_t<GAME_HALF_LIFE>
     }
 };
 
-#include <mutex>
-
 struct gamedef_q2_t : public gamedef_t
 {
     gamedef_q2_t() : gamedef_t("BASEQ2")
diff --git a/common/cmdlib.cc b/common/cmdlib.cc
index e6ee712a..4e25d8fc 100644
--- a/common/cmdlib.cc
+++ b/common/cmdlib.cc
@@ -18,14 +18,10 @@
 */
 
 #include <common/cmdlib.hh>
-#include <common/log.hh>
-#include <common/threads.hh>
 
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #ifdef _WIN32
-#include <direct.h>
 #include <windows.h>
 
 // don't break std::min
diff --git a/common/decompile.cc b/common/decompile.cc
index d0b6905e..2a188a53 100644
--- a/common/decompile.cc
+++ b/common/decompile.cc
@@ -33,7 +33,6 @@
 #include <vector>
 #include <cstdio>
 #include <string>
-#include <memory>
 #include <utility>
 #include <tuple>
 
diff --git a/common/entdata.cc b/common/entdata.cc
index 49357906..f05b000f 100644
--- a/common/entdata.cc
+++ b/common/entdata.cc
@@ -19,9 +19,7 @@
 
 #include <common/entdata.h>
 
-#include <cstring>
 #include <sstream>
-#include <common/cmdlib.hh>
 
 #include <common/bsputils.hh>
 #include <common/parser.hh>
diff --git a/common/fs.cc b/common/fs.cc
index 99f3af52..98dbeb19 100644
--- a/common/fs.cc
+++ b/common/fs.cc
@@ -26,7 +26,6 @@
 #include <memory>
 #include <array>
 #include <list>
-#include <set>
 #include <stdexcept>
 #include <unordered_map>
 
diff --git a/common/imglib.cc b/common/imglib.cc
index 3b80b4f3..797f91a9 100644
--- a/common/imglib.cc
+++ b/common/imglib.cc
@@ -1,4 +1,3 @@
-#include <map>
 #include <vector>
 #include <common/fs.hh>
 #include <common/imglib.hh>
diff --git a/common/log.cc b/common/log.cc
index 0a49f298..9073d6f5 100644
--- a/common/log.cc
+++ b/common/log.cc
@@ -32,7 +32,6 @@
 #include <string>
 
 #include <common/log.hh>
-#include <common/threads.hh>
 #include <common/settings.hh>
 #include <common/cmdlib.hh>
 
diff --git a/light/bounce.cc b/light/bounce.cc
index 09c8a7ce..c74ecce1 100644
--- a/light/bounce.cc
+++ b/light/bounce.cc
@@ -19,10 +19,8 @@
 */
 
 #include <cstdint>
-#include <cassert>
 //#include <cstdio>
 #include <atomic>
-#include <iostream>
 
 #include <light/light.hh>
 #include <light/bounce.hh>
@@ -32,14 +30,9 @@
 #include <common/polylib.hh>
 #include <common/bsputils.hh>
 
-#include <memory>
 #include <vector>
-#include <map>
 #include <unordered_map>
-#include <set>
-#include <algorithm>
 #include <mutex>
-#include <string>
 
 #include <common/qvec.hh>
 #include <common/parallel.hh>
diff --git a/light/entities.cc b/light/entities.cc
index 168054c3..d413fb0a 100644
--- a/light/entities.cc
+++ b/light/entities.cc
@@ -26,7 +26,6 @@
 
 #include <light/light.hh>
 #include <light/entities.hh>
-#include <light/ltface.hh>
 #include <common/bsputils.hh>
 #include <common/parallel.hh>
 
diff --git a/light/light.cc b/light/light.cc
index 83399ba7..cc9d8104 100644
--- a/light/light.cc
+++ b/light/light.cc
@@ -18,8 +18,6 @@
 */
 
 #include <cstdint>
-#include <cassert>
-//#include <cstdio>
 #include <iostream>
 #include <fstream>
 #include <fmt/ostream.h>
@@ -33,7 +31,6 @@
 #include <light/ltface.hh>
 
 #include <common/log.hh>
-#include <common/polylib.hh>
 #include <common/bsputils.hh>
 #include <common/fs.hh>
 #include <common/imglib.hh>
@@ -47,7 +44,6 @@
 #include <memory>
 #include <vector>
 #include <map>
-#include <unordered_map>
 #include <set>
 #include <algorithm>
 #include <mutex>
diff --git a/light/litfile.cc b/light/litfile.cc
index 44ae3a53..7a7a7d1e 100644
--- a/light/litfile.cc
+++ b/light/litfile.cc
@@ -86,8 +86,6 @@ void WriteLitFile(const mbsp_t *bsp, const std::vector<facesup_t> &facesup, cons
         litfile.write((const char *)lit_filebase.data(), bsp->dlightdata.size() * 3);
 }
 
-#include <fstream>
-
 void WriteLuxFile(const mbsp_t *bsp, const fs::path &filename, int version)
 {
     litheader_t header;
diff --git a/light/phong.cc b/light/phong.cc
index 840f02f9..24e57edb 100644
--- a/light/phong.cc
+++ b/light/phong.cc
@@ -19,24 +19,19 @@
 */
 
 #include <cstdint>
-#include <cassert>
-//#include <cstdio>
 #include <iostream>
 
 #include <light/phong.hh>
-#include <light/ltface.hh>
 
 #include <common/polylib.hh>
 #include <common/bsputils.hh>
 
-#include <memory>
 #include <vector>
 #include <map>
 #include <unordered_map>
 #include <set>
 #include <algorithm>
 #include <mutex>
-#include <string>
 
 #include <common/qvec.hh>
 #include <tbb/parallel_for_each.h>
diff --git a/light/surflight.cc b/light/surflight.cc
index 3e33012b..904a62ed 100644
--- a/light/surflight.cc
+++ b/light/surflight.cc
@@ -19,11 +19,8 @@ See file, 'COPYING', for details.
 */
 
 #include <cassert>
-//#include <cstdio>
-#include <iostream>
 
 #include <light/light.hh>
-#include <light/bounce.hh>
 #include <light/surflight.hh>
 #include <light/ltface.hh>
 
@@ -34,7 +31,6 @@ See file, 'COPYING', for details.
 #include <vector>
 #include <map>
 #include <mutex>
-#include <string>
 
 #include <common/qvec.hh>
 
diff --git a/light/trace.cc b/light/trace.cc
index a64aa624..bd1f036b 100644
--- a/light/trace.cc
+++ b/light/trace.cc
@@ -17,14 +17,8 @@
     See file, 'COPYING', for details.
 */
 
-#include <light/light.hh>
 #include <light/trace.hh>
-#include <light/ltface.hh>
 #include <common/bsputils.hh>
-#ifdef HAVE_EMBREE
-#include <light/trace_embree.hh>
-#endif
-#include <cassert>
 
 /*
 ==============
diff --git a/light/trace_embree.cc b/light/trace_embree.cc
index 399c20b8..f77af4ee 100644
--- a/light/trace_embree.cc
+++ b/light/trace_embree.cc
@@ -20,14 +20,10 @@
 #include <light/light.hh>
 #include <light/bounce.hh>
 #include <light/trace_embree.hh>
-#include <light/ltface.hh>
 #include <common/bsputils.hh>
 #include <common/polylib.hh>
 #include <vector>
-#include <cassert>
 #include <climits>
-#include <cstdlib>
-#include <limits>
 
 using namespace std;
 using namespace polylib;
diff --git a/qbsp/brush.cc b/qbsp/brush.cc
index 6cf59b1c..9e8f0217 100644
--- a/qbsp/brush.cc
+++ b/qbsp/brush.cc
@@ -25,7 +25,6 @@
 #include <cstring>
 #include <list>
 #include <common/log.hh>
-#include <qbsp/csg.hh>
 #include <qbsp/map.hh>
 #include <qbsp/qbsp.hh>
 
diff --git a/qbsp/brushbsp.cc b/qbsp/brushbsp.cc
index abfd639c..608096bc 100644
--- a/qbsp/brushbsp.cc
+++ b/qbsp/brushbsp.cc
@@ -24,9 +24,7 @@
 #include <climits>
 
 #include <common/log.hh>
-#include <common/vectorutils.hh>
 #include <qbsp/brush.hh>
-#include <qbsp/csg.hh>
 #include <qbsp/map.hh>
 #include <qbsp/portals.hh>
 #include <qbsp/qbsp.hh>
diff --git a/qbsp/csg.cc b/qbsp/csg.cc
index 24ad041e..3cbe97d4 100644
--- a/qbsp/csg.cc
+++ b/qbsp/csg.cc
@@ -23,7 +23,6 @@
 #include <qbsp/brush.hh>
 #include <qbsp/csg.hh>
 #include <qbsp/map.hh>
-#include <qbsp/brushbsp.hh>
 #include <qbsp/qbsp.hh>
 
 #include <common/log.hh>
diff --git a/qbsp/faces.cc b/qbsp/faces.cc
index e661d95b..a25b6622 100644
--- a/qbsp/faces.cc
+++ b/qbsp/faces.cc
@@ -26,11 +26,9 @@
 #include <qbsp/csg.hh>
 #include <qbsp/map.hh>
 #include <qbsp/merge.hh>
-#include <qbsp/brushbsp.hh>
 #include <qbsp/qbsp.hh>
 #include <qbsp/writebsp.hh>
 
-#include <map>
 #include <list>
 
 struct makefaces_stats_t : logging::stat_tracker_t
diff --git a/qbsp/main.cc b/qbsp/main.cc
index 63f23b88..0cfd4643 100644
--- a/qbsp/main.cc
+++ b/qbsp/main.cc
@@ -19,7 +19,6 @@
 
 #include <qbsp/qbsp.hh>
 #include <common/settings.hh>
-#include <common/fs.hh>
 
 int main(int argc, const char **argv)
 {
diff --git a/qbsp/portals.cc b/qbsp/portals.cc
index 06965ffc..98727fd5 100644
--- a/qbsp/portals.cc
+++ b/qbsp/portals.cc
@@ -28,9 +28,6 @@
 #include <qbsp/qbsp.hh>
 #include <qbsp/outside.hh>
 #include <qbsp/tree.hh>
-// TEMP
-#include <qbsp/writebsp.hh>
-
 #include <common/log.hh>
 #include <atomic>
 
diff --git a/qbsp/prtfile.cc b/qbsp/prtfile.cc
index 02e4669c..d851bb40 100644
--- a/qbsp/prtfile.cc
+++ b/qbsp/prtfile.cc
@@ -30,8 +30,6 @@
 #include <fstream>
 #include <fmt/ostream.h>
 
-#include "tbb/task_group.h"
-
 /*
 ==============================================================================
 
diff --git a/qbsp/qbsp.cc b/qbsp/qbsp.cc
index 3da83abb..ab819c7c 100644
--- a/qbsp/qbsp.cc
+++ b/qbsp/qbsp.cc
@@ -26,14 +26,11 @@
 #include <common/log.hh>
 #include <common/aabb.hh>
 #include <common/fs.hh>
-#include <common/threads.hh>
 #include <common/settings.hh>
 
 #include <qbsp/brush.hh>
-#include <qbsp/csg.hh>
 #include <qbsp/exportobj.hh>
 #include <qbsp/map.hh>
-#include <qbsp/merge.hh>
 #include <qbsp/portals.hh>
 #include <qbsp/prtfile.hh>
 #include <qbsp/brushbsp.hh>
@@ -45,8 +42,6 @@
 
 #include <fmt/chrono.h>
 
-#include "tbb/global_control.h"
-
 namespace settings
 {
 bool wadpath::operator<(const wadpath &other) const
diff --git a/qbsp/tree.cc b/qbsp/tree.cc
index e76c0ff7..037e8d20 100644
--- a/qbsp/tree.cc
+++ b/qbsp/tree.cc
@@ -21,7 +21,6 @@
 
 #include <qbsp/tree.hh>
 
-#include <common/vectorutils.hh>
 #include <qbsp/qbsp.hh>
 #include <qbsp/brush.hh>
 #include <qbsp/portals.hh>
diff --git a/tests/test_common.cc b/tests/test_common.cc
index 7dece580..f2f4e85c 100644
--- a/tests/test_common.cc
+++ b/tests/test_common.cc
@@ -1,8 +1,6 @@
 #include <doctest/doctest.h>
 
 #include <filesystem>
-#include <string>
-#include <common/cmdlib.hh>
 #include <common/bspfile.hh>
 #include <common/bspfile_q1.hh>
 #include <common/bspfile_q2.hh>
diff --git a/tests/test_entities.cc b/tests/test_entities.cc
index 33f5a4a0..eb40e86b 100644
--- a/tests/test_entities.cc
+++ b/tests/test_entities.cc
@@ -1,7 +1,6 @@
 #include <doctest/doctest.h>
 
 #include <light/entities.hh>
-#include <vector>
 
 TEST_SUITE("entities") {
 TEST_CASE("CheckEmptyValues")
diff --git a/tests/test_qbsp.cc b/tests/test_qbsp.cc
index f1e77f3d..f020cc54 100644
--- a/tests/test_qbsp.cc
+++ b/tests/test_qbsp.cc
@@ -17,9 +17,7 @@
 #include <nanobench.h>
 
 #include <fstream>
-#include <algorithm>
 #include <cstring>
-#include <set>
 #include <stdexcept>
 #include <tuple>
 #include <map>
diff --git a/tests/test_qbsp_q2.cc b/tests/test_qbsp_q2.cc
index 006102b2..938b9da8 100644
--- a/tests/test_qbsp_q2.cc
+++ b/tests/test_qbsp_q2.cc
@@ -1,26 +1,16 @@
-#include <qbsp/brush.hh>
-#include <qbsp/brushbsp.hh>
-#include <qbsp/qbsp.hh>
 #include <qbsp/map.hh>
-#include <common/fs.hh>
 #include <common/bsputils.hh>
-#include <common/decompile.hh>
-#include <common/prtfile.hh>
 #include <common/qvec.hh>
-#include <testmaps.hh>
 
 #include <subprocess.h>
 #include <nanobench.h>
 
-#include <algorithm>
 #include <cstring>
 #include <set>
 #include <stdexcept>
 #include <tuple>
 #include <map>
 
-#include <common/bspinfo.hh>
-
 #include "test_qbsp.hh"
 #include "testutils.hh"
 
diff --git a/vis/flow.cc b/vis/flow.cc
index e67caa63..705ebcc2 100644
--- a/vis/flow.cc
+++ b/vis/flow.cc
@@ -1,4 +1,3 @@
-#include <common/threads.hh>
 #include <vis/vis.hh>
 #include <vis/leafbits.hh>
 #include <common/log.hh>
diff --git a/vis/soundpvs.cc b/vis/soundpvs.cc
index 7893b9f4..8a790bbd 100644
--- a/vis/soundpvs.cc
+++ b/vis/soundpvs.cc
@@ -17,8 +17,6 @@
     See file, 'COPYING', for details.
 */
 
-#include <cfloat>
-
 #include <common/log.hh>
 #include <vis/vis.hh>
 #include <common/bsputils.hh>
diff --git a/vis/vis.cc b/vis/vis.cc
index da184a5e..d1f420f3 100644
--- a/vis/vis.cc
+++ b/vis/vis.cc
@@ -1,14 +1,12 @@
 // vis.c
 
 #include <climits>
-#include <cstddef>
 #include <cstdint>
 
 #include <vis/leafbits.hh>
 #include <vis/vis.hh>
 #include <common/log.hh>
 #include <common/bsputils.hh>
-#include <common/threads.hh>
 #include <common/fs.hh>
 #include <common/parallel.hh>
 #include <fmt/chrono.h>