diff --git a/vpnor/test/tmpd.hpp b/vpnor/test/tmpd.hpp
index 2239f9c..7386f2f 100644
--- a/vpnor/test/tmpd.hpp
+++ b/vpnor/test/tmpd.hpp
@@ -3,17 +3,18 @@
 
 #include "config.h"
 
+extern "C" {
+#include "mboxd.h"
+}
+
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
-#include <string.h>
-
+#include <cassert>
+#include <cstring>
 #include <experimental/filesystem>
 #include <fstream>
 #include <vector>
 
-#include "mboxd.h"
-
 namespace openpower
 {
 namespace virtual_pnor