diff --git a/vpnor/lpc_reset.cpp b/vpnor/lpc_reset.cpp
index 3874b5e..8143737 100644
--- a/vpnor/lpc_reset.cpp
+++ b/vpnor/lpc_reset.cpp
@@ -18,7 +18,7 @@
  */
 
 extern "C" {
-#include "mbox.h"
+#include "mboxd.h"
 #include "lpc.h"
 }
 
diff --git a/vpnor/mboxd_pnor_partition_table.cpp b/vpnor/mboxd_pnor_partition_table.cpp
index 329e065..23fc4cf 100644
--- a/vpnor/mboxd_pnor_partition_table.cpp
+++ b/vpnor/mboxd_pnor_partition_table.cpp
@@ -7,7 +7,7 @@
 #include "mboxd_pnor_partition_table.h"
 #include "pnor_partition_table.hpp"
 #include "common.h"
-#include "mbox.h"
+#include "mboxd.h"
 #include "pnor_partition_table.hpp"
 #include "config.h"
 #include "xyz/openbmc_project/Common/error.hpp"
diff --git a/vpnor/pnor_partition.hpp b/vpnor/pnor_partition.hpp
index eb63a39..e98890d 100644
--- a/vpnor/pnor_partition.hpp
+++ b/vpnor/pnor_partition.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 extern "C" {
-#include "mbox.h"
+#include "mboxd.h"
 };
 
 #include "mboxd_pnor_partition_table.h"
diff --git a/vpnor/pnor_partition_table.cpp b/vpnor/pnor_partition_table.cpp
index 4ad07bc..c77b938 100644
--- a/vpnor/pnor_partition_table.cpp
+++ b/vpnor/pnor_partition_table.cpp
@@ -3,6 +3,7 @@
 #include "pnor_partition_table.hpp"
 #include "common.h"
 #include "config.h"
+#include "mboxd.h"
 #include "xyz/openbmc_project/Common/error.hpp"
 #include <phosphor-logging/elog-errors.hpp>
 #include <syslog.h>
diff --git a/vpnor/pnor_partition_table.hpp b/vpnor/pnor_partition_table.hpp
index 10dccdd..8b80d74 100644
--- a/vpnor/pnor_partition_table.hpp
+++ b/vpnor/pnor_partition_table.hpp
@@ -7,9 +7,10 @@
 #include <numeric>
 #include <experimental/filesystem>
 #include "common.h"
-#include "mbox.h"
 #include "pnor_partition_defs.h"
 
+struct mbox_context;
+
 namespace openpower
 {
 namespace virtual_pnor
diff --git a/vpnor/protocol.cpp b/vpnor/protocol.cpp
index 57b35a7..e5e1ad8 100644
--- a/vpnor/protocol.cpp
+++ b/vpnor/protocol.cpp
@@ -3,7 +3,7 @@
 #include "config.h"
 
 extern "C" {
-#include "mbox.h"
+#include "mboxd.h"
 #include "protocol.h"
 #include "vpnor/protocol.h"
 }
diff --git a/vpnor/protocol_negotiate_version.cpp b/vpnor/protocol_negotiate_version.cpp
index 4aff8db..046d536 100644
--- a/vpnor/protocol_negotiate_version.cpp
+++ b/vpnor/protocol_negotiate_version.cpp
@@ -5,7 +5,7 @@
 #include <errno.h>
 
 extern "C" {
-#include "mbox.h"
+#include "mboxd.h"
 #include "protocol.h"
 #include "vpnor/protocol.h"
 }
diff --git a/vpnor/test/tmpd.hpp b/vpnor/test/tmpd.hpp
index 09d53ee..19890eb 100644
--- a/vpnor/test/tmpd.hpp
+++ b/vpnor/test/tmpd.hpp
@@ -8,7 +8,7 @@
 #include <experimental/filesystem>
 
 #include "config.h"
-#include "mbox.h"
+#include "mboxd.h"
 #include "vpnor/pnor_partition_table.hpp"
 
 namespace openpower
diff --git a/vpnor/test/write_patch.cpp b/vpnor/test/write_patch.cpp
index 5d93fc9..e5a367d 100644
--- a/vpnor/test/write_patch.cpp
+++ b/vpnor/test/write_patch.cpp
@@ -11,7 +11,7 @@
 
 #include "config.h"
 #include "common.h"
-#include "mbox.h"
+#include "mboxd.h"
 extern "C" {
 #include "flash.h"
 }
diff --git a/vpnor/test/write_patch_resize.cpp b/vpnor/test/write_patch_resize.cpp
index b55727b..28a73ce 100644
--- a/vpnor/test/write_patch_resize.cpp
+++ b/vpnor/test/write_patch_resize.cpp
@@ -12,7 +12,7 @@
 
 #include "config.h"
 #include "common.h"
-#include "mbox.h"
+#include "mboxd.h"
 
 extern "C" {
 #include "flash.h"
diff --git a/vpnor/test/write_prsv.cpp b/vpnor/test/write_prsv.cpp
index c358ae1..21a0366 100644
--- a/vpnor/test/write_prsv.cpp
+++ b/vpnor/test/write_prsv.cpp
@@ -9,7 +9,7 @@
 #include <unistd.h>
 
 #include "common.h"
-#include "mbox.h"
+#include "mboxd.h"
 extern "C" {
 #include "flash.h"
 }
diff --git a/vpnor/test/write_ro.cpp b/vpnor/test/write_ro.cpp
index 95e953c..13c0eae 100644
--- a/vpnor/test/write_ro.cpp
+++ b/vpnor/test/write_ro.cpp
@@ -9,7 +9,7 @@
 #include <unistd.h>
 
 #include "common.h"
-#include "mbox.h"
+#include "mboxd.h"
 
 extern "C" {
 #include "flash.h"
diff --git a/vpnor/test/write_rw.cpp b/vpnor/test/write_rw.cpp
index 88ef97f..c40af6a 100644
--- a/vpnor/test/write_rw.cpp
+++ b/vpnor/test/write_rw.cpp
@@ -9,7 +9,7 @@
 #include <unistd.h>
 
 #include "common.h"
-#include "mbox.h"
+#include "mboxd.h"
 extern "C" {
 #include "flash.h"
 }