Index: Copy/filecopy.c
===================================================================
--- Copy/filecopy.c.orig
+++ Copy/filecopy.c
@@ -3,7 +3,7 @@
  */
 
 #undef I_POLL
-#include <Files.h>
+#include <CoreServices/CoreServices.h>
 #include "common/util.c"
 
 #ifndef kPOSIXErrorBase
Index: common/util.c
===================================================================
--- common/util.c.orig
+++ common/util.c
@@ -7,7 +7,7 @@
 
 #include <sys/param.h>
 #undef I_POLL
-#include <Files.h>
+#include <CoreServices/CoreServices.h>
 
 #ifdef _INC_PERL_XSUB_H
 static int
Index: common/macdate.c
===================================================================
--- common/macdate.c.orig
+++ common/macdate.c
@@ -2,7 +2,7 @@
  * $Id: macdate.c,v 0.70 2005/08/09 15:47:00 dankogai Exp $
  */
 
-#include <DateTimeUtils.h>
+#include <CoreServices/CoreServices.h>
 # include <math.h>
 
 #define EPOCH_DELTA 2082844800
Index: Catalog/Catalog.xs
===================================================================
--- Catalog/Catalog.xs.orig
+++ Catalog/Catalog.xs
@@ -15,7 +15,7 @@ not_here(char *s)
 
 #include "common/util.c"
 #include "common/macdate.c"
-#include <Finder.h>
+#include <CoreServices/CoreServices.h>
 
 static SV *
 xs_getcatalog(char *path){
Index: Info/Info.xs
===================================================================
--- Info/Info.xs.orig
+++ Info/Info.xs
@@ -15,7 +15,7 @@ not_here(char *s)
 
 #include "common/util.c"
 #include "common/macdate.c"
-#include <Finder.h>
+#include <CoreServices/CoreServices.h>
 
 /* #define CATALOGINFONEEDED kFSCatInfoGettableInfo */
 #define CATALOGINFONEEDED (kFSCatInfoNodeFlags|kFSCatInfoCreateDate|kFSCatInfoContentMod|kFSCatInfoFinderInfo)
Index: Spec/Spec.xs
===================================================================
--- Spec/Spec.xs.orig
+++ Spec/Spec.xs
@@ -10,7 +10,7 @@ not_here(char *s)
 }
 
 #undef I_POLL
-#include <Finder.h>
+#include <CoreServices/CoreServices.h>
 #include "common/util.c"
 
 #define ClassName "MacOSX::File::Spec"