diff --git a/lib/nvmf/conf.c b/lib/nvmf/conf.c
index 898a50216..f68ed2f2a 100644
--- a/lib/nvmf/conf.c
+++ b/lib/nvmf/conf.c
@@ -31,6 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <stdlib.h>
 #include <string.h>
 
 #include "conf.h"
diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index 4729a3ffd..799cb1efc 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -33,6 +33,9 @@
 
 #include <arpa/inet.h>
 
+#include <rte_config.h>
+#include <rte_mempool.h>
+
 #include "spdk/log.h"
 #include "spdk/conf.h"
 #include "nvmf.h"
diff --git a/lib/nvmf/nvmf.h b/lib/nvmf/nvmf.h
index 915e96ddf..5acae615d 100644
--- a/lib/nvmf/nvmf.h
+++ b/lib/nvmf/nvmf.h
@@ -36,13 +36,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <pthread.h>
-
-#include <rte_config.h>
-#include <rte_mempool.h>
-
-#include "spdk/nvmf_spec.h"
-#include "spdk/nvme.h"
 
 /**
  * \file
diff --git a/lib/nvmf/port.c b/lib/nvmf/port.c
index af44f20f3..02a5f79cc 100644
--- a/lib/nvmf/port.c
+++ b/lib/nvmf/port.c
@@ -31,6 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <rte_config.h>
+#include <rte_debug.h>
+
 #include "conn.h"
 #include "nvmf.h"
 #include "rdma.h"
diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c
index 2f67a2d91..084fe5c6c 100644
--- a/lib/nvmf/rdma.c
+++ b/lib/nvmf/rdma.c
@@ -41,6 +41,7 @@
 #include <rte_debug.h>
 #include <rte_cycles.h>
 #include <rte_timer.h>
+#include <rte_mempool.h>
 
 #include "conn.h"
 #include "rdma.h"
diff --git a/lib/nvmf/subsystem_grp.c b/lib/nvmf/subsystem_grp.c
index be14e910d..404d6f7fc 100644
--- a/lib/nvmf/subsystem_grp.c
+++ b/lib/nvmf/subsystem_grp.c
@@ -31,6 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <ctype.h>
+
 #include "controller.h"
 #include "port.h"
 #include "init_grp.h"