diff --git a/fsck_hfs.tproj/dfalib/CatalogCheck.c b/fsck_hfs.tproj/dfalib/CatalogCheck.c
index 96068d6..eb8257c 100644
--- a/fsck_hfs.tproj/dfalib/CatalogCheck.c
+++ b/fsck_hfs.tproj/dfalib/CatalogCheck.c
@@ -23,6 +23,7 @@
 #include "Scavenger.h"
 #include "DecompDataEnums.h"
 #include "DecompData.h"
+#include <sys/types.h>
 
 /*
  * information collected when visiting catalog records
diff --git a/fsck_hfs.tproj/dfalib/SRepair.c b/fsck_hfs.tproj/dfalib/SRepair.c
index 39b7d6c..afd9404 100644
--- a/fsck_hfs.tproj/dfalib/SRepair.c
+++ b/fsck_hfs.tproj/dfalib/SRepair.c
@@ -35,6 +35,7 @@
 #include "Scavenger.h"
 #include <unistd.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <stdlib.h>
 #include "../cache.h"
 
diff --git a/fsck_hfs.tproj/dfalib/Scavenger.h b/fsck_hfs.tproj/dfalib/Scavenger.h
index 31706dd..41e72a6 100644
--- a/fsck_hfs.tproj/dfalib/Scavenger.h
+++ b/fsck_hfs.tproj/dfalib/Scavenger.h
@@ -44,7 +44,7 @@
 #include <sys/kauth.h>
 #include <sys/syslimits.h>
 #endif
-#include <sys/errno.h>
+#include <errno.h>
 
 #ifdef __cplusplus
 extern	"C" {
diff --git a/fsck_hfs.tproj/fsck_hfs.h b/fsck_hfs.tproj/fsck_hfs.h
index c6e772a..49d8ee3 100644
--- a/fsck_hfs.tproj/fsck_hfs.h
+++ b/fsck_hfs.tproj/fsck_hfs.h
@@ -24,6 +24,9 @@
 
 #include "cache.h"
 
+#ifndef __P
+#define __P(args)       args
+#endif
 
 const extern char	*cdevname;		/* name of device being checked */
 extern char	*progname;
diff --git a/newfs_hfs.tproj/makehfs.c b/newfs_hfs.tproj/makehfs.c
index b0371a2..5dfc8eb 100644
--- a/newfs_hfs.tproj/makehfs.c
+++ b/newfs_hfs.tproj/makehfs.c
@@ -35,7 +35,6 @@
 #include <time.h>
 #include "missing.h"
 #endif
-#include <sys/errno.h>
 #include <sys/stat.h>
 #if !LINUX
 #include <sys/sysctl.h>
@@ -69,6 +68,9 @@ extern Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *b
 #include "newfs_hfs.h"
 #include "readme.h"
 
+#ifndef __P
+#define __P(args)       args
+#endif
 
 #define HFS_BOOT_DATA	"/usr/share/hfsprogs/hfsbootdata"
 
diff --git a/newfs_hfs.tproj/newfs_hfs.c b/newfs_hfs.tproj/newfs_hfs.c
index 1bcc044..ac703df 100644
--- a/newfs_hfs.tproj/newfs_hfs.c
+++ b/newfs_hfs.tproj/newfs_hfs.c
@@ -54,6 +54,9 @@
 #else
 #include <varargs.h>
 #endif
+#ifndef __P
+#define __P(args)       args
+#endif
 
 #define	NOVAL       (-1)
 #define UMASK       (0755)