diff --git a/procedures/phal/check_host_running.cpp b/procedures/phal/check_host_running.cpp
index a85bf4d..98d1e14 100644
--- a/procedures/phal/check_host_running.cpp
+++ b/procedures/phal/check_host_running.cpp
@@ -3,10 +3,9 @@
 #include "libpdbg.h"
 }
 
-#include "common_utils.hpp"
+#include "extensions/phal/common_utils.hpp"
 #include "extensions/phal/create_pel.hpp"
 #include "p10_cfam.hpp"
-#include "procedures/phal/common_utils.hpp"
 #include "registration.hpp"
 
 #include <phosphor-logging/log.hpp>
diff --git a/procedures/phal/common_utils.cpp b/procedures/phal/common_utils.cpp
deleted file mode 100644
index 50742f6..0000000
--- a/procedures/phal/common_utils.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-extern "C"
-{
-#include <libpdbg.h>
-}
-#include "attributes_info.H"
-
-#include "extensions/phal/phal_error.hpp"
-#include "procedures/phal/common_utils.hpp"
-
-#include <fmt/format.h>
-#include <libekb.H>
-
-#include <phosphor-logging/log.hpp>
-
-namespace openpower
-{
-namespace phal
-{
-
-using namespace phosphor::logging;
-
-void phal_init(enum ipl_mode mode)
-{
-    // TODO: Setting boot error callback should not be in common code
-    //       because, we wont get proper reason in PEL for failure.
-    //       So, need to make code like caller of this function pass error
-    //       handling callback.
-    // add callback methods for debug traces and for boot failures
-    openpower::pel::addBootErrorCallbacks();
-
-    // PDBG_DTB environment variable set to CEC device tree path
-    static constexpr auto PDBG_DTB_PATH =
-        "/var/lib/phosphor-software-manager/pnor/rw/DEVTREE";
-
-    if (setenv("PDBG_DTB", PDBG_DTB_PATH, 1))
-    {
-        log<level::ERR>(
-            fmt::format("Failed to set PDBG_DTB: ({})", strerror(errno))
-                .c_str());
-        throw std::runtime_error("Failed to set PDBG_DTB");
-    }
-
-    if (!pdbg_targets_init(NULL))
-    {
-        log<level::ERR>("pdbg_targets_init failed");
-        throw std::runtime_error("pdbg target initialization failed");
-    }
-
-    if (libekb_init())
-    {
-        log<level::ERR>("libekb_init failed");
-        throw std::runtime_error("libekb initialization failed");
-    }
-
-    if (ipl_init(mode) != 0)
-    {
-        log<level::ERR>("ipl_init failed");
-        throw std::runtime_error("libipl initialization failed");
-    }
-}
-
-bool isPrimaryProc(struct pdbg_target* procTarget)
-{
-    ATTR_PROC_MASTER_TYPE_Type type;
-
-    // Get processor type (Primary or Secondary)
-    if (DT_GET_PROP(ATTR_PROC_MASTER_TYPE, procTarget, type))
-    {
-        log<level::ERR>("Attribute [ATTR_PROC_MASTER_TYPE] get failed");
-        throw std::runtime_error(
-            "Attribute [ATTR_PROC_MASTER_TYPE] get failed");
-    }
-
-    /* Attribute value 0 corresponds to primary processor */
-    if (type == ENUM_ATTR_PROC_MASTER_TYPE_ACTING_MASTER)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-pdbg_target* getFsiTarget(struct pdbg_target* procTarget)
-{
-
-    struct pdbg_target* fsiTarget = nullptr;
-    pdbg_for_each_target("fsi", procTarget, fsiTarget)
-    {
-        // grab first one we find
-        break;
-    }
-    if (!fsiTarget)
-    {
-        log<level::ERR>(
-            "fsi path of target not found",
-            entry("PROC_TARGET_PATH=%s", pdbg_target_path(procTarget)));
-        return nullptr;
-    }
-
-    return fsiTarget;
-}
-
-uint32_t probeTarget(struct pdbg_target* procTarget)
-{
-    struct pdbg_target* pibTarget = nullptr;
-    pdbg_for_each_target("pib", procTarget, pibTarget)
-    {
-        // grab first one we find
-        break;
-    }
-    if (!pibTarget)
-    {
-        log<level::ERR>(
-            "pib path of target not found",
-            entry("PROC_TARGET_PATH=%s", pdbg_target_path(procTarget)));
-        return -1;
-    }
-    // probe PIB and ensure it's enabled
-    if (PDBG_TARGET_ENABLED != pdbg_target_probe(pibTarget))
-    {
-        log<level::ERR>(
-            "probe on pib target failed",
-            entry("PIB_TARGET_PATH=%s", pdbg_target_path(pibTarget)));
-        return -1;
-    }
-    return 0;
-}
-
-uint32_t getCFAM(struct pdbg_target* procTarget, const uint32_t reg,
-                 uint32_t& val)
-{
-
-    pdbg_target* fsiTarget = getFsiTarget(procTarget);
-    if (nullptr == fsiTarget)
-    {
-        log<level::ERR>("getCFAM: fsi path or target not found");
-        return -1;
-    }
-
-    auto rc = probeTarget(procTarget);
-    if (rc)
-    {
-        // probe function logged details to journal
-        return rc;
-    }
-
-    rc = fsi_read(fsiTarget, reg, &val);
-    if (rc)
-    {
-        log<level::ERR>(
-            "failed to read input cfam", entry("RC=%u", rc),
-            entry("CFAM=0x%X", reg),
-            entry("FSI_TARGET_PATH=%s", pdbg_target_path(fsiTarget)));
-        return rc;
-    }
-    return 0;
-}
-
-uint32_t putCFAM(struct pdbg_target* procTarget, const uint32_t reg,
-                 const uint32_t val)
-{
-    pdbg_target* fsiTarget = getFsiTarget(procTarget);
-    if (nullptr == fsiTarget)
-    {
-        log<level::ERR>("putCFAM: fsi path or target not found");
-        return -1;
-    }
-
-    auto rc = probeTarget(procTarget);
-    if (rc)
-    {
-        // probe function logged details to journal
-        return rc;
-    }
-
-    rc = fsi_write(fsiTarget, reg, val);
-    if (rc)
-    {
-        log<level::ERR>(
-            "failed to write input cfam", entry("RC=%u", rc),
-            entry("CFAM=0x%X", reg),
-            entry("FSI_TARGET_PATH=%s", pdbg_target_path(fsiTarget)));
-        return rc;
-    }
-    return 0;
-}
-
-} // namespace phal
-} // namespace openpower
diff --git a/procedures/phal/common_utils.hpp b/procedures/phal/common_utils.hpp
deleted file mode 100644
index 277272c..0000000
--- a/procedures/phal/common_utils.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#pragma once
-
-#include <libipl.H>
-
-extern "C"
-{
-#include <libpdbg.h>
-}
-
-namespace openpower
-{
-namespace phal
-{
-
-/**
- * @brief This function will initialize required phal
- *        libraries.
- * Throws an exception on error.
- *
- * @param[in] mode - IPL mode, default IPL_AUTOBOOT
- *
- */
-void phal_init(enum ipl_mode mode = IPL_AUTOBOOT);
-
-/**
- *  @brief  Check if primary processor or not
- *
- *  @param[in] procTarget - Processor target to check if primary or not
- *
- *  @return True/False
- */
-bool isPrimaryProc(struct pdbg_target* procTarget);
-
-/**
- *  @brief  Read the input CFAM register
- *
- *  @param[in]  procTarget - Processor target to perform the operation on
- *  @param[in]  reg - The register address to read
- *  @param[out] val - The value read from the register
- *
- *  @return 0 on success, non-0 on failure
- */
-uint32_t getCFAM(struct pdbg_target* procTarget, const uint32_t reg,
-                 uint32_t& val);
-
-/**
- *  @brief  Write the input CFAM register
- *
- *  @param[in]  procTarget - Processor target to perform the operation on
- *  @param[in]  reg - The register address to write
- *  @param[out] val - The value to write to the register
- *
- *  @return 0 on success, non-0 on failure
- */
-uint32_t putCFAM(struct pdbg_target* procTarget, const uint32_t reg,
-                 const uint32_t val);
-
-/**
- *  @brief  Helper function to find FSI target needed for FSI operations
- *
- *  @param[in]  procTarget - Processor target to find the FSI target on
- *
- *  @return Valid pointer to FSI target on success, nullptr on failure
- */
-pdbg_target* getFsiTarget(struct pdbg_target* procTarget);
-
-/**
- *  @brief  Helper function to probe the processor target
- *
- *  The probe call only has to happen once per application start so ensure
- *  this function only probes once no matter how many times it's called.
- *
- *  @param[in]  procTarget - Processor target to probe
- *
- *  @return 0 on success, non-0 on failure
- */
-uint32_t probeTarget(struct pdbg_target* procTarget);
-
-} // namespace phal
-} // namespace openpower
diff --git a/procedures/phal/proc_pre_poweroff.cpp b/procedures/phal/proc_pre_poweroff.cpp
index 658b446..1293080 100644
--- a/procedures/phal/proc_pre_poweroff.cpp
+++ b/procedures/phal/proc_pre_poweroff.cpp
@@ -1,5 +1,5 @@
+#include "extensions/phal/common_utils.hpp"
 #include "extensions/phal/phal_error.hpp"
-#include "procedures/phal/common_utils.hpp"
 #include "registration.hpp"
 
 #include <libekb.H>
diff --git a/procedures/phal/start_host.cpp b/procedures/phal/start_host.cpp
index d6b0b40..6e3f683 100644
--- a/procedures/phal/start_host.cpp
+++ b/procedures/phal/start_host.cpp
@@ -5,8 +5,8 @@
 
 #include "attributes_info.H"
 
+#include "extensions/phal/common_utils.hpp"
 #include "extensions/phal/phal_error.hpp"
-#include "procedures/phal/common_utils.hpp"
 #include "util.hpp"
 
 #include <fmt/format.h>