From d57fc3d7db276d8680dd387f87c0c42e2beb02ce Mon Sep 17 00:00:00 2001
From: Calum Grant <calumgrant@github.com>
Date: Wed, 17 Jan 2024 14:34:28 +0000
Subject: [PATCH] C++: Remove unneeded includes

---
 shared/cpp/BUILD.bazel           |  1 -
 swift/logging/SwiftDiagnostics.h | 15 +--------------
 swift/logging/SwiftLogging.h     |  5 +++++
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/shared/cpp/BUILD.bazel b/shared/cpp/BUILD.bazel
index eccc3273e8c..5debed90086 100644
--- a/shared/cpp/BUILD.bazel
+++ b/shared/cpp/BUILD.bazel
@@ -5,7 +5,6 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "@absl//absl/strings",
-        "@binlog",
         "@fmt",
         "@json",
     ],
diff --git a/swift/logging/SwiftDiagnostics.h b/swift/logging/SwiftDiagnostics.h
index 6d037e85ba5..4270101971b 100644
--- a/swift/logging/SwiftDiagnostics.h
+++ b/swift/logging/SwiftDiagnostics.h
@@ -1,19 +1,5 @@
 #pragma once
 
-#include <binlog/binlog.hpp>
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <optional>
-#include <cassert>
-#include <fstream>
-#include <filesystem>
-#include <sstream>
-#include <mutex>
-#include <fmt/format.h>
-#include <fmt/chrono.h>
-
-#include "swift/logging/Formatters.h"
 #include "shared/cpp/Diagnostics.h"
 
 namespace codeql {
@@ -29,4 +15,5 @@ constexpr Diagnostic internalError{
         "\n"
         "[1]: https://github.com/github/codeql/issues/new?labels=bug&template=ql---general.md",
     .severity = Diagnostic::Severity::warning};
+
 }  // namespace codeql
diff --git a/swift/logging/SwiftLogging.h b/swift/logging/SwiftLogging.h
index 9544203680a..6752de7a15c 100644
--- a/swift/logging/SwiftLogging.h
+++ b/swift/logging/SwiftLogging.h
@@ -6,6 +6,11 @@
 #include <regex>
 #include <vector>
 
+#include <fmt/format.h>
+#include <fmt/chrono.h>
+
+#include "swift/logging/Formatters.h"
+
 #include <binlog/binlog.hpp>
 #include <binlog/TextOutputStream.hpp>
 #include <binlog/EventFilter.hpp>