diff --git a/dynamic.c b/dynamic.c
index 6ff6d3341f..5c506f0407 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -14,29 +14,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dynamic.h"
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-#include "retroarch_logger.h"
-#include "performance.h"
-#include <file/file_path.h>
 #include <string.h>
 #include <ctype.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <boolean.h>
-#include "libretro_private.h"
-#include "cores/internal_cores.h"
-#include "retroarch.h"
-#include "runloop.h"
-#include "configuration.h"
-#include "general.h"
-
-#include "input/input_sensor.h"
-
 #ifdef NEED_DYNAMIC
 #ifdef _WIN32
 #include <windows.h>
@@ -45,6 +25,28 @@
 #endif
 #endif
 
+#include <boolean.h>
+#include <file/file_path.h>
+#include <retro_log.h>
+#include <compat/strl.h>
+#include <compat/posix_string.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "dynamic.h"
+#include "performance.h"
+
+#include "libretro_private.h"
+#include "cores/internal_cores.h"
+#include "retroarch.h"
+#include "runloop.h"
+#include "configuration.h"
+#include "general.h"
+
+#include "input/input_sensor.h"
+
 #ifdef HAVE_DYNAMIC
 #undef SYM
 #define SYM(x) do { \
diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index 120e7db10c..802ae706d5 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -357,7 +357,7 @@ static void frontend_ps3_exitspawn(char *core_path, size_t core_path_size)
 #include <np.h>
 #include <np/drm.h>
 
