diff --git a/Makefile.win b/Makefile.win
index f98c5e6d837..7f96206924a 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -442,12 +442,12 @@ clean_context:
 	$(call DELFILE include\nuttx\version.h)
 	$(call DELFILE include\math.h)
 	$(call DELFILE include\stdarg.h)
-	$(Q) $(DIRUNLINK) include\arch\board
-	$(Q) $(DIRUNLINK) include\arch\chip
-	$(Q) $(DIRUNLINK) include\arch
-	$(Q) $(DIRUNLINK) $(ARCH_SRC)\board
-	$(Q) $(DIRUNLINK) $(ARCH_SRC)\chip
-	$(Q) $(DIRUNLINK) include\apps
+	$(call DELDIR include\arch\board)
+	$(call DELDIR include\arch\chip)
+	$(call DELDIR include\arch)
+	$(call DELDIR $(ARCH_SRC)\board)
+	$(call DELDIR $(ARCH_SRC)\chip)
+	$(call DELDIR include\apps)
 
 # check_context
 #
diff --git a/tools/Config.mk b/tools/Config.mk
index aafb58f35bb..300df7a6ac5 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -182,11 +182,23 @@ define DELFILE
 	$(Q) if exist $1 (del /f /q $1)
 endef
 else
-define CLEAN
+define DELFILE
 	$(Q) rm -f $1
 endef
 endif
 
+# DELDIR - Delect one directory
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+define DELDIR
+	$(Q) if exist $1 (rmdir /q /s $1)
+endef
+else
+define DELDIR
+	$(Q) rm -rf $1
+endef
+endif
+
 # CLEAN - Default clean target
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)