diff --git a/Makefile b/Makefile
index 970fdf54..6c9a06cc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,6 @@
 
 include util.mk
 
-# Dynos
-include dynos.mk
-
 # Default target
 default: all
 
@@ -96,7 +93,7 @@ $(eval $(call validate-option,COMPILER,ido gcc))
 
 ifeq ($(WINDOWS_AUTO_BUILDER),1)
   export SHELL=sh.exe
-  EXTRA_INCLUDES := ../include/1 ../include/2 ../include/3 ../include/4
+  EXTRA_INCLUDES := -I ../include/1 -I ../include/2 -I ../include/3 -I ../include/4
   EXTRA_CFLAGS := -Wno-expansion-to-defined
 
   EXTRA_CPP_INCLUDES := ../include/cpp
@@ -476,6 +473,9 @@ GODDARD_SRC_DIRS := src/goddard src/goddard/dynlists
 # File dependencies and variables for specific files
 include Makefile.split
 
+# Dynos
+include dynos.mk
+
 # Source code files
 LEVEL_C_FILES     := $(wildcard levels/*/leveldata.c) $(wildcard levels/*/script.c) $(wildcard levels/*/geo.c)
 C_FILES           := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) $(LEVEL_C_FILES)
diff --git a/Makefile.split b/Makefile.split
index 6d69a252..346d3d12 100644
--- a/Makefile.split
+++ b/Makefile.split
@@ -188,12 +188,16 @@ endef
 
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),distclean)
+ifeq ($(WINDOWS_AUTO_BUILDER),1)
+include $(BUILD_DIR)/level_rules.mk
+else
 $(BUILD_DIR)/level_rules.mk: levels/level_rules.mk levels/level_defines.h
 	@$(PRINT) "$(GREEN)Preprocessing level make rules: $(BLUE)$@ $(NO_COL)\n"
-	@$(CPP) $(VERSION_CFLAGS) -I . $(EXTRA_INCLUDES) -o $@ $<
+	$(V)$(CPP) $(VERSION_CFLAGS) -I . $(EXTRA_INCLUDES) -o $@ $<
 include $(BUILD_DIR)/level_rules.mk
 endif
 endif
+endif
 
 # --------------------------------------
 # Extra Level Rules