diff --git a/include/spdk/nvme.h b/include/spdk/nvme.h
index d76220369..226fc032c 100644
--- a/include/spdk/nvme.h
+++ b/include/spdk/nvme.h
@@ -38,7 +38,9 @@
 extern "C" {
 #endif
 
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include "spdk/pci.h"
 #include "nvme_spec.h"
 
diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h
index 2d9064cbd..58bcea42e 100644
--- a/lib/nvme/nvme_internal.h
+++ b/lib/nvme/nvme_internal.h
@@ -34,6 +34,8 @@
 #ifndef __NVME_INTERNAL_H__
 #define __NVME_INTERNAL_H__
 
+#include "spdk/nvme.h"
+
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -47,8 +49,6 @@
 
 #include <sys/user.h>
 
-#include "spdk/nvme.h"
-
 #include "spdk/queue.h"
 #include "spdk/barrier.h"
 #include "spdk/mmio.h"