diff --git a/include/spdk_internal/nvmf.h b/include/spdk/nvmf_cmd.h
similarity index 97%
rename from include/spdk_internal/nvmf.h
rename to include/spdk/nvmf_cmd.h
index 5feee04ac..1afedadf2 100644
--- a/include/spdk_internal/nvmf.h
+++ b/include/spdk/nvmf_cmd.h
@@ -31,8 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SPDK_INTERNAL_NVMF_H_
-#define SPDK_INTERNAL_NVMF_H_
+#ifndef SPDK_NVMF_CMD_H_
+#define SPDK_NVMF_CMD_H_
 
 #include "spdk/stdinc.h"
 #include "spdk/nvmf.h"
@@ -72,4 +72,4 @@ struct spdk_nvme_cmd *spdk_nvmf_request_get_cmd(struct spdk_nvmf_request *req);
 struct spdk_nvme_cpl *spdk_nvmf_request_get_response(struct spdk_nvmf_request *req);
 int spdk_nvmf_custom_identify_hdlr(struct spdk_nvmf_request *req);
 
-#endif /* SPDK_INTERNAL_NVMF_H_ */
+#endif /* SPDK_NVMF_CMD_H_ */
diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c
index 08fc57fc6..67f647c4e 100644
--- a/lib/nvmf/ctrlr.c
+++ b/lib/nvmf/ctrlr.c
@@ -41,11 +41,11 @@
 #include "spdk/thread.h"
 #include "spdk/trace.h"
 #include "spdk/nvme_spec.h"
+#include "spdk/nvmf_cmd.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
 #include "spdk/version.h"
 
-#include "spdk_internal/nvmf.h"
 #include "spdk_internal/log.h"
 
 #define MIN_KEEP_ALIVE_TIMEOUT_IN_MS 10000
diff --git a/lib/nvmf/ctrlr_bdev.c b/lib/nvmf/ctrlr_bdev.c
index 0cd046e9b..84ccef902 100644
--- a/lib/nvmf/ctrlr_bdev.c
+++ b/lib/nvmf/ctrlr_bdev.c
@@ -40,13 +40,13 @@
 #include "spdk/thread.h"
 #include "spdk/likely.h"
 #include "spdk/nvme.h"
+#include "spdk/nvmf_cmd.h"
 #include "spdk/nvmf_spec.h"
 #include "spdk/trace.h"
 #include "spdk/scsi_spec.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/nvmf.h"
 #include "spdk_internal/log.h"
 
 static bool
diff --git a/lib/nvmf/custom_cmd_hdlr.c b/lib/nvmf/custom_cmd_hdlr.c
index 08a04cf79..b82e0be6f 100644
--- a/lib/nvmf/custom_cmd_hdlr.c
+++ b/lib/nvmf/custom_cmd_hdlr.c
@@ -38,7 +38,8 @@
 #include "spdk/stdinc.h"
 
 #include "spdk/bdev.h"
-#include "spdk_internal/nvmf.h"
+#include "spdk/nvmf_cmd.h"
+
 #include "spdk_internal/log.h"
 
 static void
diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index 9daa77b1c..36eb196bb 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -38,6 +38,7 @@
 
 #include "spdk/likely.h"
 #include "spdk/nvmf.h"
+#include "spdk/nvmf_cmd.h"
 #include "spdk/nvmf_transport.h"
 #include "spdk/nvmf_spec.h"
 #include "spdk/assert.h"
@@ -46,8 +47,6 @@
 #include "spdk/util.h"
 #include "spdk/thread.h"
 
-#include "spdk_internal/nvmf.h"
-
 enum spdk_nvmf_subsystem_state {
 	SPDK_NVMF_SUBSYSTEM_INACTIVE = 0,
 	SPDK_NVMF_SUBSYSTEM_ACTIVATING,
diff --git a/module/event/subsystems/nvmf/nvmf_tgt.c b/module/event/subsystems/nvmf/nvmf_tgt.c
index 434c1248b..df869bd71 100644
--- a/module/event/subsystems/nvmf/nvmf_tgt.c
+++ b/module/event/subsystems/nvmf/nvmf_tgt.c
@@ -38,10 +38,9 @@
 #include "spdk/thread.h"
 #include "spdk/log.h"
 #include "spdk/nvme.h"
+#include "spdk/nvmf_cmd.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/nvmf.h"
-
 enum nvmf_tgt_state {
 	NVMF_TGT_INIT_NONE = 0,
 	NVMF_TGT_INIT_PARSE_CONFIG,