Index: src/pmc/addrregistry.pmc
===================================================================
--- src/pmc/addrregistry.pmc.orig	2009-03-12 21:48:25.000000000 +0100
+++ src/pmc/addrregistry.pmc	2009-03-15 21:40:29.968750000 +0100
@@ -25,8 +25,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 /* included manually to prevent breaking C++ builds -- see RT #56534 */
 #include "parrot/hash.h"
 #include "pmc_hash.h"
Index: src/pmc/array.pmc
===================================================================
--- src/pmc/array.pmc.orig	2009-03-09 01:03:18.000000000 +0100
+++ src/pmc/array.pmc	2009-03-15 21:38:03.375000000 +0100
@@ -18,8 +18,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 /*
 
 =item C<static PMC *undef(PARROT_INTERP)>
Index: src/pmc/bigint.pmc
===================================================================
--- src/pmc/bigint.pmc.orig	2009-03-09 01:03:17.000000000 +0100
+++ src/pmc/bigint.pmc	2009-03-15 21:38:03.406250000 +0100
@@ -22,8 +22,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 /* TODO split that out into a separate file */
 
 #ifdef S_SPLINT_S
Index: src/pmc/bignum.pmc
===================================================================
--- src/pmc/bignum.pmc.orig	2009-03-15 21:18:54.000000000 +0100
+++ src/pmc/bignum.pmc	2009-03-15 21:38:03.421875000 +0100
@@ -131,8 +131,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 #ifdef S_SPLINT_S
 #  undef PARROT_HAS_GMP /* splint barfs on the gmp.h header */
 #endif /* S_SPLINT_S */
