diff --git a/programs/bcc32/Makefile_app b/programs/bcc32/Makefile_app
new file mode 100755
index 0000000000..d14367272e
--- /dev/null
+++ b/programs/bcc32/Makefile_app
@@ -0,0 +1,12 @@
+program: kos_make
+	wine $(KOS32_BCC)/kos32-bcc -S -v- -R- -6 -a4 -O2 -Og -Oi -Ov -OS -k- -D__KOLIBRI__ -I$(INCLUDE) $(FILENAME).cpp
+	echo 'include "kos_make.inc"' > f_$(FILENAME).asm
+	$(T2FASM)/t2fasm < $(FILENAME).asm >> f_$(FILENAME).asm
+	fasm f_$(FILENAME).asm $(FILENAME).kex
+	
+	rm f_$(FILENAME).asm
+	rm $(FILENAME).asm
+	rm kos_make.inc
+
+kos_make:
+	echo 'STACKSIZE equ 102400 \n HEAPSIZE equ 102400 \n include "$(SVN_PROGR)/proc32.inc" \ninclude "$(INCLUDE)/kos_start.inc" \n include "$(INCLUDE)/kos_func.inc" \n include "$(INCLUDE)/kos_heap.inc"' > kos_make.inc
diff --git a/programs/bcc32/examples/window/Makefile b/programs/bcc32/examples/window/Makefile
index 7ac3ad34cb..d9776f3be2 100755
--- a/programs/bcc32/examples/window/Makefile
+++ b/programs/bcc32/examples/window/Makefile
@@ -1,23 +1,19 @@
-SVN_PROGR:=../../../
+# Path to /programs
+SVN_PROGR:=../../..
+
+# Path to /programs/bcc32
 SVN_BCC32:=$(SVN_PROGR)/bcc32
+
+# Path to t2fasm
 T2FASM:=$(SVN_BCC32)/t2fasm
+
+# Path to include
 INCLUDE:=$(SVN_BCC32)/include
 
 # Path to Bin folder
 KOS32_BCC:=/home/autobuild/borlandcpp/bin
 
-# Filename
-FN:=hello
+# Filename without .cpp
+FILENAME:=hello
 
-hello_world: kos_make
-	wine $(KOS32_BCC)/kos32-bcc -S -v- -R- -6 -a4 -O2 -Og -Oi -Ov -OS -k- -D__KOLIBRI__ -I$(INCLUDE) $(FN).cpp
-	echo 'include "kos_make.inc"' > f_$(FN).asm
-	$(T2FASM)/t2fasm < $(FN).asm >> f_$(FN).asm
-	fasm f_$(FN).asm $(FN).kex
-	
-	rm f_$(FN).asm
-	rm $(FN).asm
-	rm kos_make.inc
-
-kos_make:
-	echo 'STACKSIZE equ 102400 \n HEAPSIZE equ 102400 \n include "$(SVN_PROGR)/proc32.inc" \ninclude "$(INCLUDE)/kos_start.inc" \n include "$(INCLUDE)/kos_func.inc" \n include "$(INCLUDE)/kos_heap.inc"' > kos_make.inc
+include $(SVN_BCC32)/Makefile_app