diff --git a/builds/win32/clean_all.bat b/builds/win32/clean_all.bat
index f177358a3c..bcc53ad0bc 100644
--- a/builds/win32/clean_all.bat
+++ b/builds/win32/clean_all.bat
@@ -13,53 +13,53 @@ for %%v in ( %* )  do (
 
 
 @echo Cleaning temporary directories...
-@rmdir /S /Q %FB_OUTPUT_DIR% 2>nul
-@rmdir /S /Q %FB_TEMP_DIR% 2>nul
+@rmdir /S /Q "%FB_OUTPUT_DIR%" 2>nul
+@rmdir /S /Q "%FB_TEMP_DIR%" 2>nul
 
 @echo Cleaning gen...
-@rmdir /S /Q %FB_GEN_DIR% 2>nul
+@rmdir /S /Q "%FB_GEN_DIR%" 2>nul
 
 @echo Cleaning icu...
-@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\%FB_TARGET_PLATFORM%\%FBBUILD_BUILDTYPE% 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\icu\%FB_TARGET_PLATFORM%\%FBBUILD_BUILDTYPE%" 2>nul
 
 @echo Cleaning decNumber...
-@rmdir /S /Q %FB_ROOT_PATH%\extern\decNumber\lib\%FB_TARGET_PLATFORM% 2>nul
-@rmdir /S /Q %FB_ROOT_PATH%\extern\decNumber\temp\%FB_TARGET_PLATFORM% 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\decNumber\lib\%FB_TARGET_PLATFORM%" 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\decNumber\temp\%FB_TARGET_PLATFORM%" 2>nul
 
 @echo Cleaning libtomcrypt...
-@rmdir /S /Q %FB_ROOT_PATH%\extern\libtomcrypt\lib\%FB_TARGET_PLATFORM% 2>nul
-@rmdir /S /Q %FB_ROOT_PATH%\extern\libtomcrypt\temp\%FB_TARGET_PLATFORM% 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\libtomcrypt\lib\%FB_TARGET_PLATFORM%" 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\libtomcrypt\temp\%FB_TARGET_PLATFORM%" 2>nul
 
 @echo Cleaning libtommath...
-@rmdir /S /Q %FB_ROOT_PATH%\extern\libtommath\lib\%FB_TARGET_PLATFORM% 2>nul
-@rmdir /S /Q %FB_ROOT_PATH%\extern\libtommath\temp\%FB_TARGET_PLATFORM% 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\libtommath\lib\%FB_TARGET_PLATFORM%" 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\libtommath\temp\%FB_TARGET_PLATFORM%" 2>nul
 
 @echo Cleaning re2...
-@rmdir /S /Q %FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM% 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM%" 2>nul
 
 @echo Cleaning examples
-@rmdir /S /Q %FB_ROOT_PATH%\examples\prebuilt\%FB_TARGET_PLATFORM% 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\examples\prebuilt\%FB_TARGET_PLATFORM%" 2>nul
 
 :: Removing this might screw up parallel builds.
 :: So let's be sure we mean it.
 if defined FB_CLEAN_SHARED (
 @echo Cleaning icu Shared dirs...
-@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\include 2>nul
-@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\source\data\out 2>nul
-@del /Q %FB_ROOT_PATH%\extern\icu\source\extra\uconv\resources\*.res 2>nul
-@del %FB_ROOT_PATH%\extern\icu\source\extra\uconv\pkgdatain.txt 2>nul
-@del %FB_ROOT_PATH%\extern\icu\source\stubdata\stubdatabuilt.txt 2>nul
-@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\source\test\testdata\out 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\icu\include" 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\icu\source\data\out" 2>nul
+@del /Q "%FB_ROOT_PATH%\extern\icu\source\extra\uconv\resources\*.res" 2>nul
+@del "%FB_ROOT_PATH%\extern\icu\source\extra\uconv\pkgdatain.txt" 2>nul
+@del "%FB_ROOT_PATH%\extern\icu\source\stubdata\stubdatabuilt.txt" 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\icu\source\test\testdata\out" 2>nul
 
 @echo Cleaning zlib...
-@rmdir /S /Q %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM% 2>nul
-@del %FB_ROOT_PATH%\extern\zlib\zconf.h 2>nul
-@del %FB_ROOT_PATH%\extern\zlib\zlib.h 2>nul
+@rmdir /S /Q "%FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM%" 2>nul
+@del "%FB_ROOT_PATH%\extern\zlib\zconf.h" 2>nul
+@del "%FB_ROOT_PATH%\extern\zlib\zlib.h" 2>nul
 
 @echo Cleaning shared gen and dsql files...
-@del %FB_ROOT_PATH%\src\include\gen\parse.h 2>nul
-@del %FB_ROOT_PATH%\src\dsql\dsql.tab.h 2>nul
-@del %FB_ROOT_PATH%\src\dsql\parse.cpp 2>nul
+@del "%FB_ROOT_PATH%\src\include\gen\parse.h" 2>nul
+@del "%FB_ROOT_PATH%\src\dsql\dsql.tab.h" 2>nul
+@del "%FB_ROOT_PATH%\src\dsql\parse.cpp" 2>nul
 
 )
 
@@ -68,7 +68,7 @@ if defined FB_CLEAN_SHARED (
 :: made for the same target.
 if defined FB_INTLREALCLEAN (
 @echo Thoroughly scrubbing all remnants of INTL release dirs...
-for /R %FB_ROOT_PATH%\extern\icu\source\ %%a in (release) do (rmdir /q /s "%%a" 2>nul)
+for /R "%FB_ROOT_PATH%\extern\icu\source\" %%a in (release) do (rmdir /q /s "%%a" 2>nul)
 set FB_INTLREALCLEAN=
 )
 
@@ -79,7 +79,7 @@ set FB_INTLREALCLEAN=
 
 
 
-@rmdir /s /q %FB_ROOT_PATH%\builds\win32\install_image 2>nul
+@rmdir /s /q "%FB_ROOT_PATH%\builds\win32\install_image" 2>nul
 
 
 @echo Completed executing %0