--- a/src/input.cc	Tue Sep 05 07:02:35 1995 +0000
+++ b/src/input.cc	Tue Sep 05 07:09:38 1995 +0000
@@ -44,14 +44,14 @@
 #include <cassert>
 #include <csignal>
 
+#include <iostream.h>
+#include <strstream.h>
+
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#include <iostream.h>
-#include <strstream.h>
-
 // This must come before anything that includes iostream.h...
 extern "C"
 {
@@ -93,6 +93,7 @@
 }
 }
 
+#include "pathlen.h"
 #include "help.h"
 #include "error.h"
 #include "utils.h"
@@ -112,10 +113,6 @@
 #include "symtab.h"
 #include "defun.h"
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
 // The size that strings change by.
 #ifndef DEFAULT_ARRAY_SIZE
 #define DEFAULT_ARRAY_SIZE 512

--- a/src/utils.cc	Tue Sep 05 07:02:35 1995 +0000
+++ b/src/utils.cc	Tue Sep 05 07:09:38 1995 +0000
@@ -29,14 +29,14 @@
 #include <csetjmp>
 #include <cstring>
 
+#include <fstream.h>
+#include <iostream.h>
+#include <strstream.h>
+
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <sys/param.h>
-#include <iostream.h>
-#include <strstream.h>
-#include <fstream.h>
 
 #include <Complex.h>