3 files changed, 30 insertions, 3 deletions
diff --git a/gdb/nlm/gdbserve.c b/gdb/nlm/gdbserve.c
index 31a0c6e..9eecc70 100644
--- a/gdb/nlm/gdbserve.c
+++ b/gdb/nlm/gdbserve.c
@@ -66,19 +66,30 @@
  *
  ****************************************************************************/
 
-#include <nwdfs.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
+#include <errno.h>
+
+#if defined(__netware__) && defined(__i386__)
+#include <dfs.h>
+#include <conio.h>
+#include <advanced.h>
+#include <debugapi.h>
+#include <process.h>
+#else
+#include <nwdfs.h>
 #include <nwconio.h>
 #include <nwadv.h>
 #include <nwdbgapi.h>
-#include <errno.h>
 #include <nwthread.h>
+#endif
 #include <aio.h>
+
 #include "cpu.h"
 
+
 /****************************************************/
 /* This information is from Novell.  It is not in any of the standard
    NetWare header files.  */
diff --git a/gdb/nlm/i386.c b/gdb/nlm/i386.c
index 68132ce..a9333fb 100644
--- a/gdb/nlm/i386.c
+++ b/gdb/nlm/i386.c
@@ -1,3 +1,14 @@
+#include <dfs.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <time.h>
+#include <conio.h>
+#include <advanced.h>
+#include <debugapi.h>
+#include <process.h>
+#include <errno.h>
 #include "i386.h"
 
 /* Get the registers out of the frame information.  */
diff --git a/gdb/nlm/prelude.c b/gdb/nlm/prelude.c
index e3207c2..37e12c8 100644
--- a/gdb/nlm/prelude.c
+++ b/gdb/nlm/prelude.c
@@ -12,9 +12,14 @@
 =	be distributed with CLib.NLM and its headers.
 ==============================================================================
 */
+
+#include <stddef.h>
+#if defined(__netware__) && defined(__i386__)
+#define TERMINATE_BY_UNLOAD	5
+#else
 #include <nwpre.h>
+#endif
 /*#include "libhooks.h"*/
-#include <stddef.h>
 
 extern int main (int, char **);