-#include "../../retroarch_logger.h"
+#include <retro_log.h>
 
 static void frontend_ps3_exec(const char *path, bool should_load_game)
 {
diff --git a/frontend/drivers/platform_wii.c b/frontend/drivers/platform_wii.c
index 353d8a860b..db83ac5455 100644
--- a/frontend/drivers/platform_wii.c
+++ b/frontend/drivers/platform_wii.c
@@ -22,12 +22,14 @@
 #include <gctypes.h>
 #include <ogc/cache.h>
 #include "../../gfx/drivers/ppc_asm.h"
-#include <file/file_path.h>
-#include <retro_miscellaneous.h>
 #include <ogc/system.h>
 #include <ogc/usbstorage.h>
 #include <sdcard/wiisd_io.h>
 
+#include <retro_log.h>
+#include <file/file_path.h>
+#include <retro_miscellaneous.h>
+
 #define EXECUTE_ADDR ((uint8_t *) 0x91800000)
 #define BOOTER_ADDR  ((uint8_t *) 0x93000000)
 #define ARGS_ADDR    ((uint8_t *) 0x93200000)
@@ -37,8 +39,6 @@ extern uint8_t _binary_wii_app_booter_app_booter_bin_end[];
 #define booter_start _binary_wii_app_booter_app_booter_bin_start
 #define booter_end _binary_wii_app_booter_app_booter_bin_end
 
-#include "../../retroarch_logger.h"
-
 #ifdef IS_SALAMANDER
 char gx_rom_path[PATH_MAX_LENGTH];
 #endif
diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c
index 7084cccdef..ed27f1a4d2 100644
--- a/gfx/video_shader_driver.c
+++ b/gfx/video_shader_driver.c
@@ -13,10 +13,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "video_shader_driver.h"
-#include "../retroarch_logger.h"
 #include <string.h>
 
+#include <retro_log.h>
+
+#include "video_shader_driver.h"
+
 static const shader_backend_t *shader_ctx_drivers[] = {
 #ifdef HAVE_GLSL
    &gl_glsl_backend,
diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index 30319e999e..fc413769ef 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -34,12 +34,13 @@
 
 #include <windowsx.h>
 
+#include <retro_log.h>
+
 #include "../../general.h"
 #include "../input_autodetect.h"
 #include "../input_common.h"
 #include "../input_joypad.h"
 #include "../input_keymaps.h"
-#include "../../retroarch_logger.h"
 
 /* Keep track of which pad indexes are 360 controllers.
  * Not static, will be read in xinput_joypad.c
diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c
index 045cf70a6d..db13d7f441 100644
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@@ -16,18 +16,20 @@
 
 #include <dinput.h>
 
-#include "../../general.h"
-#include <boolean.h>
-#include "../input_autodetect.h"
-#include "../input_common.h"
-#include "../input_joypad.h"
-#include "../input_keymaps.h"
-#include "../../retroarch_logger.h"
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <windowsx.h>
 
+#include <retro_log.h>
+#include <boolean.h>
+
+#include "../../general.h"
+#include "../input_autodetect.h"
+#include "../input_common.h"
+#include "../input_joypad.h"
+#include "../input_keymaps.h"
+
 struct dinput_joypad
 {
    LPDIRECTINPUTDEVICE8 joypad;
diff --git a/retroarch_logger.h b/libretro-common/include/retro_log.h
similarity index 99%
rename from retroarch_logger.h
rename to libretro-common/include/retro_log.h
index f631f4f549..afe987381a 100644
--- a/retroarch_logger.h
+++ b/libretro-common/include/retro_log.h
@@ -42,11 +42,15 @@
 #include <compat/strl.h>
 
 #if defined(HAVE_FILE_LOGGER) && defined(RARCH_INTERNAL) && !defined(IS_JOYCONFIG)
+
 #ifdef __cplusplus
 extern "C"
 #endif
+
 FILE *rarch_main_log_file(void);
+
 #define LOG_FILE (rarch_main_log_file())
+
 #else
 #define LOG_FILE (stderr)
 #endif
diff --git a/libretro-common/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h
index 5d0337a9e8..5483f00192 100644
--- a/libretro-common/include/retro_miscellaneous.h
+++ b/libretro-common/include/retro_miscellaneous.h
@@ -45,10 +45,7 @@
 #endif
 #include <compat/msvc.h>
 
-#if defined(RARCH_INTERNAL) || defined(IS_SALAMANDER)
-/* TODO/FIXME - dirty hack */
-#include "../../retroarch_logger.h"
-#endif
+#include <retro_log.h>
 #include <retro_inline.h>
 #include <retro_endianness.h>
 #include <limits.h>
diff --git a/libretro_version_1.c b/libretro_version_1.c
index b3d9cfbe38..a2d00bdf1c 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -15,16 +15,19 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <boolean.h>
-#include "libretro.h"
-#include "dynamic.h"
-#include "libretro_version_1.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <retro_inline.h>
 #include <ctype.h>
 #include <errno.h>
+
+#include <retro_inline.h>
+#include <retro_log.h>
+#include <boolean.h>
+
+#include "libretro_version_1.h"
+#include "libretro.h"
+#include "dynamic.h"
 #include "general.h"
 #include "runloop.h"
 #include "runloop_data.h"
@@ -34,7 +37,6 @@
 #include "input/input_remapping.h"
 #include "audio/audio_driver.h"
 #include "audio/audio_utils.h"
-#include "retroarch_logger.h"
 #include "record/record_driver.h"
 #include "gfx/video_pixel_converter.h"
 #include "intl/intl.h"
diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index 75ef40a5bf..e1ec5cf099 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <limits.h>
 
+#include <retro_log.h>
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 
@@ -33,7 +34,6 @@
 #include "../../gfx/video_thread_wrapper.h"
 #include "../../gfx/font_driver.h"
 #include "../../gfx/video_texture.h"
-#include "../../retroarch_logger.h"
 
 #include "shared.h"
 
diff --git a/patch.c b/patch.c
index 07ac56a097..4d70158124 100644
--- a/patch.c
+++ b/patch.c
@@ -17,16 +17,19 @@
 /* BPS/UPS/IPS implementation from bSNES (nall::).
  * Modified for RetroArch. */
 
-#include <file/file_path.h>
-#include <boolean.h>
-#include <compat/msvc.h>
 #include <stdint.h>
 #include <string.h>
+
+#include <boolean.h>
+#include <retro_log.h>
+
+#include <compat/msvc.h>
+#include <file/file_path.h>
+#include <file/file_extract.h>
+
 #include "patch.h"
 #include "file_ops.h"
-#include <file/file_extract.h>
 #include "general.h"
-#include "retroarch_logger.h"
 
 enum bps_mode
 {
diff --git a/performance/performance_android.h b/performance/performance_android.h
index 93f15e205e..cebd9a14ba 100644
--- a/performance/performance_android.h
+++ b/performance/performance_android.h
@@ -28,34 +28,37 @@
 #ifndef CPU_FEATURES_H
 #define CPU_FEATURES_H
 
-#include <sys/cdefs.h>
 #include <stdint.h>
-#include "../retroarch_logger.h"
+#include <sys/cdefs.h>
 
-typedef enum {
-    ANDROID_CPU_FAMILY_UNKNOWN = 0,
-    ANDROID_CPU_FAMILY_ARM,
-    ANDROID_CPU_FAMILY_X86,
-    ANDROID_CPU_FAMILY_MIPS,
+#include <retro_log.h>
 
-    ANDROID_CPU_FAMILY_MAX  /* do not remove */
+typedef enum
+{
+   ANDROID_CPU_FAMILY_UNKNOWN = 0,
+   ANDROID_CPU_FAMILY_ARM,
+   ANDROID_CPU_FAMILY_X86,
+   ANDROID_CPU_FAMILY_MIPS,
 
+   ANDROID_CPU_FAMILY_MAX  /* do not remove */
 } AndroidCpuFamily;
 
 /* Return family of the device's CPU */
 extern AndroidCpuFamily   android_getCpuFamily(void);
 
-enum {
-    ANDROID_CPU_ARM_FEATURE_ARMv7       = (1 << 0),
-    ANDROID_CPU_ARM_FEATURE_VFPv3       = (1 << 1),
-    ANDROID_CPU_ARM_FEATURE_NEON        = (1 << 2),
-    ANDROID_CPU_ARM_FEATURE_LDREX_STREX = (1 << 3),
+enum
+{
+   ANDROID_CPU_ARM_FEATURE_ARMv7       = (1 << 0),
+   ANDROID_CPU_ARM_FEATURE_VFPv3       = (1 << 1),
+   ANDROID_CPU_ARM_FEATURE_NEON        = (1 << 2),
+   ANDROID_CPU_ARM_FEATURE_LDREX_STREX = (1 << 3)
 };
 
-enum {
-    ANDROID_CPU_X86_FEATURE_SSSE3  = (1 << 0),
-    ANDROID_CPU_X86_FEATURE_POPCNT = (1 << 1),
-    ANDROID_CPU_X86_FEATURE_MOVBE  = (1 << 2),
+enum
+{
+   ANDROID_CPU_X86_FEATURE_SSSE3  = (1 << 0),
+   ANDROID_CPU_X86_FEATURE_POPCNT = (1 << 1),
+   ANDROID_CPU_X86_FEATURE_MOVBE  = (1 << 2)
 };
 
 extern uint64_t    android_getCpuFeatures(void);
diff --git a/playlist.c b/playlist.c
index ed5a833d45..eafbd128f6 100644
--- a/playlist.c
+++ b/playlist.c
@@ -15,15 +15,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "playlist.h"
-#include <compat/posix_string.h>
-#include <boolean.h>
-#include "retroarch_logger.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <boolean.h>
+#include <compat/posix_string.h>
+#include <retro_log.h>
+
+#include "playlist.h"
+
 /**
  * content_playlist_get_index:
  * @playlist        	   : Playlist handle.
diff --git a/runloop.c b/runloop.c
index d9bd019ddc..c1b416f5e8 100644
--- a/runloop.c
+++ b/runloop.c
@@ -18,6 +18,7 @@
 
 #include <file/file_path.h>
 #include <retro_inline.h>
+#include <retro_log.h>
 
 #include <compat/strl.h>
 #include <rhash.h>
@@ -25,7 +26,6 @@
 #include "configuration.h"
 #include "dynamic.h"
 #include "performance.h"
-#include "retroarch_logger.h"
 #include "intl/intl.h"
 #include "retroarch.h"
 #include "runloop.h"
diff --git a/screenshot.c b/screenshot.c
index 5bdb27ec2e..05c83863bd 100644
--- a/screenshot.c
+++ b/screenshot.c
@@ -14,20 +14,31 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <compat/strl.h>
+#ifdef _XBOX1
+#include <xtl.h>
+#include <xgraphics.h>
+#endif
+
 #include <stdio.h>
 #include <stddef.h>
 #include <time.h>
 #include <boolean.h>
 #include <stdint.h>
 #include <string.h>
+
+#include <retro_log.h>
+#include <file/file_path.h>
+#include <compat/strl.h>
+
+#if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
+#include <formats/rpng.h>
+#endif
+
 #include "general.h"
 #include "intl/intl.h"
-#include <file/file_path.h>
 #include "gfx/scaler/scaler.h"
 #include "retroarch.h"
 #include "runloop.h"
-#include "retroarch_logger.h"
 #include "screenshot.h"
 #include "gfx/video_driver.h"
 #include "gfx/video_viewport.h"
@@ -36,17 +47,9 @@
 #include "config.h"
 #endif
 
-#ifdef _XBOX1
-#include <xtl.h>
-#include <xgraphics.h>
-#endif
-
 #if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
-#include <formats/rpng.h>
 #define IMG_EXT "png"
-
 #else
-
 #define IMG_EXT "bmp"
 
 static bool write_header_bmp(FILE *file, unsigned width, unsigned height)