diff --git a/make/tail.mk b/make/tail.mk
index 565bacf..fa6fd26 100644
--- a/make/tail.mk
+++ b/make/tail.mk
@@ -11,6 +11,9 @@ BUILDTARGET=$(DISKIMAGE)
 EXECTARGET=executeGUI
 DISKIMAGEDEST=.
 AUXTYPE=
+CFLAGS+=-i$(GENDIR)
+
+vpath $(GENDIR)
 
 ifeq ($(TARGETTYPE),shell)
     FILETYPE=exe
@@ -46,7 +49,7 @@ else ifeq ($(TARGETTYPE),xcmd)
 endif
 
 
-ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS))))
+ASM_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))))
 
 ifeq ($(ASSEMBLER),orcam)
     ASM_MACROS=$(patsubst %.s, $(OBJDIR)/%.macros, $(ASM_SRCS))
@@ -59,12 +62,12 @@ ifeq ($(ASSEMBLER),orcam)
     endif
 
     C_ROOTS=$(patsubst %.c, $(OBJDIR)/%.root, $(ROOTCFILE))
-    C_SRCS+=$(filter-out $(ROOTCFILE), $(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS)))))
+    C_SRCS+=$(filter-out $(ROOTCFILE), $(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS))))))
     C_OBJS=$(patsubst %.c, $(OBJDIR)/%.a, $(C_SRCS))
     C_DEPS=$(patsubst %.c, $(OBJDIR)/%.d, $(ROOTCFILE)) $(patsubst %.c, $(OBJDIR)/%.d, $(C_SRCS))
 endif
 
-REZ_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.rez, $(SRCDIRS))))
+REZ_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.rez, $(SRCDIRS)))))
 REZ_DEPS=$(patsubst %.rez, $(OBJDIR)/%.rez.d, $(REZ_SRCS))
 REZ_OBJS=$(patsubst %.rez, $(OBJDIR)/%.r, $(REZ_SRCS))
 
@@ -186,18 +189,33 @@ executeShell: all
 $(OBJDIR)/%.a:	%.c
 	$(COMPILE) $< $(@:.a=) $(CFLAGS) --noroot
 
+$(OBJDIR)/%.a:    $(GENDIR)/%.c
+	$(COMPILE) $< $(@:.a=) $(CFLAGS) --noroot
+
 $(OBJDIR)/%.root:	%.c
 	$(COMPILE) $< $(@:.root=) $(CFLAGS)
 
+$(OBJDIR)/%.root:    $(GENDIR)/%.c
+	$(COMPILE) $< $(@:.root=) $(CFLAGS)
+
 $(OBJDIR)/%.ROOT:	%.s
 	MACGENFLAGS="$(MACGENFLAGS)" MACGENMACROS="$(MACGENMACROS)" $(ASSEMBLE) $< $(@:.ROOT=) $(ASMFLAGS)
 
+$(OBJDIR)/%.ROOT:    $(GENDIR)/%.s
+	MACGENFLAGS="$(MACGENFLAGS)" MACGENMACROS="$(MACGENMACROS)" $(ASSEMBLE) $< $(@:.ROOT=) $(ASMFLAGS)
+
 $(OBJDIR)/%.r:	%.rez
 	$(REZ) $< $(@:.r=) $(REZFLAGS)
 ifneq ($(RLINT_PATH),)
 	$(ORCA) $(RLINT_PATH) $@
 endif
 
+$(OBJDIR)/%.r:    $(GENDIR)/%.rez
+	$(REZ) $< $(@:.r=) $(REZFLAGS)
+ifneq ($(RLINT_PATH),)
+	$(ORCA) $(RLINT_PATH) $@
+endif
+
 $(OBJS): Makefile
 
 # Include the C and rez dependencies which were generated from the last build
diff --git a/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist
index 133d13e..04d3278 100644
--- a/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/TemplateInfo.plist	
@@ -189,7 +189,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist
index 9e2f590..6fe1e28 100644
--- a/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/TemplateInfo.plist	
@@ -195,7 +195,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist
index 6982eb2..9dd0fb0 100644
--- a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/TemplateInfo.plist	
@@ -213,7 +213,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist
index 12a4311..19a25a2 100644
--- a/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/TemplateInfo.plist	
@@ -195,7 +195,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist
index a7f10aa..7b97bbb 100644
--- a/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist	
@@ -191,7 +191,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist
index 456e6f0..05961a2 100644
--- a/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist	
@@ -203,7 +203,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist
index 7bf40c4..0dc9bc3 100644
--- a/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist	
@@ -233,7 +233,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist
index 5285f2a..0faf976 100644
--- a/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist	
@@ -146,7 +146,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist
index cecfebc..9bf27a1 100644
--- a/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist	
@@ -203,7 +203,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist
index 1738419..ede6de3 100644
--- a/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist	
@@ -146,7 +146,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist
index 0e3a5ea..0e7238e 100644
--- a/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist	
@@ -191,7 +191,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/TemplateInfo.plist
index 9427d5a..871595a 100644
--- a/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/TemplateInfo.plist	
@@ -197,7 +197,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/TemplateInfo.plist
index fc484a9..b07af23 100644
--- a/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/TemplateInfo.plist	
@@ -215,7 +215,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/TemplateInfo.plist
index 93535f7..6df17ad 100644
--- a/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/TemplateInfo.plist	
@@ -197,7 +197,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>
diff --git a/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist
index 97ac661..821dd6c 100644
--- a/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist	
+++ b/pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist	
@@ -146,7 +146,8 @@
                                         extended=double
                                         pascal=""</string>
                                 <key>HEADER_SEARCH_PATHS</key>
-                                <string>$GOLDEN_GATE/Libraries/ORCACDefs
+                                <string>$TEMP_ROOT/___PACKAGENAME___.build/$CONFIGURATION/___PACKAGENAME___.build/DerivedSources
+                                        $GOLDEN_GATE/Libraries/ORCACDefs
                                         ~/Library/GoldenGate/Libraries/ORCACDefs
                                         /Library/GoldenGate/Libraries/ORCACDefs
                                         ~/GoldenGate/Libraries/ORCACDefs</string>