diff --git a/extensions/openpower-pels/additional_data.hpp b/extensions/openpower-pels/additional_data.hpp
index 74abce9..43e7ee4 100644
--- a/extensions/openpower-pels/additional_data.hpp
+++ b/extensions/openpower-pels/additional_data.hpp
@@ -4,7 +4,6 @@
 #include <map>
 #include <optional>
 #include <string>
-#include <vector>
 
 namespace openpower
 {
diff --git a/extensions/openpower-pels/callout.hpp b/extensions/openpower-pels/callout.hpp
index 7ac0727..2f50271 100644
--- a/extensions/openpower-pels/callout.hpp
+++ b/extensions/openpower-pels/callout.hpp
@@ -6,6 +6,8 @@
 #include "pel_types.hpp"
 #include "stream.hpp"
 
+#include <memory>
+
 namespace openpower
 {
 namespace pels
diff --git a/extensions/openpower-pels/entry_points.cpp b/extensions/openpower-pels/entry_points.cpp
index aba0457..0fbc845 100644
--- a/extensions/openpower-pels/entry_points.cpp
+++ b/extensions/openpower-pels/entry_points.cpp
@@ -23,8 +23,6 @@
 
 #include <phosphor-logging/lg2.hpp>
 
-#include <format>
-
 namespace openpower
 {
 namespace pels
diff --git a/extensions/openpower-pels/extended_user_header.cpp b/extensions/openpower-pels/extended_user_header.cpp
index 3f5a886..a65b301 100644
--- a/extensions/openpower-pels/extended_user_header.cpp
+++ b/extensions/openpower-pels/extended_user_header.cpp
@@ -21,8 +21,6 @@
 
 #include <phosphor-logging/lg2.hpp>
 
-#include <format>
-
 namespace openpower
 {
 namespace pels
diff --git a/extensions/openpower-pels/extended_user_header.hpp b/extensions/openpower-pels/extended_user_header.hpp
index e30d771..72c4da4 100644
--- a/extensions/openpower-pels/extended_user_header.hpp
+++ b/extensions/openpower-pels/extended_user_header.hpp
@@ -2,7 +2,6 @@
 
 #include "bcd_time.hpp"
 #include "data_interface.hpp"
-#include "elog_entry.hpp"
 #include "mtms.hpp"
 #include "registry.hpp"
 #include "section.hpp"
diff --git a/extensions/openpower-pels/failing_mtms.cpp b/extensions/openpower-pels/failing_mtms.cpp
index a056ce4..160894c 100644
--- a/extensions/openpower-pels/failing_mtms.cpp
+++ b/extensions/openpower-pels/failing_mtms.cpp
@@ -21,8 +21,6 @@
 
 #include <phosphor-logging/lg2.hpp>
 
-#include <format>
-
 namespace openpower
 {
 namespace pels
diff --git a/extensions/openpower-pels/fru_identity.cpp b/extensions/openpower-pels/fru_identity.cpp
index 0b1426d..40cdf8c 100644
--- a/extensions/openpower-pels/fru_identity.cpp
+++ b/extensions/openpower-pels/fru_identity.cpp
@@ -19,8 +19,6 @@
 
 #include <phosphor-logging/lg2.hpp>
 
-#include <format>
-
 namespace openpower
 {
 namespace pels
diff --git a/extensions/openpower-pels/fru_identity.hpp b/extensions/openpower-pels/fru_identity.hpp
index c6325e7..186c8f9 100644
--- a/extensions/openpower-pels/fru_identity.hpp
+++ b/extensions/openpower-pels/fru_identity.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "pel_types.hpp"
 #include "stream.hpp"
 
 #include <array>
diff --git a/extensions/openpower-pels/generic.cpp b/extensions/openpower-pels/generic.cpp
index 486419a..236bff9 100644
--- a/extensions/openpower-pels/generic.cpp
+++ b/extensions/openpower-pels/generic.cpp
@@ -17,8 +17,6 @@
 
 #include <phosphor-logging/lg2.hpp>
 
-#include <format>
-
 namespace openpower
 {
 namespace pels
diff --git a/extensions/openpower-pels/journal.cpp b/extensions/openpower-pels/journal.cpp
index f860062..3118b02 100644
--- a/extensions/openpower-pels/journal.cpp
+++ b/extensions/openpower-pels/journal.cpp
@@ -19,8 +19,6 @@
 
 #include <phosphor-logging/lg2.hpp>
 
-#include <format>
-
 namespace openpower::pels
 {
 
diff --git a/extensions/openpower-pels/json_utils.cpp b/extensions/openpower-pels/json_utils.cpp
index f95f406..b2442ce 100644
--- a/extensions/openpower-pels/json_utils.cpp
+++ b/extensions/openpower-pels/json_utils.cpp
@@ -23,8 +23,8 @@
 
 #include <cstring>
 #include <filesystem>
+#include <fstream>
 #include <optional>
-#include <sstream>
 #include <string>
 
 namespace openpower
diff --git a/extensions/openpower-pels/json_utils.hpp b/extensions/openpower-pels/json_utils.hpp
index bf90d9b..6bf6c04 100644
--- a/extensions/openpower-pels/json_utils.hpp
+++ b/extensions/openpower-pels/json_utils.hpp
@@ -1,13 +1,9 @@
 #pragma once
 
-#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <cstdint>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/extensions/openpower-pels/manager.cpp b/extensions/openpower-pels/manager.cpp
index 4cf17e6..ad69720bf 100644
--- a/extensions/openpower-pels/manager.cpp
+++ b/extensions/openpower-pels/manager.cpp
@@ -20,6 +20,7 @@
 #include "json_utils.hpp"
 #include "pel.hpp"
 #include "pel_entry.hpp"
+#include "pel_values.hpp"
 #include "service_indicators.hpp"
 #include "severity.hpp"
 
@@ -33,7 +34,6 @@
 #include <filesystem>
 #include <format>
 #include <fstream>
-#include <locale>
 
 namespace openpower
 {
diff --git a/extensions/openpower-pels/pel_entry.cpp b/extensions/openpower-pels/pel_entry.cpp
index 89e9dd0..ded741f 100644
--- a/extensions/openpower-pels/pel_entry.cpp
+++ b/extensions/openpower-pels/pel_entry.cpp
@@ -1,5 +1,8 @@
 #include "pel_entry.hpp"
 
+#include "pel_types.hpp"
+#include "repository.hpp"
+
 #include <xyz/openbmc_project/Common/error.hpp>
 
 namespace openpower
diff --git a/extensions/openpower-pels/pel_entry.hpp b/extensions/openpower-pels/pel_entry.hpp
index 48d43eb..7a8fe15 100644
--- a/extensions/openpower-pels/pel_entry.hpp
+++ b/extensions/openpower-pels/pel_entry.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "manager.hpp"
+#include <org/open_power/Logging/PEL/Entry/server.hpp>
+
 namespace openpower
 {
 namespace pels
@@ -9,6 +10,8 @@
 using PELEntryIface = sdbusplus::server::org::open_power::logging::pel::Entry;
 using PropertiesVariant = PELEntryIface::PropertiesVariant;
 
+class Repository;
+
 class PELEntry : public PELEntryIface
 {
   public:
diff --git a/extensions/openpower-pels/private_header.cpp b/extensions/openpower-pels/private_header.cpp
index e32719f..40ea311 100644
--- a/extensions/openpower-pels/private_header.cpp
+++ b/extensions/openpower-pels/private_header.cpp
@@ -22,8 +22,6 @@
 
 #include <phosphor-logging/lg2.hpp>
 
-#include <format>
-
 namespace openpower
 {
 namespace pels
diff --git a/extensions/openpower-pels/registry.cpp b/extensions/openpower-pels/registry.cpp
index ea5dd1d..250d7cd 100644
--- a/extensions/openpower-pels/registry.cpp
+++ b/extensions/openpower-pels/registry.cpp
@@ -15,7 +15,6 @@
  */
 #include "registry.hpp"
 
-#include "json_utils.hpp"
 #include "pel_types.hpp"
 #include "pel_values.hpp"
 
diff --git a/extensions/openpower-pels/repository.cpp b/extensions/openpower-pels/repository.cpp
index 1d1311e..6335a37 100644
--- a/extensions/openpower-pels/repository.cpp
+++ b/extensions/openpower-pels/repository.cpp
@@ -15,6 +15,8 @@
  */
 #include "repository.hpp"
 
+#include "pel_values.hpp"
+
 #include <fcntl.h>
 #include <sys/stat.h>
 
diff --git a/extensions/openpower-pels/sbe_ffdc_handler.cpp b/extensions/openpower-pels/sbe_ffdc_handler.cpp
index de0d510..908fe20 100644
--- a/extensions/openpower-pels/sbe_ffdc_handler.cpp
+++ b/extensions/openpower-pels/sbe_ffdc_handler.cpp
@@ -30,7 +30,6 @@
 
 #include <phosphor-logging/lg2.hpp>
 
-#include <format>
 #include <new>
 
 namespace openpower
diff --git a/extensions/openpower-pels/service_indicators.cpp b/extensions/openpower-pels/service_indicators.cpp
index dabf881..df26ecb 100644
--- a/extensions/openpower-pels/service_indicators.cpp
+++ b/extensions/openpower-pels/service_indicators.cpp
@@ -18,7 +18,6 @@
 #include <phosphor-logging/lg2.hpp>
 
 #include <bitset>
-#include <format>
 
 namespace openpower::pels::service_indicators
 {
diff --git a/extensions/openpower-pels/src.cpp b/extensions/openpower-pels/src.cpp
index 6833441..4864f6a 100644
--- a/extensions/openpower-pels/src.cpp
+++ b/extensions/openpower-pels/src.cpp
@@ -17,7 +17,6 @@
 
 #include "device_callouts.hpp"
 #include "json_utils.hpp"
-#include "paths.hpp"
 #include "pel_values.hpp"
 #ifdef PELTOOL
 #include <Python.h>
diff --git a/extensions/openpower-pels/stream.hpp b/extensions/openpower-pels/stream.hpp
index 014cc3d..3a5ab4e 100644
--- a/extensions/openpower-pels/stream.hpp
+++ b/extensions/openpower-pels/stream.hpp
@@ -5,7 +5,6 @@
 
 #include <cassert>
 #include <cstring>
-#include <memory>
 #include <stdexcept>
 #include <string>
 #include <vector>
diff --git a/extensions/openpower-pels/user_data.cpp b/extensions/openpower-pels/user_data.cpp
index b2ebd3c..f64428d 100644
--- a/extensions/openpower-pels/user_data.cpp
+++ b/extensions/openpower-pels/user_data.cpp
@@ -15,17 +15,13 @@
  */
 #include "user_data.hpp"
 
-#include "json_utils.hpp"
 #include "pel_types.hpp"
-#include "user_data_formats.hpp"
 #ifdef PELTOOL
 #include "user_data_json.hpp"
 #endif
 
 #include <phosphor-logging/lg2.hpp>
 
-#include <format>
-
 namespace openpower
 {
 namespace pels
diff --git a/extensions/openpower-pels/user_header.cpp b/extensions/openpower-pels/user_header.cpp
index a490da6..eeaf379 100644
--- a/extensions/openpower-pels/user_header.cpp
+++ b/extensions/openpower-pels/user_header.cpp
@@ -22,9 +22,6 @@
 
 #include <phosphor-logging/lg2.hpp>
 
-#include <format>
-#include <iostream>
-
 namespace openpower
 {
 namespace pels
diff --git a/extensions/openpower-pels/user_header.hpp b/extensions/openpower-pels/user_header.hpp
index b338f1b..024237e 100644
--- a/extensions/openpower-pels/user_header.hpp
+++ b/extensions/openpower-pels/user_header.hpp
@@ -2,7 +2,6 @@
 
 #include "data_interface.hpp"
 #include "elog_entry.hpp"
-#include "pel_values.hpp"
 #include "registry.hpp"
 #include "section.hpp"
 #include "stream.hpp"