diff --git a/src/classic.c b/src/classic.c
index 1d3abaa..ecdd7dc 100644
--- a/src/classic.c
+++ b/src/classic.c
@@ -31,20 +31,14 @@
  *	@brief Classic controller expansion device.
  */
 
+#include "classic.h"
+#include "dynamics.h"
+#include "events.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 
-#ifdef WIN32
-	#include <Winsock2.h>
-#endif
-
-#include "definitions.h"
-#include "wiiuse_internal.h"
-#include "dynamics.h"
-#include "events.h"
-#include "classic.h"
-
 static void classic_ctrl_pressed_buttons(struct classic_ctrl_t* cc, short now);
 
 /**
diff --git a/src/definitions.h b/src/definitions.h
index b6b92f9..184cedf 100644
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -35,6 +35,7 @@
 #define DEFINITIONS_H_INCLUDED
 
 /* this is wiiuse - used to distinguish from third party programs using wiiuse.h */
+#include <stdio.h>
 #include "os.h"
 
 #define WIIMOTE_PI			3.14159265f
diff --git a/src/dynamics.c b/src/dynamics.c
index b6baa72..ff6ac18 100644
--- a/src/dynamics.c
+++ b/src/dynamics.c
@@ -35,6 +35,9 @@
  *	motion sensing.
  */
 
+#include "dynamics.h"
+#include "ir.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -43,10 +46,6 @@
 	#include <float.h>
 #endif
 
-#include "definitions.h"
-#include "wiiuse_internal.h"
-#include "ir.h"
-#include "dynamics.h"
 
 /**
  *	@brief Calculate the roll, pitch, yaw.
diff --git a/src/events.c b/src/events.c
index 4c2380c..833d915 100644
--- a/src/events.c
+++ b/src/events.c
@@ -34,30 +34,27 @@
  *	that are sent from the wiimote to us.
  */
 
-#include <stdio.h>
-
-#ifndef WIN32
-	#include <sys/time.h>
-	#include <unistd.h>
-	#include <errno.h>
-#else
-	#include <winsock2.h>
-#endif
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include "definitions.h"
-#include "io.h"
 #include "wiiuse_internal.h"
+#include "events.h"
+#include "io.h"
 #include "dynamics.h"
 #include "ir.h"
 #include "nunchuk.h"
 #include "classic.h"
 #include "guitar_hero_3.h"
 #include "wiiboard.h"
-#include "events.h"
+
+#include <stdio.h>
+
+#ifndef WIN32
+	#include <sys/time.h>
+	#include <unistd.h>
+	#include <errno.h>
+#endif
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <math.h>
 
 static void idle_cycle(struct wiimote_t* wm);
 static void clear_dirty_reads(struct wiimote_t* wm);
diff --git a/src/guitar_hero_3.c b/src/guitar_hero_3.c
index 29c58af..20fde70 100644
--- a/src/guitar_hero_3.c
+++ b/src/guitar_hero_3.c
@@ -31,20 +31,15 @@
  *	@brief Guitar Hero 3 expansion device.
  */
 
+#include "guitar_hero_3.h"
+
+#include "dynamics.h"
+#include "events.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 
-#ifdef WIN32
-	#include <Winsock2.h>
-#endif
-
-#include "definitions.h"
-#include "wiiuse_internal.h"
-#include "dynamics.h"
-#include "events.h"
-#include "guitar_hero_3.h"
-
 static void guitar_hero_3_pressed_buttons(struct guitar_hero_3_t* gh3, short now);
 
 /**
diff --git a/src/io.c b/src/io.c
index ee2826b..2897de6 100644
--- a/src/io.c
+++ b/src/io.c
@@ -30,14 +30,11 @@
  *	@file
  *	@brief Handles device I/O (non-OS specific).
  */
+#include "io.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "definitions.h"
-#include "wiiuse_internal.h"
-#include "io.h"
-
 
  /**
  *	@brief Get initialization data from the wiimote.
diff --git a/src/io_win.c b/src/io_win.c
index 38b54ba..9dd1df2 100644
--- a/src/io_win.c
+++ b/src/io_win.c
@@ -33,18 +33,14 @@
 
 #ifdef WIN32
 
+#include "io.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <windows.h>
 #include <hidsdi.h>
 #include <setupapi.h>
 
-#include "definitions.h"
-#include "wiiuse_internal.h"
-#include "io.h"
-
-
 int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int timeout) {
 	GUID device_id;
 	HANDLE dev;
diff --git a/src/ir.c b/src/ir.c
index 9a571d0..842186f 100644
--- a/src/ir.c
+++ b/src/ir.c
@@ -31,6 +31,8 @@
  *	@brief Handles IR data.
  */
 
+#include "ir.h"
+
 #include <stdio.h>
 #include <math.h>
 
@@ -38,10 +40,6 @@
 	#include <unistd.h>
 #endif
 
-#include "definitions.h"
-#include "wiiuse_internal.h"
-#include "ir.h"
-
 static int get_ir_sens(struct wiimote_t* wm, char** block1, char** block2);
 static void interpret_ir_data(struct wiimote_t* wm);
 static void fix_rotated_ir_dots(struct ir_dot_t* dot, float ang);
diff --git a/src/nunchuk.c b/src/nunchuk.c
index fd763bc..f325c88 100644
--- a/src/nunchuk.c
+++ b/src/nunchuk.c
@@ -31,15 +31,14 @@
  *	@brief Nunchuk expansion device.
  */
 
+
+#include "nunchuk.h"
+#include "dynamics.h"
+#include "events.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 
-#include "definitions.h"
-#include "wiiuse_internal.h"
-#include "dynamics.h"
-#include "events.h"
-#include "nunchuk.h"
 
 static void nunchuk_pressed_buttons(struct nunchuk_t* nc, byte now);
 
diff --git a/src/wiiboard.c b/src/wiiboard.c
index 560da80..ff1a9c1 100644
--- a/src/wiiboard.c
+++ b/src/wiiboard.c
@@ -31,20 +31,14 @@
  *	@brief Wii Fit Balance Board device.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <math.h>
 
-#ifdef WIN32
-	#include <Winsock2.h>
-#endif
-
-#include "definitions.h"
-#include "wiiuse_internal.h"
+#include "wiiboard.h"
 #include "dynamics.h"
 #include "events.h"
-#include "wiiboard.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
 
 static uint16_t big_to_lil(uint16_t num)
 {
diff --git a/src/wiiuse.c b/src/wiiuse.c
index 6339324..7f52fec 100644
--- a/src/wiiuse.c
+++ b/src/wiiuse.c
@@ -35,20 +35,17 @@
  *	of the API.
  */
 
+#include "wiiuse_internal.h"
+#include "events.h"
+#include "io.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
 #ifndef WIN32
 	#include <unistd.h>
-#else
-	#include <Winsock2.h>
 #endif
 
-#include "definitions.h"
-#include "wiiuse_internal.h"
-#include "events.h"
-#include "io.h"
-
 static int g_banner = 0;
 
 /**
diff --git a/src/wiiuse_internal.h b/src/wiiuse_internal.h
index 45af7ba..2e57dea 100644
--- a/src/wiiuse_internal.h
+++ b/src/wiiuse_internal.h
@@ -44,7 +44,9 @@
 #ifndef WIIUSE_INTERNAL_H_INCLUDED
 #define WIIUSE_INTERNAL_H_INCLUDED
 
-#ifndef WIN32
+#ifdef WIN32
+	#include <Winsock2.h>
+#else
 	#include <arpa/inet.h>				/* htons() */
 	#include <bluetooth/bluetooth.h>
 #endif