diff --git a/executor/common_bsd.h b/executor/common_bsd.h
index 2bfce18..3715817 100644
--- a/executor/common_bsd.h
+++ b/executor/common_bsd.h
@@ -11,6 +11,20 @@
 #include <string.h>
 #include <sys/syscall.h>
 
+#if GOOS_openbsd
+// Needed syscall libc stubs.
+#include <poll.h>
+#include <sys/event.h>
+#include <sys/ioctl.h>
+#include <sys/ktrace.h>
+#include <sys/mman.h>
+#include <sys/msg.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
+#include <sys/sysctl.h>
+#include <sys/syslog.h>
+#endif
+
 #if GOOS_netbsd
 
 #if SYZ_EXECUTOR || __NR_syz_usb_connect
diff --git a/executor/executor_bsd.h b/executor/executor_bsd.h
index 1af99f4..137413b 100644
--- a/executor/executor_bsd.h
+++ b/executor/executor_bsd.h
@@ -11,10 +11,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#if GOOS_openbsd
-#include <sys/sysctl.h>
-#endif
-
 static void os_init(int argc, char** argv, void* data, size_t data_size)
 {
 #if GOOS_openbsd
diff --git a/sys/syz-sysgen/sysgen.go b/sys/syz-sysgen/sysgen.go
index 0427272..2ffbc20 100644
--- a/sys/syz-sysgen/sysgen.go
+++ b/sys/syz-sysgen/sysgen.go
@@ -313,11 +313,13 @@
 	if !patchCallName {
 		callName = sc.CallName
 	}
+	needCall := (!target.SyscallNumbers || strings.HasPrefix(sc.CallName, "syz_") ||
+		patchCallName || target.OS == "openbsd") && !sc.Attrs.Disabled
 	return SyscallData{
 		Name:     sc.Name,
 		CallName: callName,
 		NR:       int32(sc.NR),
-		NeedCall: (!target.SyscallNumbers || strings.HasPrefix(sc.CallName, "syz_") || patchCallName) && !sc.Attrs.Disabled,
+		NeedCall: needCall,
 		Attrs:    attrs,
 	}
 }