Clean up more includes and targets

Some of the more specific issues addressed:
- missing log_level target/include
- header-only libs wrongly marking deps as private
- missing/misplaced gsl includes

7 files changed, 12 insertions, 6 deletions

diff --git a/src/buildtool/execution_engine/dag/TARGETS b/src/buildtool/execution_engine/dag/TARGETS
index e4fb5bed..e6d581b1 100644
--- a/src/buildtool/execution_engine/dag/TARGETS
+++ b/src/buildtool/execution_engine/dag/TARGETS
@@ -4,14 +4,16 @@
   , "hdrs": ["dag.hpp"]
   , "srcs": ["dag.cpp"]
   , "deps":
-    [ ["src/utils/cpp", "type_safe_arithmetic"]
+    [ ["src/utils/cpp", "hex_string"]
+    , ["src/utils/cpp", "type_safe_arithmetic"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "action_description"]
     , ["src/buildtool/common", "artifact_description"]
     , ["src/buildtool/file_system", "object_type"]
+    , ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
     , ["@", "gsl", "", "gsl"]
     ]
   , "stage": ["src", "buildtool", "execution_engine", "dag"]
-  , "private-deps": [["src/buildtool/logging", "logging"]]
   }
 }
diff --git a/src/buildtool/execution_engine/dag/dag.cpp b/src/buildtool/execution_engine/dag/dag.cpp
index 8784222d..03dc932f 100644
--- a/src/buildtool/execution_engine/dag/dag.cpp
+++ b/src/buildtool/execution_engine/dag/dag.cpp
@@ -14,9 +14,6 @@
 
 #include "src/buildtool/execution_engine/dag/dag.hpp"
 
-#include "src/buildtool/common/artifact_description.hpp"
-#include "src/buildtool/logging/logger.hpp"
-
 auto DependencyGraph::CreateOutputArtifactNodes(
     std::string const& action_id,
     std::vector<std::string> const& file_paths,
diff --git a/src/buildtool/execution_engine/dag/dag.hpp b/src/buildtool/execution_engine/dag/dag.hpp
index 6b10c6cf..d7cbeebf 100644
--- a/src/buildtool/execution_engine/dag/dag.hpp
+++ b/src/buildtool/execution_engine/dag/dag.hpp
@@ -33,6 +33,9 @@
 #include "src/buildtool/common/artifact.hpp"
 #include "src/buildtool/common/artifact_description.hpp"
 #include "src/buildtool/file_system/object_type.hpp"
+#include "src/buildtool/logging/log_level.hpp"
+#include "src/buildtool/logging/logger.hpp"
+#include "src/utils/cpp/hex_string.hpp"
 #include "src/utils/cpp/type_safe_arithmetic.hpp"
 
 /// \brief Plain DirectedAcyclicGraph.
diff --git a/src/buildtool/execution_engine/executor/TARGETS b/src/buildtool/execution_engine/executor/TARGETS
index 97c7fea4..82171387 100644
--- a/src/buildtool/execution_engine/executor/TARGETS
+++ b/src/buildtool/execution_engine/executor/TARGETS
@@ -3,7 +3,8 @@
   , "name": ["executor"]
   , "hdrs": ["executor.hpp"]
   , "deps":
-    [ ["src/buildtool/logging", "logging"]
+    [ ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common", "tree"]
     , ["src/buildtool/compatibility", "compatibility"]
diff --git a/src/buildtool/execution_engine/executor/executor.hpp b/src/buildtool/execution_engine/executor/executor.hpp
index 2220f15a..eab18898 100644
--- a/src/buildtool/execution_engine/executor/executor.hpp
+++ b/src/buildtool/execution_engine/executor/executor.hpp
@@ -37,6 +37,7 @@
 #include "src/buildtool/execution_api/remote/config.hpp"
 #include "src/buildtool/execution_engine/dag/dag.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
+#include "src/buildtool/logging/log_level.hpp"
 #include "src/buildtool/logging/logger.hpp"
 #include "src/buildtool/progress_reporting/progress.hpp"
 #include "src/utils/cpp/hex_string.hpp"
diff --git a/src/buildtool/execution_engine/traverser/TARGETS b/src/buildtool/execution_engine/traverser/TARGETS
index d757d216..5f6f6a9f 100644
--- a/src/buildtool/execution_engine/traverser/TARGETS
+++ b/src/buildtool/execution_engine/traverser/TARGETS
@@ -5,6 +5,7 @@
   , "deps":
     [ ["src/buildtool/execution_engine/dag", "dag"]
     , ["src/buildtool/multithreading", "task_system"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/utils/cpp", "concepts"]
     , ["@", "gsl", "", "gsl"]
diff --git a/src/buildtool/execution_engine/traverser/traverser.hpp b/src/buildtool/execution_engine/traverser/traverser.hpp
index bc09dc72..d55a8059 100644
--- a/src/buildtool/execution_engine/traverser/traverser.hpp
+++ b/src/buildtool/execution_engine/traverser/traverser.hpp
@@ -19,6 +19,7 @@
 
 #include "gsl/gsl"
 #include "src/buildtool/execution_engine/dag/dag.hpp"
+#include "src/buildtool/logging/log_level.hpp"
 #include "src/buildtool/logging/logger.hpp"
 #include "src/buildtool/multithreading/task_system.hpp"
 #include "src/utils/cpp/concepts.hpp"