diff --git a/audio/drivers/oss.c b/audio/drivers/oss.c
index c2b5feba92..8280a1ba16 100644
--- a/audio/drivers/oss.c
+++ b/audio/drivers/oss.c
@@ -12,14 +12,12 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "../../driver.h"
-#include "../../general.h"
+#include <stdint.h>
 #include <stdlib.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <errno.h>
 
 #ifdef HAVE_OSS_BSD
 #include <soundcard.h>
@@ -27,11 +25,14 @@
 #include <sys/soundcard.h>
 #endif
 
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdint.h>
+#include <retro_endianness.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "../../driver.h"
+#include "../../general.h"
 
 #ifdef HAVE_OSS_BSD
 #define DEFAULT_OSS_DEV "/dev/audio"
diff --git a/audio/drivers/pulse.c b/audio/drivers/pulse.c
index e0c2c08c31..8c2fb0f3a9 100644
--- a/audio/drivers/pulse.c
+++ b/audio/drivers/pulse.c
@@ -13,13 +13,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+#include <string.h>
+
+#include <pulse/pulseaudio.h>
+
+#include <boolean.h>
+#include <retro_endianness.h>
 
 #include "../../driver.h"
 #include "../../general.h"
-#include <pulse/pulseaudio.h>
-#include <boolean.h>
-#include <string.h>
-#include <stdint.h>
 
 typedef struct
 {
diff --git a/database_info.c b/database_info.c
index bbd1e94993..61b4dd5421 100644
--- a/database_info.c
+++ b/database_info.c
@@ -18,6 +18,7 @@
 #include <stdint.h>
 
 #include <file/file_extract.h>
+#include <retro_endianness.h>
 
 #include "dir_list_special.h"
 #include "database_info.h"
diff --git a/input/connect/connect_wii.c b/input/connect/connect_wii.c
index c761c3427d..8cfe6f71eb 100644
--- a/input/connect/connect_wii.c
+++ b/input/connect/connect_wii.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <boolean.h>
-#include <retro_miscellaneous.h>
+#include <retro_endianness.h>
 #include "joypad_connection.h"
 
 /* wiimote state flags*/
diff --git a/libretro-common/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h
index e90fadaee9..8237457a8b 100644
--- a/libretro-common/include/retro_miscellaneous.h
+++ b/libretro-common/include/retro_miscellaneous.h
@@ -47,12 +47,12 @@
 #elif defined(_WIN32) && defined(_XBOX)
 #include <Xtl.h>
 #endif
-#include <compat/msvc.h>
 
-#include <retro_inline.h>
-#include <retro_endianness.h>
 #include <limits.h>
 
+#include <compat/msvc.h>
+#include <retro_inline.h>
+
 #ifndef PATH_MAX_LENGTH
 #define PATH_MAX_LENGTH 4096
 #endif
diff --git a/movie.c b/movie.c
index aa11092274..0ceb4845de 100644
--- a/movie.c
+++ b/movie.c
@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include <rhash.h>
+#include <retro_endianness.h>
 
 #include "general.h"
 
diff --git a/netplay.c b/netplay.c
index effa6ea38b..b1d7f17e70 100644
--- a/netplay.c
+++ b/netplay.c
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include <net/net_compat.h>
+#include <retro_endianness.h>
 
 #include "netplay.h"
 #include "general.h"
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 3612776373..4fe68d498a 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -13,9 +13,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tasks.h"
 #include <compat/strcasestr.h>
 #include <compat/strl.h>
+#include <retro_endianness.h>
+
+#include "tasks.h"
 
 #ifdef HAVE_LIBRETRODB
 #include "../database_info.h"