Index: src/pmc/boolean.pmc
===================================================================
--- src/pmc/boolean.pmc.orig	2009-03-09 01:03:19.000000000 +0100
+++ src/pmc/boolean.pmc	2009-03-15 21:38:03.500000000 +0100
@@ -21,8 +21,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass Boolean extends Integer provides boolean provides scalar {
 
 /*
Index: src/pmc/bound_nci.pmc
===================================================================
--- src/pmc/bound_nci.pmc.orig	2009-03-09 01:03:16.000000000 +0100
+++ src/pmc/bound_nci.pmc	2009-03-15 21:38:03.531250000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass Bound_NCI extends NCI need_ext {
 
 /*
Index: src/pmc/callsignature.pmc
===================================================================
--- src/pmc/callsignature.pmc.orig	2009-02-18 00:00:43.000000000 +0100
+++ src/pmc/callsignature.pmc	2009-03-15 21:38:03.546875000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 #define CAPTURE_DATA_SIZE   2
 #define CAPTURE_array_CREATE(i, obj) \
     if (!PARROT_CAPTURE(obj)->array) \
Index: src/pmc/capture.pmc
===================================================================
--- src/pmc/capture.pmc.orig	2009-02-18 00:00:43.000000000 +0100
+++ src/pmc/capture.pmc	2009-03-15 21:38:03.562500000 +0100
@@ -18,8 +18,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 
 #define CAPTURE_DATA_SIZE   2
 #define CAPTURE_array_CREATE(i, obj) \
Index: src/pmc/codestring.pmc
===================================================================
--- src/pmc/codestring.pmc.orig	2009-03-05 20:30:07.000000000 +0100
+++ src/pmc/codestring.pmc	2009-03-15 21:38:03.609375000 +0100
@@ -30,8 +30,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass CodeString extends String provides string {
 
 /*
Index: src/pmc/complex.pmc
===================================================================
--- src/pmc/complex.pmc.orig	2009-03-09 01:03:14.000000000 +0100
+++ src/pmc/complex.pmc	2009-03-15 21:38:03.625000000 +0100
@@ -22,8 +22,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 /*
 
 =item C<static void
Index: src/pmc/cpointer.pmc
===================================================================
--- src/pmc/cpointer.pmc.orig	2009-03-05 20:30:06.000000000 +0100
+++ src/pmc/cpointer.pmc	2009-03-15 21:38:03.656250000 +0100
@@ -46,8 +46,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass CPointer need_ext {
     ATTR void   *pointer; /* The stored pointer. */
     ATTR STRING *sig;     /* A string signature for the pointer. */
Index: src/pmc/default.pmc
===================================================================
--- src/pmc/default.pmc.orig	2009-03-09 01:03:19.000000000 +0100
+++ src/pmc/default.pmc	2009-03-15 21:38:03.671875000 +0100
@@ -21,8 +21,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 #define INT2KEY(i, k) key_new_integer((i), (k))
 
 /* undef 'interface' to keep MSVC happy */
Index: src/pmc/env.pmc
===================================================================
--- src/pmc/env.pmc.orig	2009-03-09 01:03:16.000000000 +0100
+++ src/pmc/env.pmc	2009-03-15 21:38:03.671875000 +0100
@@ -18,8 +18,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 /* array of environment variables,
    speced in POSIX.1, but not in ISO-C
    MS C compilers know about environ, as it is declared in stdlib.h.
Index: src/pmc/eventhandler.pmc
===================================================================
--- src/pmc/eventhandler.pmc.orig	2009-03-05 20:30:06.000000000 +0100
+++ src/pmc/eventhandler.pmc	2009-03-15 21:38:03.703125000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass EventHandler extends Sub need_ext {
 
     ATTR STRING *type;          /* the type of the event to handle */
Index: src/pmc/exporter.pmc
===================================================================
--- src/pmc/exporter.pmc.orig	2009-03-09 01:03:15.000000000 +0100
+++ src/pmc/exporter.pmc	2009-03-15 21:38:03.734375000 +0100
@@ -78,8 +78,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 /*
 
 =back
Index: src/pmc/file.pmc
===================================================================
--- src/pmc/file.pmc.orig	2009-03-09 01:03:19.000000000 +0100
+++ src/pmc/file.pmc	2009-03-15 21:38:03.781250000 +0100
@@ -22,8 +22,6 @@
 #  include <direct.h>
 #endif
 
-#include "parrot/parrot.h"
-
 /* RT#46681 apparently, strerror_r is thread-safe and should be used instead.*/
 
 static PMC *File_PMC;
Index: src/pmc/fixedbooleanarray.pmc
===================================================================
--- src/pmc/fixedbooleanarray.pmc.orig	2009-03-09 01:03:19.000000000 +0100
+++ src/pmc/fixedbooleanarray.pmc	2009-03-15 21:38:03.796875000 +0100
@@ -21,8 +21,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 #define BITS_PER_CHAR 8
 
 pmclass FixedBooleanArray need_ext provides array {
Index: src/pmc/fixedfloatarray.pmc
===================================================================
--- src/pmc/fixedfloatarray.pmc.orig	2009-03-09 01:03:16.000000000 +0100
+++ src/pmc/fixedfloatarray.pmc	2009-03-15 21:38:03.812500000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass FixedFloatArray need_ext provides array {
     ATTR INTVAL    size;
     ATTR FLOATVAL *float_array;
Index: src/pmc/fixedintegerarray.pmc
===================================================================
--- src/pmc/fixedintegerarray.pmc.orig	2009-03-09 01:03:18.000000000 +0100
+++ src/pmc/fixedintegerarray.pmc	2009-03-15 21:38:03.828125000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass FixedIntegerArray need_ext provides array {
     ATTR INTVAL   size;  /* number of INTVALs stored in this array */
     ATTR INTVAL * int_array; /* INTVALs are stored here */
Index: src/pmc/fixedpmcarray.pmc
===================================================================
--- src/pmc/fixedpmcarray.pmc.orig	2009-03-12 21:48:44.000000000 +0100
+++ src/pmc/fixedpmcarray.pmc	2009-03-15 21:38:03.828125000 +0100
@@ -24,8 +24,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 #define PMC_size(x)  ((Parrot_FixedPMCArray_attributes *)PMC_data(x))->size
 #define PMC_array(x) ((Parrot_FixedPMCArray_attributes *)PMC_data(x))->pmc_array
 
Index: src/pmc/fixedstringarray.pmc
===================================================================
--- src/pmc/fixedstringarray.pmc.orig	2009-03-09 01:03:19.000000000 +0100
+++ src/pmc/fixedstringarray.pmc	2009-03-15 21:38:03.843750000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass FixedStringArray need_ext provides array {
     ATTR STRING **str_array; /* where the STRINGs are stored */
     ATTR UINTVAL  size;      /* element count */
Index: src/pmc/float.pmc
===================================================================
--- src/pmc/float.pmc.orig	2009-03-09 01:03:18.000000000 +0100
+++ src/pmc/float.pmc	2009-03-15 21:38:03.859375000 +0100
@@ -18,8 +18,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass Float extends scalar provides float provides scalar {
     ATTR FLOATVAL fv;
 
Index: src/pmc/integer.pmc
===================================================================
--- src/pmc/integer.pmc.orig	2009-03-15 08:58:31.000000000 +0100
+++ src/pmc/integer.pmc	2009-03-15 21:38:03.875000000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 #include "pmc_bigint.h"
 
 static void
Index: src/pmc/iterator.pmc
===================================================================
--- src/pmc/iterator.pmc.orig	2009-03-15 08:58:30.000000000 +0100
+++ src/pmc/iterator.pmc	2009-03-15 21:38:03.890625000 +0100
@@ -61,8 +61,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass Iterator no_ro {
     ATTR PMC *aggregate; /* the aggregate which this Iterator iterates */
     ATTR PMC *key;       /* the Key used by this Iterator */
Index: src/pmc/key.pmc
===================================================================
--- src/pmc/key.pmc.orig	2009-03-09 01:03:19.000000000 +0100
+++ src/pmc/key.pmc	2009-03-15 21:38:03.890625000 +0100
@@ -18,8 +18,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass Key need_ext {
     ATTR PMC      *next_key; /* Sometimes it's the next key, sometimes it's
                                 not.  The Key code is like that. */
Index: src/pmc/lexinfo.pmc
===================================================================
--- src/pmc/lexinfo.pmc.orig	2009-03-15 08:58:30.000000000 +0100
+++ src/pmc/lexinfo.pmc	2009-03-15 21:38:03.906250000 +0100
@@ -18,8 +18,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 /* included manually to prevent breaking C++ builds -- see RT #56534*/
 #include "pmc_hash.h"
 
Index: src/pmc/lexpad.pmc
===================================================================
--- src/pmc/lexpad.pmc.orig	2009-03-09 01:03:19.000000000 +0100
+++ src/pmc/lexpad.pmc	2009-03-15 21:38:03.906250000 +0100
@@ -18,8 +18,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 /*
  * LexPad provides a Hash interface for lexical fetch/store
  * needed
Index: src/pmc/managedstruct.pmc
===================================================================
--- src/pmc/managedstruct.pmc.orig	2009-03-09 01:03:18.000000000 +0100
+++ src/pmc/managedstruct.pmc	2009-03-15 21:38:03.921875000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 
 pmclass ManagedStruct extends UnManagedStruct need_ext {
 
Index: src/pmc/multisub.pmc
===================================================================
--- src/pmc/multisub.pmc.orig	2009-03-09 01:03:16.000000000 +0100
+++ src/pmc/multisub.pmc	2009-03-15 21:38:04.000000000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 
 pmclass MultiSub extends ResizablePMCArray need_ext provides array {
 
Index: src/pmc/nci.pmc
===================================================================
--- src/pmc/nci.pmc.orig	2009-03-15 08:58:30.000000000 +0100
+++ src/pmc/nci.pmc	2009-03-15 21:38:04.015625000 +0100
@@ -18,8 +18,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 typedef INTVAL (*nci_sub_t)(PARROT_INTERP, PMC *);
 typedef INTVAL (*nci_jit_sub_t)(PARROT_INTERP, PMC *, char *);
 
Index: src/pmc/null.pmc
===================================================================
--- src/pmc/null.pmc.orig	2009-03-09 01:03:15.000000000 +0100
+++ src/pmc/null.pmc	2009-03-15 21:38:04.031250000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass Null singleton {
 
 /*
Index: src/pmc/orderedhash.pmc
===================================================================
--- src/pmc/orderedhash.pmc.orig	2009-03-09 01:03:19.000000000 +0100
+++ src/pmc/orderedhash.pmc	2009-03-15 21:38:04.156250000 +0100
@@ -39,8 +39,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass OrderedHash extends Hash need_ext provides array provides hash {
 
 /*
Index: src/pmc/os.pmc
===================================================================
--- src/pmc/os.pmc.orig	2009-03-09 01:03:16.000000000 +0100
+++ src/pmc/os.pmc	2009-03-15 21:38:04.171875000 +0100
@@ -29,8 +29,6 @@
 #  include <dirent.h>
 #endif
 
-#include "parrot/parrot.h"
-
 /* XXX Check if we need to deallocate strerror strings */
 /* XXX apparently, strerror_r is thread-safe and should be used instead.*/
 
Index: src/pmc/packfileannotation.pmc
===================================================================
--- src/pmc/packfileannotation.pmc.orig	2009-03-15 21:30:36.000000000 +0100
+++ src/pmc/packfileannotation.pmc	2009-03-15 21:38:04.203125000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass PackfileAnnotation {
 
 
Index: src/pmc/packfileannotationkeys.pmc
===================================================================
--- src/pmc/packfileannotationkeys.pmc.orig	2009-02-18 00:00:43.000000000 +0100
+++ src/pmc/packfileannotationkeys.pmc	2009-03-15 21:38:04.218750000 +0100
@@ -24,8 +24,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass PackfileAnnotationKeys {
 
 /*
Index: src/pmc/packfileannotations.pmc
===================================================================
--- src/pmc/packfileannotations.pmc.orig	2009-02-18 00:00:43.000000000 +0100
+++ src/pmc/packfileannotations.pmc	2009-03-15 21:38:04.250000000 +0100
@@ -25,8 +25,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass PackfileAnnotations extends PackfileSegment {
 
 
Index: src/pmc/packfileconstanttable.pmc
===================================================================
--- src/pmc/packfileconstanttable.pmc.orig	2009-02-18 00:00:43.000000000 +0100
+++ src/pmc/packfileconstanttable.pmc	2009-03-15 21:38:04.281250000 +0100
@@ -24,8 +24,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 static PackFile_Constant *
 getconst(PARROT_INTERP, PackFile_ConstTable *table, int index, int type)
 {
Index: src/pmc/packfiledirectory.pmc
===================================================================
--- src/pmc/packfiledirectory.pmc.orig	2009-03-05 20:30:07.000000000 +0100
+++ src/pmc/packfiledirectory.pmc	2009-03-15 21:38:04.296875000 +0100
@@ -25,8 +25,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass PackfileDirectory extends PackfileSegment {
 
 
Index: src/pmc/packfilefixupentry.pmc
===================================================================
--- src/pmc/packfilefixupentry.pmc.orig	2009-02-18 00:00:43.000000000 +0100
+++ src/pmc/packfilefixupentry.pmc	2009-03-15 21:38:04.296875000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass PackfileFixupEntry {
 
 /*
Index: src/pmc/packfilefixuptable.pmc
===================================================================
--- src/pmc/packfilefixuptable.pmc.orig	2009-02-18 00:00:43.000000000 +0100
+++ src/pmc/packfilefixuptable.pmc	2009-03-15 21:38:04.328125000 +0100
@@ -24,8 +24,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass PackfileFixupTable extends PackfileSegment {
 
 
Index: src/pmc/packfilerawsegment.pmc
===================================================================
--- src/pmc/packfilerawsegment.pmc.orig	2009-02-18 00:00:43.000000000 +0100
+++ src/pmc/packfilerawsegment.pmc	2009-03-15 21:38:04.359375000 +0100
@@ -24,8 +24,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass PackfileRawSegment extends PackfileSegment {
 
 
Index: src/pmc/packfilesegment.pmc
===================================================================
--- src/pmc/packfilesegment.pmc.orig	2009-03-05 20:30:06.000000000 +0100
+++ src/pmc/packfilesegment.pmc	2009-03-15 21:38:04.406250000 +0100
@@ -23,8 +23,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass PackfileSegment {
 
 
Index: src/pmc/parrotlibrary.pmc
===================================================================
--- src/pmc/parrotlibrary.pmc.orig	2009-03-09 01:03:18.000000000 +0100
+++ src/pmc/parrotlibrary.pmc	2009-03-15 21:38:04.468750000 +0100
@@ -28,8 +28,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 #define PMC_dlhandle(x) ((Parrot_ParrotLibrary_attributes*)PMC_data(x))->dl_handle
 #define PMC_oplib_init(x) ((Parrot_ParrotLibrary_attributes*)PMC_data(x))->oplib_init
 
Index: src/pmc/pccmethod_test.pmc
===================================================================
--- src/pmc/pccmethod_test.pmc.orig	2009-02-18 00:00:43.000000000 +0100
+++ src/pmc/pccmethod_test.pmc	2009-03-15 21:38:04.578125000 +0100
@@ -10,8 +10,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass PCCMETHOD_Test need_ext provides hash {
 
 
Index: src/pmc/pointer.pmc
===================================================================
--- src/pmc/pointer.pmc.orig	2009-03-09 01:03:15.000000000 +0100
+++ src/pmc/pointer.pmc	2009-03-15 21:38:04.640625000 +0100
@@ -20,8 +20,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass Pointer need_ext {
 
 /*
Index: src/pmc/random.pmc
===================================================================
--- src/pmc/random.pmc.orig	2009-03-09 01:03:17.000000000 +0100
+++ src/pmc/random.pmc	2009-03-15 21:38:04.687500000 +0100
@@ -20,8 +20,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 static PMC *Rand_PMC;
 
 pmclass Random singleton {
Index: src/pmc/ref.pmc
===================================================================
--- src/pmc/ref.pmc.orig	2009-03-09 01:03:17.000000000 +0100
+++ src/pmc/ref.pmc	2009-03-15 21:38:04.703125000 +0100
@@ -21,8 +21,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass Ref provides ref {
 
 /*
Index: src/pmc/resizablebooleanarray.pmc
===================================================================
--- src/pmc/resizablebooleanarray.pmc.orig	2009-03-09 01:03:18.000000000 +0100
+++ src/pmc/resizablebooleanarray.pmc	2009-03-15 21:38:04.734375000 +0100
@@ -20,8 +20,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 
 #define BITS_PER_CHAR 8
 /* MIN_ALLOC is 8 * BITS_PER_CHAR */
Index: src/pmc/resizablefloatarray.pmc
===================================================================
--- src/pmc/resizablefloatarray.pmc.orig	2009-03-09 01:03:16.000000000 +0100
+++ src/pmc/resizablefloatarray.pmc	2009-03-15 21:38:04.750000000 +0100
@@ -20,8 +20,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass ResizableFloatArray extends FixedFloatArray need_ext provides array {
     ATTR INTVAL resize_threshold; /* max size before array needs resizing */
 
Index: src/pmc/resizableintegerarray.pmc
===================================================================
--- src/pmc/resizableintegerarray.pmc.orig	2009-03-09 01:03:16.000000000 +0100
+++ src/pmc/resizableintegerarray.pmc	2009-03-15 21:38:04.765625000 +0100
@@ -20,8 +20,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 
 pmclass ResizableIntegerArray extends FixedIntegerArray need_ext provides array {
     ATTR INTVAL resize_threshold; /* max size before array needs to be resized */
Index: src/pmc/resizablepmcarray.pmc
===================================================================
--- src/pmc/resizablepmcarray.pmc.orig	2009-03-12 21:48:25.000000000 +0100
+++ src/pmc/resizablepmcarray.pmc	2009-03-15 21:38:04.781250000 +0100
@@ -19,8 +19,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 #define PMC_size(x)      ((Parrot_ResizablePMCArray_attributes *)PMC_data(x))->size
 #define PMC_array(x)     ((Parrot_ResizablePMCArray_attributes *)PMC_data(x))->pmc_array
 #define PMC_threshold(x) ((Parrot_ResizablePMCArray_attributes *)PMC_data(x))->resize_threshold
Index: src/pmc/resizablestringarray.pmc
===================================================================
--- src/pmc/resizablestringarray.pmc.orig	2009-03-09 01:03:17.000000000 +0100
+++ src/pmc/resizablestringarray.pmc	2009-03-15 21:38:04.781250000 +0100
@@ -18,8 +18,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass ResizableStringArray extends FixedStringArray need_ext provides array {
     ATTR UINTVAL resize_threshold; /*max capacity before resizing */
 
Index: src/pmc/sharedref.pmc
===================================================================
--- src/pmc/sharedref.pmc.orig	2009-03-09 01:03:16.000000000 +0100
+++ src/pmc/sharedref.pmc	2009-03-15 21:38:04.843750000 +0100
@@ -26,8 +26,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 /*
  * TODO we should catch exceptions around these locks
  *      if the vtable meth throws the lock is never unlocked
Index: src/pmc/slice.pmc
===================================================================
--- src/pmc/slice.pmc.orig	2009-03-09 01:03:19.000000000 +0100
+++ src/pmc/slice.pmc	2009-03-15 21:38:04.890625000 +0100
@@ -37,8 +37,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 #define VALID_RANGE(r) ((r) && ((INTVAL)(r) != -1))
 #define RVal_int(u) (u).i
 #define RVal_str(u) (u).s
Index: src/pmc/string.pmc
===================================================================
--- src/pmc/string.pmc.orig	2009-03-15 08:58:30.000000000 +0100
+++ src/pmc/string.pmc	2009-03-15 21:38:04.890625000 +0100
@@ -20,8 +20,6 @@
 
 */
 
-#include "parrot/parrot.h"
-
 pmclass String extends scalar provides string provides scalar {
     ATTR STRING * str_val;