diff --git a/libpldmresponder/bios.cpp b/libpldmresponder/bios.cpp
index 1819030..4bfef06 100644
--- a/libpldmresponder/bios.cpp
+++ b/libpldmresponder/bios.cpp
@@ -1,6 +1,6 @@
 #include "bios.hpp"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <time.h>
 
diff --git a/libpldmresponder/bios_attribute.cpp b/libpldmresponder/bios_attribute.cpp
index f6b3912..b0b834e 100644
--- a/libpldmresponder/bios_attribute.cpp
+++ b/libpldmresponder/bios_attribute.cpp
@@ -3,7 +3,7 @@
 #include "bios_attribute.hpp"
 
 #include "bios_config.hpp"
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <iostream>
 #include <variant>
diff --git a/libpldmresponder/bios_attribute.hpp b/libpldmresponder/bios_attribute.hpp
index effc733..7b4116a 100644
--- a/libpldmresponder/bios_attribute.hpp
+++ b/libpldmresponder/bios_attribute.hpp
@@ -3,7 +3,7 @@
 #include "bios_table.h"
 
 #include "bios_table.hpp"
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <nlohmann/json.hpp>
 
diff --git a/libpldmresponder/bios_enum_attribute.cpp b/libpldmresponder/bios_enum_attribute.cpp
index 2f7da62..ecbb8f5 100644
--- a/libpldmresponder/bios_enum_attribute.cpp
+++ b/libpldmresponder/bios_enum_attribute.cpp
@@ -2,7 +2,7 @@
 
 #include "bios_enum_attribute.hpp"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <iostream>
 
diff --git a/libpldmresponder/bios_integer_attribute.cpp b/libpldmresponder/bios_integer_attribute.cpp
index 1aae60a..23ffab3 100644
--- a/libpldmresponder/bios_integer_attribute.cpp
+++ b/libpldmresponder/bios_integer_attribute.cpp
@@ -1,6 +1,6 @@
 #include "bios_integer_attribute.hpp"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 namespace pldm
 {
diff --git a/libpldmresponder/bios_string_attribute.cpp b/libpldmresponder/bios_string_attribute.cpp
index 1b6ba75..1453644 100644
--- a/libpldmresponder/bios_string_attribute.cpp
+++ b/libpldmresponder/bios_string_attribute.cpp
@@ -1,6 +1,6 @@
 #include "bios_string_attribute.hpp"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <iostream>
 #include <tuple>
diff --git a/libpldmresponder/event_parser.hpp b/libpldmresponder/event_parser.hpp
index 19004a7..49f2233 100644
--- a/libpldmresponder/event_parser.hpp
+++ b/libpldmresponder/event_parser.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "types.hpp"
-#include "utils.hpp"
+#include "common/types.hpp"
+#include "common/utils.hpp"
 
 #include <nlohmann/json.hpp>
 
diff --git a/libpldmresponder/fru.cpp b/libpldmresponder/fru.cpp
index b3dc73b..a9c8787 100644
--- a/libpldmresponder/fru.cpp
+++ b/libpldmresponder/fru.cpp
@@ -2,7 +2,7 @@
 
 #include "libpldm/utils.h"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <systemd/sd-journal.h>
 
diff --git a/libpldmresponder/pdr.hpp b/libpldmresponder/pdr.hpp
index a2a066f..c6f05a2 100644
--- a/libpldmresponder/pdr.hpp
+++ b/libpldmresponder/pdr.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "common/utils.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
-#include "utils.hpp"
 
 #include <stdint.h>
 
diff --git a/libpldmresponder/pdr_utils.hpp b/libpldmresponder/pdr_utils.hpp
index e644534..2843ee6 100644
--- a/libpldmresponder/pdr_utils.hpp
+++ b/libpldmresponder/pdr_utils.hpp
@@ -2,8 +2,8 @@
 
 #include "libpldm/pdr.h"
 
-#include "types.hpp"
-#include "utils.hpp"
+#include "common/types.hpp"
+#include "common/utils.hpp"
 
 #include <stdint.h>
 
diff --git a/libpldmresponder/platform.cpp b/libpldmresponder/platform.cpp
index 569977a..1e13754 100644
--- a/libpldmresponder/platform.cpp
+++ b/libpldmresponder/platform.cpp
@@ -1,12 +1,12 @@
 
 #include "platform.hpp"
 
+#include "common/utils.hpp"
 #include "event_parser.hpp"
 #include "pdr_numeric_effecter.hpp"
 #include "pdr_state_effecter.hpp"
 #include "platform_numeric_effecter.hpp"
 #include "platform_state_effecter.hpp"
-#include "utils.hpp"
 
 namespace pldm
 {
diff --git a/libpldmresponder/platform.hpp b/libpldmresponder/platform.hpp
index a52c9a8..40f9214 100644
--- a/libpldmresponder/platform.hpp
+++ b/libpldmresponder/platform.hpp
@@ -5,12 +5,12 @@
 #include "libpldm/platform.h"
 #include "libpldm/states.h"
 
+#include "common/utils.hpp"
 #include "event_parser.hpp"
 #include "host-bmc/host_pdr_handler.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
 #include "pldmd/handler.hpp"
-#include "utils.hpp"
 
 #include <stdint.h>
 
diff --git a/libpldmresponder/platform_numeric_effecter.hpp b/libpldmresponder/platform_numeric_effecter.hpp
index 9d435b1..62228e0 100644
--- a/libpldmresponder/platform_numeric_effecter.hpp
+++ b/libpldmresponder/platform_numeric_effecter.hpp
@@ -5,10 +5,10 @@
 #include "libpldm/platform.h"
 #include "libpldm/states.h"
 
+#include "common/utils.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "pdr_utils.hpp"
 #include "pldmd/handler.hpp"
-#include "utils.hpp"
 
 #include <math.h>
 #include <stdint.h>
diff --git a/libpldmresponder/platform_state_effecter.hpp b/libpldmresponder/platform_state_effecter.hpp
index 961aa7f..ba1c9bd 100644
--- a/libpldmresponder/platform_state_effecter.hpp
+++ b/libpldmresponder/platform_state_effecter.hpp
@@ -5,10 +5,10 @@
 #include "libpldm/platform.h"
 #include "libpldm/states.h"
 
+#include "common/utils.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "pdr_utils.hpp"
 #include "pldmd/handler.hpp"
-#include "utils.hpp"
 
 #include <cstdint>
 #include <map>