diff --git a/src/tool_operate.c b/src/tool_operate.c
index 6fe908a4f609d1ff349a24ff49fa13d616689043..9624f424a6e2cddf05fa4152078e1fdbbc27c60c 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -67,6 +67,7 @@
 #include "tool_cb_skt.h"
 #include "tool_cb_wrt.h"
 #include "tool_dirhie.h"
+#include "tool_doswin.h"
 #include "tool_easysrc.h"
 #include "tool_getparam.h"
 #include "tool_helpers.h"
diff --git a/src/tool_panykey.c b/src/tool_panykey.c
index 8e1fd8d972d8890a244f5ee8f94db5081451e56d..95fa6a763b5a1ce05614d71b90bcd7bcb12b668e 100644
--- a/src/tool_panykey.c
+++ b/src/tool_panykey.c
@@ -23,6 +23,14 @@
 
 #if defined(__SYMBIAN32__) || defined(NETWARE)
 
+#ifdef NETWARE
+#  ifdef __NOVELL_LIBC__
+#    include <screen.h>
+#  else
+#    include <nwconio.h>
+#  endif
+#endif
+
 #include "tool_panykey.h"
 
 #include "memdebug.h" /* keep this as LAST include */