Index: config/gen/makefiles/root.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v
retrieving revision 1.112
diff -u -r1.112 root.in
--- config/gen/makefiles/root.in	16 Aug 2003 17:44:19 -0000	1.112
+++ config/gen/makefiles/root.in	20 Aug 2003 12:13:01 -0000
@@ -20,7 +20,7 @@
 LD_OUT = ${ld_out}
 LD_SHARED_FLAGS=${ld_shared_flags}
 
-INC=include/parrot
+INC=./${inc}
 
 
 ###############################################################################
@@ -84,24 +84,7 @@
 #
 ###############################################################################
 
-GENERAL_H_FILES = $(INC)/config.h $(INC)/exceptions.h $(INC)/io.h $(INC)/op.h \
-	$(INC)/register.h $(INC)/string.h $(INC)/events.h \
-	$(INC)/interpreter.h $(INC)/memory.h $(INC)/parrot.h $(INC)/stacks.h \
-	$(INC)/packfile.h $(INC)/global_setup.h $(INC)/vtable.h \
-	$(INC)/oplib/core_ops.h $(INC)/oplib/core_ops_prederef.h \
-	$(INC)/oplib/core_ops_switch.h  $(INC)/enums.h \
-	$(INC)/runops_cores.h $(INC)/trace.h $(INC)/pmc.h $(INC)/key.h \
-	$(INC)/hash.h $(INC)/resources.h $(INC)/core_pmcs.h \
-	$(INC)/platform.h ${cg_h} $(INC)/interp_guts.h $(INC)/rx.h \
-	$(INC)/rxstacks.h $(INC)/intlist.h $(INC)/embed.h $(INC)/warnings.h \
-	$(INC)/misc.h $(INC)/pmc.h $(INC)/key.h $(INC)/hash.h \
-	$(INC)/smallobject.h $(INC)/headers.h $(INC)/dod.h \
-	$(INC)/method_util.h $(INC)/list.h $(INC)/datatypes.h \
-	$(INC)/regfuncs.h $(INC)/string_funcs.h $(INC)/encoding.h \
-	$(INC)/chartype.h $(INC)/oplib.h $(INC)/sub.h $(INC)/unicode.h \
-	$(INC)/perltypes.h $(INC)/exit.h $(INC)/nci.h $(INC)/pobj.h \
-	$(INC)/thread.h $(INC)/tsq.h $(INC)/longopt.h $(INC)/objects.h \
-	$(INC)/dynext.h
+GENERAL_H_FILES = ${general_h_files}
 
 
 
@@ -543,7 +526,7 @@
 
 # If anything in the classes directory is out of date,
 # then run `make` in sub-dir to rebuild only the out of date files.
-$(CLASS_O_FILES) : $(CLASS_PMC_FILES) $(INC)/vtable.h
+$(CLASS_O_FILES) : $(CLASS_PMC_FILES) $(GENERAL_H_FILES)
 	cd classes && $(MAKE) && cd ..
 
 
Index: config/gen/makefiles/classes.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/classes.in,v
retrieving revision 1.8
diff -u -r1.8 classes.in
--- config/gen/makefiles/classes.in	23 May 2003 18:35:01 -0000	1.8
+++ config/gen/makefiles/classes.in	20 Aug 2003 12:13:01 -0000
@@ -1,9 +1,9 @@
 O = ${o}
 RM_F = ${rm_f}
 
-INC=../include/parrot
+INC=../${inc}
 
-H_FILES = $(INC)/parrot.h default.h
+GENERAL_H_FILES = ${general_h_files}
 
 
 O_FILES = ${pmc_o}
Index: MANIFEST
===================================================================
RCS file: /cvs/public/parrot/MANIFEST,v
retrieving revision 1.404
diff -u -r1.404 MANIFEST
--- MANIFEST	17 Aug 2003 20:02:15 -0000	1.404
+++ MANIFEST	20 Aug 2003 12:13:10 -0000
@@ -142,6 +142,7 @@
 config/init/manifest.pl                           []
 config/init/miniparrot.pl                         []
 config/init/optimize.pl                           []
+config/init/headers.pl                            []
 config/inter/exp.pl                               []
 config/inter/ops.pl                               []
 config/inter/pmc.pl                               []
Index: config/inter/pmc.pl
===================================================================
RCS file: /cvs/public/parrot/config/inter/pmc.pl,v
retrieving revision 1.6
diff -u -r1.6 pmc.pl
--- config/inter/pmc.pl	30 May 2003 14:55:19 -0000	1.6
+++ config/inter/pmc.pl	20 Aug 2003 12:13:11 -0000
@@ -75,7 +75,7 @@
       $pmc_build .= "$pmc.c $pmc.h: $parent $pmc.pmc\n";
       $pmc_build .= "\t\$(PMC2C) $pmc.pmc\n";
       $pmc_build .= "\n";
-      $pmc_build .= "$pmc\$(O): \$(H_FILES) $parent_headers $pmc.h\n";
+      $pmc_build .= "$pmc\$(O): \$(GENERAL_H_FILES) $parent_headers $pmc.h\n";
   }
 
   # build list of libraries for link line in Makefile
Index: lib/Parrot/Configure/RunSteps.pm
===================================================================
RCS file: /cvs/public/parrot/lib/Parrot/Configure/RunSteps.pm,v
retrieving revision 1.23
diff -u -r1.23 RunSteps.pm
--- lib/Parrot/Configure/RunSteps.pm	21 Jul 2003 20:16:24 -0000	1.23
+++ lib/Parrot/Configure/RunSteps.pm	20 Aug 2003 12:13:11 -0000
@@ -9,7 +9,8 @@
 	init/data.pl
 	init/miniparrot.pl
 	init/hints.pl
-        init/optimize.pl
+	init/optimize.pl
+	init/headers.pl
 	inter/progs.pl
 	inter/types.pl
 	inter/ops.pl
@@ -39,7 +40,7 @@
 	gen/myconfig.pl
 	gen/platform.pl
 	gen/libparrot_def.pl
-        gen/core_pmcs.pl
+	gen/core_pmcs.pl
 	gen/parrot_include.pl
 );