3 files changed, 9 insertions, 4 deletions
diff --git a/source3/include/debugparse.h b/source3/include/debugparse.h
index 224141f75b..9827c43db7 100644
--- a/source3/include/debugparse.h
+++ b/source3/include/debugparse.h
@@ -35,6 +35,12 @@
  * -------------------------------------------------------------------------- **
  *
  * $Log: debugparse.h,v $
+ * Revision 1.2  1998/10/28 17:51:48  jra
+ * Quick fixes to fix the broken tree. Needed for my morning compiles.
+ * Chris - feel free to fix these things differently if these fixes don't
+ * work for you.
+ * Jeremy.
+ *
  * Revision 1.1  1998/10/26 23:21:37  crh
  * Here is the simple debug parser and the debug2html converter.  Still to do:
  *
@@ -50,8 +56,6 @@
  * ========================================================================== **
  */
 
-#include "includes.h"
-
 /* -------------------------------------------------------------------------- **
  * These are the tokens returned by dbg_char2token().
  */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9d5ee28358..1477c3ab3d 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -494,6 +494,8 @@ extern int errno;
 
 #include "nterr.h"
 
+#include "debugparse.h"
+
 #ifndef MAXCODEPAGELINES
 #define MAXCODEPAGELINES 256
 #endif
@@ -680,7 +682,7 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid);
 int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
 #endif
 
-#if (defined(HAVE_CRYPT) && !defined(HAVE_CRYPT_DECL))
+#if (defined(HAVE_CRYPT) && !defined(HAVE_CRYPT_DECL) && !defined(KRB4_AUTH))
 /* stupid glibc */
 int crypt(const char *key, const char *salt);
 #endif
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1af68b86d1..807ee0fbab 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -88,7 +88,6 @@ BOOL dbghdr( int level, char *file, char *func, int line );
 
 char *dbg_token2string( dbg_Token tok );
 void dbg_test( void );
-int main( void );
 
 /*The following definitions come from  lib/fault.c  */