diff --git a/src/lib/lwp/arch.c b/src/lib/lwp/arch.c
index c4e2ea48..83ef6caa 100644
--- a/src/lib/lwp/arch.c
+++ b/src/lib/lwp/arch.c
@@ -32,13 +32,11 @@
  *     Steve McClure, 1994-2000
  */
 
-#include "prototypes.h"
-
-#if defined(_EMPTH_LWP)
-
 #include "lwp.h"
 #include "lwpint.h"
 
+#if defined(_EMPTH_LWP)
+
 /*
  * Implement machine-dependent functions lwpInitContext(), lwpSave(),
  * lwpRestore().
diff --git a/src/lib/lwp/queue.c b/src/lib/lwp/queue.c
index 61e8ea66..9af89d21 100644
--- a/src/lib/lwp/queue.c
+++ b/src/lib/lwp/queue.c
@@ -22,7 +22,6 @@
  */
 #include "lwp.h"
 #include "lwpint.h"
-#include "prototypes.h"
 
 #if defined(_EMPTH_LWP)
 
diff --git a/src/lib/lwp/sel.c b/src/lib/lwp/sel.c
index 419153d5..d45ee567 100644
--- a/src/lib/lwp/sel.c
+++ b/src/lib/lwp/sel.c
@@ -36,7 +36,8 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/file.h>
-#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
 
 #ifdef hpux
 #include <stdio.h>
@@ -44,7 +45,6 @@
 
 #include "lwp.h"
 #include "lwpint.h"
-#include "prototypes.h"
 
 #if defined(_EMPTH_LWP)
 
diff --git a/src/lib/lwp/sem.c b/src/lib/lwp/sem.c
index 275ab89d..58df3acc 100644
--- a/src/lib/lwp/sem.c
+++ b/src/lib/lwp/sem.c
@@ -25,7 +25,6 @@
 
 #include "lwp.h"
 #include "lwpint.h"
-#include "prototypes.h"
 
 #if defined(_EMPTH_LWP)
 
diff --git a/src/lib/lwp/status.c b/src/lib/lwp/status.c
index 1216df91..9d0a7d07 100644
--- a/src/lib/lwp/status.c
+++ b/src/lib/lwp/status.c
@@ -32,11 +32,11 @@
  */
 
 #include <stdarg.h>
+#include <stdio.h>
 #ifdef BOUNDS_CHECK
 #include <bounds/fix-args.h>
 #endif
 #include "lwp.h"
-#include "prototypes.h"
 
 #if defined(_EMPTH_LWP)