diff --git a/mboxd_pnor_partition_table.cpp b/mboxd_pnor_partition_table.cpp
index 49afeb0..2d7cf8f 100644
--- a/mboxd_pnor_partition_table.cpp
+++ b/mboxd_pnor_partition_table.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2018 IBM Corp.
 #include "mboxd_pnor_partition_table.h"
+#include "pnor_partition_table.hpp"
 #include "common.h"
 #include "mbox.h"
 #include "mboxd_flash.h"
@@ -10,11 +11,6 @@
 #include <phosphor-logging/elog-errors.hpp>
 #include <experimental/filesystem>
 
-struct vpnor_partition_table
-{
-    openpower::virtual_pnor::partition::Table *table = nullptr;
-};
-
 int init_vpnor(struct mbox_context *context)
 {
     if (context && !context->vpnor)
diff --git a/pnor_partition_table.hpp b/pnor_partition_table.hpp
index 796a47a..730e75b 100644
--- a/pnor_partition_table.hpp
+++ b/pnor_partition_table.hpp
@@ -306,3 +306,8 @@
 
 } // namespace virtual_pnor
 } // namespace openpower
+
+struct vpnor_partition_table
+{
+    openpower::virtual_pnor::partition::Table* table;
+};