diff --git a/callouts/callout_test.cpp b/callouts/callout_test.cpp
index 9088243..5b93b2d 100644
--- a/callouts/callout_test.cpp
+++ b/callouts/callout_test.cpp
@@ -1,5 +1,3 @@
-#include "elog_meta.hpp"
-
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/elog.hpp>
 #include <sdbusplus/exception.hpp>
diff --git a/elog_entry.cpp b/elog_entry.cpp
index 8f86cca..183ecbb 100644
--- a/elog_entry.cpp
+++ b/elog_entry.cpp
@@ -3,7 +3,6 @@
 #include "elog_serialize.hpp"
 #include "extensions.hpp"
 #include "log_manager.hpp"
-#include "paths.hpp"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/elog_entry.hpp b/elog_entry.hpp
index d5f12a5..d69ae39 100644
--- a/elog_entry.hpp
+++ b/elog_entry.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "util.hpp"
 #include "xyz/openbmc_project/Logging/Entry/server.hpp"
 #include "xyz/openbmc_project/Object/Delete/server.hpp"
 #include "xyz/openbmc_project/Software/Version/server.hpp"
diff --git a/elog_serialize.cpp b/elog_serialize.cpp
index 5c0f9cb..71bd986 100644
--- a/elog_serialize.cpp
+++ b/elog_serialize.cpp
@@ -2,6 +2,8 @@
 
 #include "elog_serialize.hpp"
 
+#include "util.hpp"
+
 #include <cereal/archives/binary.hpp>
 #include <cereal/types/map.hpp>
 #include <cereal/types/string.hpp>
diff --git a/elog_serialize.hpp b/elog_serialize.hpp
index 29791b2..710efa1 100644
--- a/elog_serialize.hpp
+++ b/elog_serialize.hpp
@@ -6,8 +6,6 @@
 #include "paths.hpp"
 
 #include <filesystem>
-#include <string>
-#include <vector>
 
 namespace phosphor
 {
diff --git a/paths.hpp b/paths.hpp
index 3d81852..10fc3ee 100644
--- a/paths.hpp
+++ b/paths.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <filesystem>
-#include <string>
 
 extern const char* PERSIST_PATH_ROOT;
 
diff --git a/util.cpp b/util.cpp
index 3847e0a..7ef2d44 100644
--- a/util.cpp
+++ b/util.cpp
@@ -27,6 +27,7 @@
 #include <sdbusplus/bus.hpp>
 
 #include <chrono>
+#include <fstream>
 
 namespace phosphor::logging::util
 {
diff --git a/util.hpp b/util.hpp
index 405e35c..3ee50e9 100644
--- a/util.hpp
+++ b/util.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <fstream>
 #include <map>
 #include <optional>
 #include <string>