--- xautolock.c.org	Thu Feb 19 15:30:29 1998
+++ xautolock.c	Thu Feb 19 15:32:27 1998
@@ -308,7 +308,7 @@
 #endif /* !NOSTDHDRS */
 
 #if !defined (apollo) && !defined (VMS)
-#include <malloc.h>
+#include <stdlib.h>
 #include <unistd.h>
 #endif /* !apollo && !VMS */
 
@@ -1842,14 +1842,14 @@
 #else /* VMS */
   if (locker_pid)
   {
-#if !defined (UTEKV) && !defined (SYSV) && !defined(SVR4)
+#if !defined (UTEKV) && !defined (SYSV) && !defined(SVR4) && !defined(__OpenBSD__)
     union wait  status;      /* childs process status */
 #else /* !UTEKV && !SYSV && !SVR4 */
     int         status = 0;  /* childs process status */
 #endif /* !UTEKV && !SYSV && !SVR4 */
 
 
-#if !defined (UTEKV) && !defined (SYSV) && !defined(SVR4)
+#if !defined (UTEKV) && !defined (SYSV) && !defined(SVR4) && !defined(__OpenBSD__)
     if (wait3 (&status, WNOHANG, (struct rusage*) NULL))
 #else /* !UTEKV && !SYSV && !SVR4 */
     if (waitpid (-1, &status, WNOHANG)) 
