diff --git a/app/nvmf_tgt/conf.c b/app/nvmf_tgt/conf.c
index 4ff8eac05..af677ba0e 100644
--- a/app/nvmf_tgt/conf.c
+++ b/app/nvmf_tgt/conf.c
@@ -39,7 +39,7 @@
 #include <rte_config.h>
 #include <rte_lcore.h>
 
-#include "conf.h"
+#include "nvmf_tgt.h"
 #include "nvmf/subsystem.h"
 #include "nvmf/transport.h"
 #include "spdk/conf.h"
diff --git a/app/nvmf_tgt/nvmf_tgt.c b/app/nvmf_tgt/nvmf_tgt.c
index 3131010f6..329c591eb 100644
--- a/app/nvmf_tgt/nvmf_tgt.c
+++ b/app/nvmf_tgt/nvmf_tgt.c
@@ -42,7 +42,7 @@
 #include <rte_memzone.h>
 #include <rte_mempool.h>
 
-#include "conf.h"
+#include "nvmf_tgt.h"
 
 #include "spdk/event.h"
 
diff --git a/app/nvmf_tgt/conf.h b/app/nvmf_tgt/nvmf_tgt.h
similarity index 96%
rename from app/nvmf_tgt/conf.h
rename to app/nvmf_tgt/nvmf_tgt.h
index 0d5016e8d..2121f0c56 100644
--- a/app/nvmf_tgt/conf.h
+++ b/app/nvmf_tgt/nvmf_tgt.h
@@ -31,8 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef NVMF_CONF_H
-#define NVMF_CONF_H
+#ifndef NVMF_TGT_H
+#define NVMF_TGT_H
 
 struct spdk_nvmf_tgt_conf {
 	uint32_t acceptor_lcore;
@@ -40,7 +40,6 @@ struct spdk_nvmf_tgt_conf {
 
 extern struct spdk_nvmf_tgt_conf g_spdk_nvmf_tgt_conf;
 
-int
-spdk_nvmf_parse_conf(void);
+int spdk_nvmf_parse_conf(void);
 
 #endif