--- ./libtool.c.orig	2005-10-31 10:04:33.000000000 -0800
+++ ./libtool.c	2005-10-31 10:04:34.000000000 -0800
@@ -47,12 +47,10 @@
 #include "stuff/execute.h"
 #include "stuff/version_number.h"
 
-#include "make.h"
 #include <mach/mach_init.h>
 #if defined(__OPENSTEP__) || defined(__GONZO_BUNSEN_BEAKER__)
 #include <servers/netname.h>
 #else
-#include <servers/bootstrap.h>
 #endif
 
 /* used by error routines as the name of the program */
@@ -2284,6 +2282,7 @@
 char *arch_name,
 char *fileName)
 {
+#ifdef OLD_PROJECTBUILDER_INTERFACE
     char message_buf[1024];
     mach_port_t ProjectBuilder_port;
     char *portName;
@@ -2319,6 +2318,7 @@
 	    NULL, 0,
 	    0,
 	    message_buf, strlen(message_buf) + 1);
+#endif
 }
 
 /*