--- src/bin/ibuild/ibcmds.c.orig	Fri Dec 11 22:33:25 1992
+++ src/bin/ibuild/ibcmds.c	Thu May 27 21:36:47 1999
@@ -86,7 +86,9 @@
 #undef FileChooser
 #define FileChooser _lib_iv(FileChooser)
 
+#if __FreeBSD_cc_version < 400002
 #include <osfcn.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <stream.h>
@@ -2407,9 +2409,9 @@
 	EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
         EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
 
-	Iterator i;
-	for (unidraw->First(i); !unidraw->Done(i); unidraw->Next(i)) {
-	    IBEditor* iEd = (IBEditor*) unidraw->GetEditor(i);
+	Iterator ii;
+	for (unidraw->First(ii); !unidraw->Done(ii); unidraw->Next(ii)) {
+	    IBEditor* iEd = (IBEditor*) unidraw->GetEditor(ii);
 	    ToolPanel* itoolpanel = iEd->GetToolPanel();
 
             for (int i = 0; i < installed->Count(); i++) {