diff --git a/core/connectors/connector.c b/core/connectors/connector.c
index f5d44ac6..944e8750 100644
--- a/core/connectors/connector.c
+++ b/core/connectors/connector.c
@@ -9,6 +9,7 @@
 #include "connectors/connector.h"
 #include "connectors/udp_con.h"
 #include "connectors/gpp_con.h"
+#include "connectors/usb_con.h"
 #include "connectors/usb_spoof.h"
 #include <adapter.h>
 #include <report.h>
@@ -16,7 +17,6 @@
 #ifndef WIN32
 #include "connectors/sixaxis.h"
 #include "connectors/btds4.h"
-#include "connectors/usb_con.h"
 #endif
 
 int connector_init()
diff --git a/core/connectors/windows/serial.c b/core/connectors/windows/serial.c
index f06fd15d..eecfd5fe 100644
--- a/core/connectors/windows/serial.c
+++ b/core/connectors/windows/serial.c
@@ -102,14 +102,15 @@ int serial_read(int id, void* pdata, unsigned int size)
 
 int serial_recv(int id, void* pdata, unsigned int size)
 {
-  return serial_read(serials[id].handle, pdata, size);
+  return serial_read(id, pdata, size);
 }
 
 /*
  * Close the serial port.
  */
-void serial_close(int id)
+int serial_close(int id)
 {
   usleep(10000);//sleep 10ms to leave enough time for the last packet to be sent
   CloseHandle(serials[id].handle);
+  return 0;
 }
diff --git a/core/include/connectors/serial.h b/core/include/connectors/serial.h
index 1ba7c35c..fab501f6 100644
--- a/core/include/connectors/serial.h
+++ b/core/include/connectors/serial.h
@@ -6,15 +6,6 @@
 #ifndef SERIAL_H_
 #define SERIAL_H_
 
-#ifndef WIN32
-typedef int SERIALOBJECT;
-#define SERIALOBJECT_UNDEF -1
-#else
-#include <windows.h>
-typedef HANDLE SERIALOBJECT;
-#define SERIALOBJECT_UNDEF NULL
-#endif
-
 #define HEADER_SIZE 0x02
 #define BUFFER_SIZE 0xFF
 
diff --git a/core/include/connectors/usb_spoof.h b/core/include/connectors/usb_spoof.h
index 4671b6d5..6b9a92d7 100644
--- a/core/include/connectors/usb_spoof.h
+++ b/core/include/connectors/usb_spoof.h
@@ -27,8 +27,8 @@ int usb_spoof_init_usb_device(int vendor, int product,
     uint16_t* bus_id, uint8_t* device_address, int libusb_debug);
 void usb_spoof_release_usb_device();
 int usb_spoof_forward_to_device(control_request* creq);
-int usb_spoof_forward_to_adapter(SERIALOBJECT serial, unsigned char* data, unsigned char length);
+int usb_spoof_forward_to_adapter(int id, unsigned char* data, unsigned char length);
 
-int usb_spoof_spoof_360_controller(SERIALOBJECT serial);
+int usb_spoof_spoof_360_controller(int id);
 
 #endif /* USB_SPOOF_H_ */