diff --git a/src/builtin_efuns.c b/src/builtin_efuns.c
index bf2b6ab2d03943ba329e05940637839ecfe16b6e..518e0f456ce2a3efd773dc453a050668ffc070eb 100644
--- a/src/builtin_efuns.c
+++ b/src/builtin_efuns.c
@@ -22,7 +22,7 @@
 #include "fsort.h"
 #include "call_out.h"
 #include "callback.h"
-#ifdef HAVE_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_CRYPT_H
diff --git a/src/lpc_signal.c b/src/lpc_signal.c
index f82e4c188b55320e9658b792673e4779858223de..1430d55a89e6aefbc9849952d6b8bae6cc5f8581 100644
--- a/src/lpc_signal.c
+++ b/src/lpc_signal.c
@@ -291,7 +291,7 @@ static void f_signal(int args)
   assign_svalue(signal_callbacks + signum, sp+1-args);
   if(IS_ZERO(sp+1-args))
   {
-    switch(sig)
+    switch(signum)
     {
     case SIGCHLD:
       func=sig_child;
@@ -307,7 +307,7 @@ static void f_signal(int args)
   }else{
     func=receive_signal;
   }
-  my_signal(sig, func);
+  my_signal(signum, func);
   pop_n_elems(args);
 }
 
diff --git a/src/modules/files/socket.c b/src/modules/files/socket.c
index 8a94fa17c571ac9f5208ba239f4177022995c97f..a2c84c2c48e4fb9170d0233dcc9093a8e666e2f5 100644
--- a/src/modules/files/socket.c
+++ b/src/modules/files/socket.c
@@ -60,7 +60,7 @@ static void do_close(struct port *p)
   if(p->fd >= 0)
   {
     if(close(p->fd) < 0)
-      if(errno == RETRY)
+      if(errno == EINTR)
 	goto retry;
 
     set_read_callback(p->fd,0,0);
diff --git a/src/rusage.c b/src/rusage.c
index d6ce21a1b3100e0493ea4bf62375373ceeef448a..0a93495239009b310147bb546e93de60fc89bf27 100644
--- a/src/rusage.c
+++ b/src/rusage.c
@@ -3,17 +3,17 @@
 ||| uLPC is distributed as GPL (General Public License)
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
+#include "global.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <fcntl.h>
-#ifdef HAVE_TIME
+#ifdef HAVE_TIME_H
 #include <time.h>
 #endif
 #include <errno.h>
-#include "global.h"
 #include "types.h"
 #include "rusage.h"