diff --git a/win32/ata.c b/win32/ata.c
index caebd75..e1cd587 100644
--- a/win32/ata.c
+++ b/win32/ata.c
@@ -15,6 +15,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <windows.h>
+
+#include "win32.h"
 #include "../aaruremote.h"
 
 int32_t SendAtaChsCommand(void*                 device_ctx,
diff --git a/win32/device.c b/win32/device.c
index be18d25..2f80e51 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -15,14 +15,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../aaruremote.h"
-#include "win32.h"
+#include <windows.h>
 
 #include <errno.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "win32.h"
+#include "../aaruremote.h"
+#include "ntioctl.h"
+
 void* DeviceOpen(const char* device_path)
 {
     DeviceContext* ctx;
diff --git a/win32/hello.c b/win32/hello.c
index ad6c7ee..5b7f20b 100644
--- a/win32/hello.c
+++ b/win32/hello.c
@@ -15,14 +15,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../aaruremote.h"
-#include "../endian.h"
-#include "win32.h"
+#include <windows.h>
 
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
-#include <windows.h>
+
+#include "win32.h"
+#include "../aaruremote.h"
+#include "../endian.h"
 
 AaruPacketHello* GetHello()
 {
diff --git a/win32/ieee1394.c b/win32/ieee1394.c
index 9761a83..6fa1e27 100644
--- a/win32/ieee1394.c
+++ b/win32/ieee1394.c
@@ -15,9 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "win32.h"
+#include <windows.h>
 
-#include <stdint.h>
+#include "win32.h"
+#include "../aaruremote.h"
 
 uint8_t GetFireWireData(void*     device_ctx,
                         uint32_t* id_model,
diff --git a/win32/list_devices.c b/win32/list_devices.c
index 8d74baf..d5ec26d 100644
--- a/win32/list_devices.c
+++ b/win32/list_devices.c
@@ -15,11 +15,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../aaruremote.h"
+#include <windows.h>
 
 #include <stddef.h>
 #include <stdio.h>
-#include <windows.h>
+
+#include "win32.h"
+#include "../aaruremote.h"
+#include "ntioctl.h"
 
 #ifndef IOCTL_STORAGE_QUERY_PROPERTY
 #define IOCTL_STORAGE_QUERY_PROPERTY 0x2D1400
diff --git a/win32/network.c b/win32/network.c
index d12db8e..ee20aa0 100644
--- a/win32/network.c
+++ b/win32/network.c
@@ -15,13 +15,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../aaruremote.h"
-#include "win32.h"
+#include <winsock2.h>
+#include <windows.h>
 
 #include <iphlpapi.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <winsock2.h>
+
+#include "win32.h"
+#include "../aaruremote.h"
 
 int PrintNetworkAddresses()
 {
diff --git a/win32/ntioctl.h b/win32/ntioctl.h
index ff3cbe0..f3f7179 100644
--- a/win32/ntioctl.h
+++ b/win32/ntioctl.h
@@ -18,9 +18,6 @@
 #ifndef AARUREMOTE_WIN32_NTIOCTL_H_
 #define AARUREMOTE_WIN32_NTIOCTL_H_
 
-#include <windows.h>
-#include <winsock2.h>
-
 #ifdef HAS_NTDDSCSI_H
 #include <ntddscsi.h>
 #endif
diff --git a/win32/pcmcia.c b/win32/pcmcia.c
index 695e95f..89e4b2f 100644
--- a/win32/pcmcia.c
+++ b/win32/pcmcia.c
@@ -15,9 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "win32.h"
+#include <windows.h>
 
-#include <stdint.h>
+#include "win32.h"
+#include "../aaruremote.h"
 
 uint8_t GetPcmciaData(void* device_ctx, uint16_t* cis_len, char* cis)
 {
diff --git a/win32/scsi.c b/win32/scsi.c
index cd7433c..ee3161d 100644
--- a/win32/scsi.c
+++ b/win32/scsi.c
@@ -15,12 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <windows.h>
+
+#include "win32.h"
 #include "../aaruremote.h"
 #include "ntioctl.h"
-#include "win32.h"
-
-#include <stdint.h>
-#include <windows.h>
 
 int32_t SendScsiCommand(void*     device_ctx,
                         char*     cdb,
diff --git a/win32/sdhci.c b/win32/sdhci.c
index 1e0571a..f1a1a22 100644
--- a/win32/sdhci.c
+++ b/win32/sdhci.c
@@ -15,10 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ntioctl.h"
-#include "win32.h"
+#include <windows.h>
 
-#include <stdint.h>
+#include "win32.h"
+#include "../aaruremote.h"
+#include "ntioctl.h"
 
 int32_t SendSdhciCommand(void*     device_ctx,
                          uint8_t   command,
diff --git a/win32/usb.c b/win32/usb.c
index a8b9790..cb40ab2 100644
--- a/win32/usb.c
+++ b/win32/usb.c
@@ -15,16 +15,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "usb.h"
-
-#include "win32.h"
+#include <windows.h>
 
 #include <SetupAPI.h>
 #include <cfgmgr32.h>
-#include <ntddstor.h>
-#include <stdint.h>
+#include <guiddef.h>
 #include <stdio.h>
-#include <usbioctl.h>
+
+#include "win32.h"
+
+#include "usb.h"
+
+#include "ntioctl.h"
 
 #ifndef DIGCF_PRESENT
 #define DIGCF_PRESENT 0x00000002
diff --git a/win32/win32.c b/win32/win32.c
index 5567654..761fa1d 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -15,6 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <windows.h>
+
+#include "win32.h"
+
 #include "../aaruremote.h"
 
 void Initialize()
diff --git a/worker.c b/worker.c
index 2b29308..d81f21b 100644
--- a/worker.c
+++ b/worker.c
@@ -22,11 +22,10 @@
 
 #ifdef _WIN32
 #define ssize_t int
+#include <winsock2.h>
 #include <windows.h>
 
 #include "win32/win32.h"
-
-#include <winsock.h>
 #endif
 
 #include "aaruremote.h"