diff --git a/bmc_dump_entry.cpp b/bmc_dump_entry.cpp
index c9fa464..a75606d 100644
--- a/bmc_dump_entry.cpp
+++ b/bmc_dump_entry.cpp
@@ -4,7 +4,6 @@
 #include "dump_offload.hpp"
 
 #include <phosphor-logging/lg2.hpp>
-#include <phosphor-logging/log.hpp>
 
 namespace phosphor
 {
@@ -12,7 +11,6 @@
 {
 namespace bmc
 {
-using namespace phosphor::logging;
 
 void Entry::delete_()
 {
diff --git a/core_manager.cpp b/core_manager.cpp
index 1ba0f33..554d969 100644
--- a/core_manager.cpp
+++ b/core_manager.cpp
@@ -3,7 +3,6 @@
 #include "core_manager.hpp"
 
 #include <phosphor-logging/lg2.hpp>
-#include <phosphor-logging/log.hpp>
 #include <sdbusplus/exception.hpp>
 
 #include <filesystem>
@@ -16,7 +15,6 @@
 namespace core
 {
 
-using namespace phosphor::logging;
 using namespace std;
 
 void Manager::watchCallback(const UserMap& fileInfo)
diff --git a/dump_entry.cpp b/dump_entry.cpp
index 86fa81b..0ecb9cb 100644
--- a/dump_entry.cpp
+++ b/dump_entry.cpp
@@ -2,15 +2,11 @@
 
 #include "dump_manager.hpp"
 
-#include <phosphor-logging/log.hpp>
-
 namespace phosphor
 {
 namespace dump
 {
 
-using namespace phosphor::logging;
-
 void Entry::delete_()
 {
     // Remove Dump entry D-bus object
diff --git a/dump_manager_faultlog.hpp b/dump_manager_faultlog.hpp
index 62b0574..6608713 100644
--- a/dump_manager_faultlog.hpp
+++ b/dump_manager_faultlog.hpp
@@ -16,8 +16,6 @@
 namespace faultlog
 {
 
-using namespace phosphor::logging;
-
 using CreateIface = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::Dump::server::Create>;
 
diff --git a/dump_serialize.cpp b/dump_serialize.cpp
index 4d1a485..d60cba1 100644
--- a/dump_serialize.cpp
+++ b/dump_serialize.cpp
@@ -3,7 +3,6 @@
 #include <cereal/archives/binary.hpp>
 #include <cereal/types/set.hpp>
 #include <phosphor-logging/lg2.hpp>
-#include <phosphor-logging/log.hpp>
 
 #include <fstream>
 
@@ -14,8 +13,6 @@
 namespace elog
 {
 
-using namespace phosphor::logging;
-
 void serialize(const ElogList& list, const std::filesystem::path& dir)
 {
     std::ofstream os(dir.c_str(), std::ios::binary);
diff --git a/dump_utils.cpp b/dump_utils.cpp
index ee75a4f..74246ae 100644
--- a/dump_utils.cpp
+++ b/dump_utils.cpp
@@ -1,15 +1,12 @@
 #include "dump_utils.hpp"
 
 #include <phosphor-logging/lg2.hpp>
-#include <phosphor-logging/log.hpp>
 
 namespace phosphor
 {
 namespace dump
 {
 
-using namespace phosphor::logging;
-
 std::string getService(sdbusplus::bus_t& bus, const std::string& path,
                        const std::string& interface)
 {
diff --git a/elog_watch.cpp b/elog_watch.cpp
index 00c6dc9..84eaff8 100644
--- a/elog_watch.cpp
+++ b/elog_watch.cpp
@@ -24,7 +24,6 @@
 namespace elog
 {
 
-using namespace phosphor::logging;
 constexpr auto LOG_PATH = "/xyz/openbmc_project/logging";
 using Message = std::string;
 using Attributes = std::variant<Message>;
diff --git a/faultlog_dump_entry.cpp b/faultlog_dump_entry.cpp
index e5d9c85..dfc69ca 100644
--- a/faultlog_dump_entry.cpp
+++ b/faultlog_dump_entry.cpp
@@ -1,7 +1,6 @@
 #include "faultlog_dump_entry.hpp"
 
 #include <phosphor-logging/lg2.hpp>
-#include <phosphor-logging/log.hpp>
 
 namespace phosphor
 {
@@ -9,7 +8,6 @@
 {
 namespace faultlog
 {
-using namespace phosphor::logging;
 
 void Entry::delete_()
 {
diff --git a/host-transport-extensions/pldm/common/pldm_utils.cpp b/host-transport-extensions/pldm/common/pldm_utils.cpp
index 4cd9da1..8682894 100644
--- a/host-transport-extensions/pldm/common/pldm_utils.cpp
+++ b/host-transport-extensions/pldm/common/pldm_utils.cpp
@@ -7,7 +7,6 @@
 
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/lg2.hpp>
-#include <phosphor-logging/log.hpp>
 
 namespace phosphor
 {
diff --git a/host-transport-extensions/pldm/oem/ibm/pldm_oem_cmds.cpp b/host-transport-extensions/pldm/oem/ibm/pldm_oem_cmds.cpp
index b9e2cb0..6bc2aae 100644
--- a/host-transport-extensions/pldm/oem/ibm/pldm_oem_cmds.cpp
+++ b/host-transport-extensions/pldm/oem/ibm/pldm_oem_cmds.cpp
@@ -26,7 +26,6 @@
 
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/lg2.hpp>
-#include <phosphor-logging/log.hpp>
 #include <sdbusplus/bus.hpp>
 
 #include <fstream>
diff --git a/ramoops_manager.cpp b/ramoops_manager.cpp
index 05add0d..321f90f 100644
--- a/ramoops_manager.cpp
+++ b/ramoops_manager.cpp
@@ -3,9 +3,11 @@
 #include "ramoops_manager.hpp"
 
 #include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/bus.hpp>
 #include <sdbusplus/exception.hpp>
 
 #include <filesystem>
+#include <set>
 
 namespace phosphor
 {
diff --git a/ramoops_manager.hpp b/ramoops_manager.hpp
index 7982bce..3946a2b 100644
--- a/ramoops_manager.hpp
+++ b/ramoops_manager.hpp
@@ -2,14 +2,11 @@
 
 #include "config.h"
 
-#include <phosphor-logging/log.hpp>
-
 #include <filesystem>
 #include <string>
 #include <vector>
 
 namespace fs = std::filesystem;
-using namespace phosphor::logging;
 
 namespace phosphor
 {