diff --git a/.gitignore b/.gitignore
index c9c85b925d..59c9c63051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,17 @@
 *.a
 *.cmd
 *.d
+*.dll
+*.exe
 *.gcda
 *.gcno
 *.kdev4
 *.ko
+*.lib
 *.log
 *.o
+*.obj
+*.pdb
 *.pyc
 *.so
 *.so.*
diff --git a/mk/spdk.app.mk b/mk/spdk.app.mk
index f6fb17a1f0..61a23d5e73 100644
--- a/mk/spdk.app.mk
+++ b/mk/spdk.app.mk
@@ -46,6 +46,8 @@ ifneq (,$(findstring $(SPDK_ROOT_DIR)/examples,$(CURDIR)))
 endif
 endif
 
+APP := $(APP)$(EXEEXT)
+
 LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 CLEAN_FILES = $(APP)
diff --git a/mk/spdk.app_cxx.mk b/mk/spdk.app_cxx.mk
index d035a18e15..c6b4e0cbe8 100644
--- a/mk/spdk.app_cxx.mk
+++ b/mk/spdk.app_cxx.mk
@@ -45,6 +45,8 @@ ifneq (,$(findstring $(SPDK_ROOT_DIR)/examples,$(CURDIR)))
 endif
 endif
 
+APP := $(APP)$(EXEEXT)
+
 LIBS += $(SPDK_LIB_LINKER_ARGS)
 
 CLEAN_FILES = $(APP)
diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index ba3c9d01cd..e64d8a17da 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -47,6 +47,7 @@ endif
 S ?= $(notdir $(CURDIR))
 
 DESTDIR?=
+EXEEXT?=
 
 ifneq ($(prefix),)
 CONFIG_PREFIX=$(prefix)
@@ -354,7 +355,7 @@ LIB_C=\
 
 # Clean up generated files listed as arguments plus a default list
 CLEAN_C=\
-	$(Q)rm -f *.a *.o *.d *.d.tmp *.gcno *.gcda
+	$(Q)rm -f *.a *.lib *.o *.obj *.d *.d.tmp *.pdb *.gcno *.gcda
 
 # Install a library
 INSTALL_LIB=\
diff --git a/mk/spdk.unittest.mk b/mk/spdk.unittest.mk
index 01d2bc3ec8..4dddb9a00e 100644
--- a/mk/spdk.unittest.mk
+++ b/mk/spdk.unittest.mk
@@ -56,7 +56,7 @@ SPDK_LIB_LIST += thread util log
 
 LIBS += -lcunit $(SPDK_STATIC_LIB_LINKER_ARGS)
 
-APP = $(TEST_FILE:.c=)
+APP = $(TEST_FILE:.c=)$(EXEEXT)
 
 ifneq ($(UNIT_TEST_LINK_ENV),1)
 ENV_LINKER_ARGS =