diff --git a/include/module.h b/include/module.h
index 02f0e61c4..94f565a3a 100644
--- a/include/module.h
+++ b/include/module.h
@@ -36,7 +36,6 @@
 #include "oper.h"
 #include "opertype.h"
 #include "protocol.h"
-#include "pstdint.h"
 #include "regchannel.h"
 #include "serialize.h"
 #include "servers.h"
diff --git a/include/sockets.h b/include/sockets.h
index eb990fd4f..a7a8bb257 100644
--- a/include/sockets.h
+++ b/include/sockets.h
@@ -13,6 +13,8 @@
 #define SOCKETS_H
 
 #include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
 #include "anope.h"
 
diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index 7af78bad6..bac99a9b9 100644
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
+#include <errno.h>
 
 static int kq_fd, max_fds;
 static struct kevent *change_events, *event_events;