diff --git a/tests/oem/meta/fileio.cpp b/tests/oem/meta/fileio.cpp
index 747f3be..845f0da 100644
--- a/tests/oem/meta/fileio.cpp
+++ b/tests/oem/meta/fileio.cpp
@@ -1,19 +1,21 @@
 /* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */
+
+#include "msgbuf.hpp"
+
 #include <endian.h>
+#include <libpldm/base.h>
 #include <libpldm/oem/meta/file_io.h>
 
 #include <cstdlib>
 #include <new>
 
-#include "msgbuf.h"
-
 #include "gmock/gmock.h"
 #include <gtest/gtest.h>
 
 TEST(DecodeOemMetaFileIoWriteReq, testGoodDecodeRequest)
 {
     constexpr const uint8_t postCode[4] = {0x93, 0xe0, 0x00, 0xea};
-    PLDM_MSGBUF_DEFINE_P(ctx);
+    PLDM_MSGBUF_RW_DEFINE_P(ctx);
     int rc;
 
     constexpr size_t encodedPayloadLen =
@@ -82,7 +84,7 @@
 
 TEST(DecodeOemMetaFileIoReadReq, testGoodDecodeRequest)
 {
-    PLDM_MSGBUF_DEFINE_P(ctx);
+    PLDM_MSGBUF_RW_DEFINE_P(ctx);
     int rc;
 
     constexpr size_t payloadLen = PLDM_OEM_META_FILE_IO_READ_REQ_MIN_LENGTH +