diff --git a/src/events.c b/src/events.c
index f4de7db..a5cdf31 100644
--- a/src/events.c
+++ b/src/events.c
@@ -43,8 +43,8 @@
 #include "ir.h"                         /* for calculate_basic_ir, etc */
 #include "nunchuk.h"                    /* for nunchuk_disconnected, etc */
 #include "wiiboard.h"                   /* for wii_board_disconnected, etc */
+#include "motion_plus.h"                /* for motion_plus_disconnected, etc */
 #include "io.h"                         /* for wiiuse_io_read on Windows, etc */
-#include "motion_plus.h"
 
 #ifndef WIIUSE_WIN32
 	#include <sys/time.h>                   /* for timeval */
diff --git a/src/motion_plus.c b/src/motion_plus.c
index 37eaeb2..25b3ca7 100644
--- a/src/motion_plus.c
+++ b/src/motion_plus.c
@@ -32,8 +32,8 @@
 
 #include "events.h"                     /* for disable_expansion */
 #include "ir.h"                         /* for wiiuse_set_ir_mode */
-#include "nunchuk.h"
-#include "dynamics.h"
+#include "nunchuk.h"                    /* for nunchuk_pressed_buttons */
+#include "dynamics.h"                   /* for calc_joystick_state, etc */
 
 #include <string.h>                     /* for memset */
 #include <math.h>                       /* for fabs */