diff --git a/src/sbbs3/ssl.c b/src/sbbs3/ssl.c
index efe19fb25d42cc002542301f1f2887cf6b3d8411..ed3274e398619291c7ca1f1f97995470c05f4a96 100644
--- a/src/sbbs3/ssl.c
+++ b/src/sbbs3/ssl.c
@@ -3,7 +3,7 @@
 
 #include <threadwrap.h>
 #include "xpprintf.h"
-#include "xpevent.h"
+#include "eventwrap.h"
 
 #include "ssl.h"
 //#include "js_socket.h"	// TODO... move this stuff in here?
diff --git a/src/xpdev/xpevent.h b/src/xpdev/xpevent.h
index 4af706a4c5d64add9855a172ba6736222aec9ca0..7fa8b51798f0ec7cc61869eff25986b7969998d1 100644
--- a/src/xpdev/xpevent.h
+++ b/src/xpdev/xpevent.h
@@ -38,14 +38,10 @@
 #ifndef _XPEVENT_H_
 #define _XPEVENT_H_
 
-#ifdef _WIN32
-
 #include "gen_defs.h"
 typedef HANDLE xpevent_t;
 #define WaitForEvent(event, ms) WaitForSingleObject(event, ms)
 
-#else
-
 #include <pthread.h>
 #include "gen_defs.h"
 
@@ -89,5 +85,3 @@ enum {
 };
 
 #endif
-
-#endif