diff --git a/lib/bdev/gpt/gpt.c b/lib/bdev/gpt/gpt.c
index c7b05fe43..98c392b3b 100644
--- a/lib/bdev/gpt/gpt.c
+++ b/lib/bdev/gpt/gpt.c
@@ -31,16 +31,11 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk_internal/event.h"
-#include "spdk_internal/bdev.h"
-#include "spdk_internal/log.h"
-
 #include "gpt.h"
 
-#include "spdk/event.h"
 #include "spdk/endian.h"
-#include "spdk/env.h"
-#include "spdk/io_channel.h"
+
+#include "spdk_internal/log.h"
 
 #define GPT_PRIMARY_PARTITION_TABLE_LBA 0x1
 #define PRIMARY_PARTITION_NUMBER 4
diff --git a/lib/bdev/gpt/gpt.h b/lib/bdev/gpt/gpt.h
index 093e43ddf..961385e0c 100644
--- a/lib/bdev/gpt/gpt.h
+++ b/lib/bdev/gpt/gpt.h
@@ -38,8 +38,9 @@
 #ifndef SPDK_INTERNAL_GPT_H
 #define SPDK_INTERNAL_GPT_H
 
+#include "spdk/stdinc.h"
+
 #include "spdk/gpt_spec.h"
-#include "spdk/bdev.h"
 
 #define SPDK_GPT_PART_TYPE_GUID SPDK_GPT_GUID(0x7c5222bd, 0x8f5d, 0x4087, 0x9c00, 0xbf9843c7b58c)
 #define SPDK_GPT_BUFFER_SIZE 32768  /* 32KB */
diff --git a/lib/bdev/gpt/vbdev_gpt.c b/lib/bdev/gpt/vbdev_gpt.c
index f0e945535..ca2aa2db8 100644
--- a/lib/bdev/gpt/vbdev_gpt.c
+++ b/lib/bdev/gpt/vbdev_gpt.c
@@ -36,21 +36,19 @@
  * each partition.
  */
 
-#include "spdk/stdinc.h"
+#include "gpt.h"
 
-#include "spdk/rpc.h"
 #include "spdk/conf.h"
 #include "spdk/endian.h"
-#include "spdk/io_channel.h"
 #include "spdk/env.h"
+#include "spdk/io_channel.h"
+#include "spdk/rpc.h"
 #include "spdk/string.h"
 #include "spdk/util.h"
 
 #include "spdk_internal/bdev.h"
 #include "spdk_internal/log.h"
 
-#include "gpt.h"
-
 SPDK_DECLARE_BDEV_MODULE(gpt);
 
 /* Base block device gpt context */