diff --git a/Makefile b/Makefile
index f8b56220..3c4bb65b 100644
--- a/Makefile
+++ b/Makefile
@@ -213,6 +213,7 @@ all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data
 	@echo Finished
 
 $(BUILD_DIRECTORY)/data: $(DATA_DIRECTORY)
+	@mkdir -p $(@D)
 	@rm -rf $(BUILD_DIRECTORY)/data
 	@cp -r $(DATA_DIRECTORY) $(BUILD_DIRECTORY)/data
 
@@ -243,7 +244,7 @@ obj/bin2h: bin2h/bin2h.c
 
 include $(wildcard $(DEPENDENCIES))
 
-obj/$(FILENAME)/win_icon.o: res/ICON/ICON.rc res/ICON/0.ico res/ICON/ICON_MINI.ico
+obj/$(FILENAME)/win_icon.o: $(ASSETS_DIRECTORY)/resources/ICON/ICON.rc $(ASSETS_DIRECTORY)/resources/ICON/0.ico $(ASSETS_DIRECTORY)/resources/ICON/ICON_MINI.ico
 	@mkdir -p $(@D)
 	@windres $< $@
 
diff --git a/src/WindowsWrapper.h b/src/WindowsWrapper.h
index 0994a3f2..ca0d6229 100644
--- a/src/WindowsWrapper.h
+++ b/src/WindowsWrapper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef NONPORTABLE
+#ifdef WINDOWS
 #include <Windows.h>
 // Avoid name collisions
 #undef DrawText