diff --git a/Makefile.common b/Makefile.common
index a29c04dd0d..479ff725bd 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -205,7 +205,8 @@ OBJ += frontend/frontend.o \
        movie.o \
        record/record_driver.o \
        record/drivers/record_null.o \
-       performance.o
+       performance.o \
+		 verbosity.o
 
 ifneq ($(HAVE_GETOPT_LONG), 1)
 OBJ += libretro-common/compat/compat_getopt.o
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 746fc53a4a..43b1fb13fc 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -31,7 +31,8 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  libretro-common/string/string_list.c \
 				  libretro-common/compat/compat_strl.c \
 				  libretro-common/file/retro_file.c \
-				  libretro-common/file/config_file.c
+				  libretro-common/file/config_file.c \
+				  verbosity.c
 
 ifeq ($(HAVE_LOGGER), 1)
 PPU_CFLAGS		+= -DHAVE_LOGGER 
diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander
index 9c8b6725ba..7273afeb3e 100644
--- a/Makefile.psp1.salamander
+++ b/Makefile.psp1.salamander
@@ -44,6 +44,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/file/retro_file.o \
 		 libretro-common/file/retro_stat.o \
 		 libretro-common/hash/rhash.o \
+		 verbosity.o \
 		 bootstrap/psp1/kernel_functions.o 
 
 PSPSDK=$(shell psp-config --pspsdk-path)
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 68d9d56277..d52f5ab313 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -53,6 +53,7 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/file/retro_stat.o \
 		libretro-common/compat/compat_strl.o \
 		libretro-common/file/config_file.o \
+		verbosity.o \
 		$(APP_BOOTER_DIR)/app_booter.binobj
 
 ifeq ($(HAVE_LOGGER), 1)
diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index e3ca16f7df..656e74500d 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -21,6 +21,7 @@
 #include "audio_thread_wrapper.h"
 
 #include "../general.h"
+#include "../verbosity.h"
 #include "../string_list_special.h"
 
 #ifndef AUDIO_BUFFER_FREE_SAMPLES_COUNT
diff --git a/audio/audio_thread_wrapper.c b/audio/audio_thread_wrapper.c
index 2c1520d5f3..fb9d745607 100644
--- a/audio/audio_thread_wrapper.c
+++ b/audio/audio_thread_wrapper.c
@@ -14,14 +14,17 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "audio_thread_wrapper.h"
-#include <rthreads/rthreads.h>
-#include "../general.h"
-#include "../performance.h"
-#include <queues/fifo_buffer.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <queues/fifo_buffer.h>
+#include <rthreads/rthreads.h>
+
+#include "audio_thread_wrapper.h"
+#include "../general.h"
+#include "../performance.h"
+#include "../verbosity.h"
+
 typedef struct audio_thread
 {
    const audio_driver_t *driver;
diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c
index c3ed0a207c..e79ec029cd 100644
--- a/audio/drivers/alsa.c
+++ b/audio/drivers/alsa.c
@@ -19,6 +19,7 @@
 
 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 typedef struct alsa
 {
diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c
index d2ebb04ecf..c8819a5ace 100644
--- a/audio/drivers/alsathread.c
+++ b/audio/drivers/alsathread.c
@@ -23,6 +23,7 @@
 
 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 #define TRY_ALSA(x) if (x < 0) { \
                   goto error; \
diff --git a/audio/drivers/jack.c b/audio/drivers/jack.c
index 49cc67a06c..4ef0b8e276 100644
--- a/audio/drivers/jack.c
+++ b/audio/drivers/jack.c
@@ -28,6 +28,7 @@
 
 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 #define FRAMES(x) (x / (sizeof(float) * 2))
 
diff --git a/audio/drivers/openal.c b/audio/drivers/openal.c
index e8ce4495aa..133b3f469f 100644
--- a/audio/drivers/openal.c
+++ b/audio/drivers/openal.c
@@ -30,6 +30,7 @@
 
 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 #define BUFSIZE 1024
 
diff --git a/audio/drivers/oss.c b/audio/drivers/oss.c
index 8280a1ba16..2e4e360f1b 100644
--- a/audio/drivers/oss.c
+++ b/audio/drivers/oss.c
@@ -33,6 +33,7 @@
 
 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 #ifdef HAVE_OSS_BSD
 #define DEFAULT_OSS_DEV "/dev/audio"
diff --git a/audio/drivers/pulse.c b/audio/drivers/pulse.c
index 8c2fb0f3a9..77051ff635 100644
--- a/audio/drivers/pulse.c
+++ b/audio/drivers/pulse.c
@@ -23,6 +23,7 @@
 
 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 typedef struct
 {
diff --git a/audio/drivers/sdl_audio.c b/audio/drivers/sdl_audio.c
index bc43a5953a..f6703e606f 100644
--- a/audio/drivers/sdl_audio.c
+++ b/audio/drivers/sdl_audio.c
@@ -28,6 +28,7 @@
 
 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 typedef struct sdl_audio
 {
diff --git a/autosave.c b/autosave.c
index 194fe6c867..edd6b9706a 100644
--- a/autosave.c
+++ b/autosave.c
@@ -23,6 +23,7 @@
 #include <rthreads/rthreads.h>
 
 #include "general.h"
+#include "verbosity.h"
 
 struct autosave
 {
diff --git a/camera/camera_driver.c b/camera/camera_driver.c
index 9920a5b447..5bd90f9cc1 100644
--- a/camera/camera_driver.c
+++ b/camera/camera_driver.c
@@ -19,6 +19,7 @@
 #include "camera_driver.h"
 #include "../general.h"
 #include "../string_list_special.h"
+#include "../verbosity.h"
 
 static const camera_driver_t *camera_drivers[] = {
 #ifdef HAVE_V4L2
diff --git a/camera/drivers/video4linux2.c b/camera/drivers/video4linux2.c
index a8c6c8d972..f06a4a96ce 100644
--- a/camera/drivers/video4linux2.c
+++ b/camera/drivers/video4linux2.c
@@ -40,6 +40,7 @@
 
 #include "../../general.h"
 #include "../../performance.h"
+#include "../../verbosity.h"
 
 struct buffer
 {
diff --git a/cheats.c b/cheats.c
index 110308bb83..37faed1f28 100644
--- a/cheats.c
+++ b/cheats.c
@@ -27,6 +27,7 @@
 #include "general.h"
 #include "runloop.h"
 #include "dynamic.h"
+#include "verbosity.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/cheevos.c b/cheevos.c
index 266622996d..8ab78cac76 100644
--- a/cheevos.c
+++ b/cheevos.c
@@ -19,7 +19,6 @@
 #include <formats/jsonsax.h>
 #include <retro_file.h>
 #include <rhash.h>
-#include <retro_log.h>
 #include <rthreads/async_job.h>
 
 #include "cheevos.h"
@@ -29,6 +28,7 @@
 #include "performance.h"
 #include "runloop.h"
 #include "menu/menu.h"
+#include "verbosity.h"
 
 enum
 {
diff --git a/command.c b/command.c
index 6c6b9ab35c..981f1b5f34 100644
--- a/command.c
+++ b/command.c
@@ -38,6 +38,7 @@
 
 #include "general.h"
 #include "runloop.h"
+#include "verbosity.h"
 
 #define DEFAULT_NETWORK_CMD_PORT 55355
 #define STDIN_BUF_SIZE 4096
diff --git a/command_event.c b/command_event.c
index 40e88db212..ff309ff04d 100644
--- a/command_event.c
+++ b/command_event.c
@@ -32,6 +32,7 @@
 #include "cheevos.h"
 #endif
 
+#include "verbosity.h"
 #include "runloop_data.h"
 #include "configuration.h"
 #include "input/input_remapping.h"
diff --git a/configuration.c b/configuration.c
index 4f6ee0cc2d..4715ea385a 100644
--- a/configuration.c
+++ b/configuration.c
@@ -28,6 +28,7 @@
 #include "input/input_remapping.h"
 #include "general.h"
 #include "system.h"
+#include "verbosity.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/content.c b/content.c
index abbd7b233d..8ed7f0aab3 100644
--- a/content.c
+++ b/content.c
@@ -44,6 +44,7 @@
 #include "movie.h"
 #include "patch.h"
 #include "system.h"
+#include "verbosity.h"
 
 #ifdef HAVE_CHEEVOS
 #include "cheevos.h"
diff --git a/database_info.c b/database_info.c
index 92182f03d1..8471497bca 100644
--- a/database_info.c
+++ b/database_info.c
@@ -24,6 +24,7 @@
 #include "database_info.h"
 #include "msg_hash.h"
 #include "general.h"
+#include "verbosity.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/driver.c b/driver.c
index 5e028589e0..c7e906b2de 100644
--- a/driver.c
+++ b/driver.c
@@ -20,6 +20,7 @@
 #include "msg_hash.h"
 
 #include "msg_hash.h"
+#include "verbosity.h"
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"
diff --git a/dynamic.c b/dynamic.c
index 489fa8ad6a..58c217f5ed 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -18,7 +18,6 @@
 #include <ctype.h>
 
 #include <file/file_path.h>
-#include <retro_log.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 
@@ -36,6 +35,7 @@
 #include "configuration.h"
 #include "general.h"
 #include "msg_hash.h"
+#include "verbosity.h"
 
 #include "input/input_sensor.h"
 
diff --git a/file_ops.c b/file_ops.c
index 39b38594f6..887e95523e 100644
--- a/file_ops.c
+++ b/file_ops.c
@@ -38,6 +38,7 @@
 #include <encodings/utf.h>
 
 #include "file_ops.h"
+#include "verbosity.h"
 
 #ifdef HAVE_COMPRESSION
 #ifdef HAVE_7ZIP
diff --git a/file_path_special.c b/file_path_special.c
index 86f403e0cb..1f3eec3d7f 100644
--- a/file_path_special.c
+++ b/file_path_special.c
@@ -37,11 +37,14 @@
 #endif
 
 #include <file/file_path.h>
+
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <retro_assert.h>
 #include <retro_miscellaneous.h>
 
+#include "verbosity.h"
+
 void fill_pathname_expand_special(char *out_path,
       const char *in_path, size_t size)
 {
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index abe6964cef..3d247a828d 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -39,7 +39,6 @@
 #include <retro_dirent.h>
 #include <retro_inline.h>
 #include <retro_file.h>
-#include <retro_log.h>
 #include <compat/strl.h>
 #include <rhash.h>
 #include <file/file_path.h>
@@ -47,6 +46,7 @@
 #include "../frontend.h"
 #include "../frontend_driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "platform_linux.h"
 
 static bool                cpu_inited_once;
diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index 2e39db7912..dff32ea3a3 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -27,7 +27,6 @@
 
 #include <sys/process.h>
 
-#include <retro_log.h>
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
 #include <file/file_list.h>
@@ -35,6 +34,7 @@
 
 #include "../../defines/ps3_defines.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 #define EMULATOR_CONTENT_DIR "SSNE10000"
 
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 62f3646fb1..b3732e97d3 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -32,7 +32,6 @@ int scePowerSetArmClockFrequency(int freq);
 #endif
 
 #include <boolean.h>
-#include <retro_log.h>
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
 #include <file/file_list.h>
@@ -40,6 +39,7 @@ int scePowerSetArmClockFrequency(int freq);
 
 #include "../../defines/psp_defines.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 #if defined(HAVE_KERNEL_PRX) || defined(IS_SALAMANDER)
 #ifndef VITA
diff --git a/frontend/drivers/platform_wii.c b/frontend/drivers/platform_wii.c
index 8d2e77cf12..71b9eb150c 100644
--- a/frontend/drivers/platform_wii.c
+++ b/frontend/drivers/platform_wii.c
@@ -26,11 +26,11 @@
 #include <ogc/usbstorage.h>
 #include <sdcard/wiisd_io.h>
 
-#include <retro_log.h>
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
 
 #include "../../defines/gx_defines.h"
+#include "../../verbosity.h"
 
 #define EXECUTE_ADDR ((uint8_t *) 0x91800000)
 #define BOOTER_ADDR  ((uint8_t *) 0x93000000)
@@ -121,7 +121,6 @@ void system_exec_wii(const char *_path, bool should_load_game)
    char path[PATH_MAX_LENGTH];
    char game_path[PATH_MAX_LENGTH];
 #ifndef IS_SALAMANDER
-   global_t *global = global_get_ptr();
    bool *verbose    = retro_main_verbosity();
    bool original_verbose = *verbose;
    *verbose = true;
diff --git a/frontend/frontend.c b/frontend/frontend.c
index 88c6adb527..a9b1c46efb 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -26,6 +26,7 @@
 #include "../retroarch.h"
 #include "../runloop.h"
 #include "../runloop_data.h"
+#include "../verbosity.h"
 
 #define MAX_ARGS 32
 
diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c
index 2b20ab57e5..38eef70a15 100644
--- a/frontend/frontend_salamander.c
+++ b/frontend/frontend_salamander.c
@@ -19,7 +19,6 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <retro_log.h>
 #include <file/config_file.h>
 #include <file/file_path.h>
 #include <file/dir_list.h>
@@ -27,6 +26,7 @@
 #include "frontend_driver.h"
 #include "../general.h"
 #include "../file_ext.h"
+#include "../verbosity.h"
 
 struct defaults g_defaults;
 
diff --git a/gfx/common/d3d_common.cpp b/gfx/common/d3d_common.cpp
index a3ddfb5892..d197006d1c 100644
--- a/gfx/common/d3d_common.cpp
+++ b/gfx/common/d3d_common.cpp
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <retro_log.h>
+#include "../../verbosity.h"
 
 #include "d3d_common.h"
 
diff --git a/gfx/common/egl_common.c b/gfx/common/egl_common.c
index 9e80b174ef..1ed426e61c 100644
--- a/gfx/common/egl_common.c
+++ b/gfx/common/egl_common.c
@@ -14,7 +14,8 @@
  */
 
 #include <retro_assert.h>
-#include <retro_log.h>
+
+#include "../../verbosity.h"
 
 #include "egl_common.h"
 #ifdef HAVE_OPENGL
diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h
index 6b9072d084..0f8855c66b 100644
--- a/gfx/common/gl_common.h
+++ b/gfx/common/gl_common.h
@@ -31,6 +31,7 @@
 #include <formats/image.h>
 
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../font_renderer_driver.h"
 #include "../video_common.h"
 #include "../video_context_driver.h"
diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 087b91cfd2..160b4a79f4 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -25,6 +25,7 @@
 
 #include "x11_common.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 Colormap g_x11_cmap;
 Window   g_x11_win;
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index ebfb7b16e5..37555edf6e 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -26,6 +26,7 @@
 #include "../../general.h"
 #include "../../retroarch.h"
 #include "../../performance.h"
+#include "../../verbosity.h"
 #include "../video_context_driver.h"
 #include "../font_renderer_driver.h"
 
diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index af8e24f3c7..bde1e44e81 100644
--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@@ -31,6 +31,7 @@
 
 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../font_renderer_driver.h"
 
 #include "../common/x11_common.h"
diff --git a/gfx/drivers_font_renderer/stb.c b/gfx/drivers_font_renderer/stb.c
index 4bedfc22fe..c2e6826925 100644
--- a/gfx/drivers_font_renderer/stb.c
+++ b/gfx/drivers_font_renderer/stb.c
@@ -20,6 +20,7 @@
 
 #include "../font_renderer_driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../../file_ops.h"
 
 #define STB_TRUETYPE_IMPLEMENTATION
diff --git a/gfx/font_renderer_driver.c b/gfx/font_renderer_driver.c
index 0bb2f5e916..e9c2224294 100644
--- a/gfx/font_renderer_driver.c
+++ b/gfx/font_renderer_driver.c
@@ -15,6 +15,7 @@
  */
 
 #include "../general.h"
+#include "../verbosity.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/gfx/image/image.c b/gfx/image/image.c
index 6fc9d6aebd..ecf88c713f 100644
--- a/gfx/image/image.c
+++ b/gfx/image/image.c
@@ -27,6 +27,7 @@
 #include "../common/d3d_common.h"
 #endif
 #include "../../file_ops.h"
+#include "../../verbosity.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c
index 9cfee47bb3..6c47d772ef 100644
--- a/gfx/video_context_driver.c
+++ b/gfx/video_context_driver.c
@@ -14,14 +14,17 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../general.h"
-#include "video_context_driver.h"
 #include <string.h>
 
+#include "video_context_driver.h"
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
+#include "../general.h"
+#include "../verbosity.h"
+
 static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
 #if defined(__CELLOS_LV2__)
    &gfx_ctx_ps3,
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 4dc3be8ae1..a76ae247b7 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -31,6 +31,8 @@
 #include "../menu/menu_setting.h"
 #endif
 
+#include "../verbosity.h"
+
 #ifndef MEASURE_FRAME_TIME_SAMPLES_COUNT
 #define MEASURE_FRAME_TIME_SAMPLES_COUNT (2 * 1024)
 #endif
diff --git a/gfx/video_filter.c b/gfx/video_filter.c
index dca43bd448..9c38b4abca 100644
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@@ -24,6 +24,7 @@
 #include "../file_ext.h"
 #include "../general.h"
 #include "../performance.h"
+#include "../verbosity.h"
 #include "video_filter.h"
 #include "video_filters/softfilter.h"
 
diff --git a/gfx/video_pixel_converter.c b/gfx/video_pixel_converter.c
index a4e7b90e3a..86b3979984 100644
--- a/gfx/video_pixel_converter.c
+++ b/gfx/video_pixel_converter.c
@@ -20,6 +20,7 @@
 
 #include "../general.h"
 #include "../performance.h"
+#include "../verbosity.h"
 #include "video_pixel_converter.h"
 
 /* Used for 16-bit -> 16-bit conversions that take place before
diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c
index 4f0c0f98f9..ae4a9f180d 100644
--- a/gfx/video_shader_driver.c
+++ b/gfx/video_shader_driver.c
@@ -15,9 +15,8 @@
 
 #include <string.h>
 
-#include <retro_log.h>
-
 #include "video_shader_driver.h"
+#include "../verbosity.h"
 
 static const shader_backend_t *shader_ctx_drivers[] = {
 #ifdef HAVE_GLSL
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index 4230196ba1..aae1613244 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -24,6 +24,7 @@
 #include <rhash.h>
 
 #include "../general.h"
+#include "../verbosity.h"
 #include "video_shader_parse.h"
 
 /**
diff --git a/gfx/video_state_python.c b/gfx/video_state_python.c
index 9f127dea32..433e137b01 100644
--- a/gfx/video_state_python.c
+++ b/gfx/video_state_python.c
@@ -19,12 +19,14 @@
 #include <ctype.h>
 #include <string.h>
 
+#include <compat/strl.h>
+#include <compat/posix_string.h>
+
 #include "video_state_python.h"
 #include "../dynamic.h"
 #include "../libretro.h"
 #include "../general.h"
-#include <compat/strl.h>
-#include <compat/posix_string.h>
+#include "../verbosity.h"
 #include "../input/input_common.h"
 #include "../file_ops.h"
 
diff --git a/gfx/video_state_tracker.c b/gfx/video_state_tracker.c
index 2683a61fd8..76b97cbc83 100644
--- a/gfx/video_state_tracker.c
+++ b/gfx/video_state_tracker.c
@@ -20,6 +20,7 @@
 #include <retro_inline.h>
 #include "../general.h"
 #include "../input/input_common.h"
+#include "../verbosity.h"
 
 #ifdef HAVE_PYTHON
 #include "video_state_python.h"
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
index 3671c2629d..8458a1bf79 100644
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@@ -20,6 +20,7 @@
 
 #include "video_thread_wrapper.h"
 #include "../performance.h"
+#include "../verbosity.h"
 
 static void *thread_init_never_call(const video_info_t *video,
       const input_driver_t **input, void **input_data)
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 58f746bc82..356540f44f 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -24,6 +24,7 @@
 
 #include <compat/posix_string.h>
 
+#include "../verbosity.c"
 #if defined(HAVE_LOGGER) && !defined(ANDROID)
 #include "../netlogger.c"
 #endif
diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index 370719e77d..0a5ec7bbb9 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -34,9 +34,8 @@
 
 #include <windowsx.h>
 
-#include <retro_log.h>
-
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../input_autodetect.h"
 #include "../input_common.h"
 #include "../input_joypad.h"
diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c
index 56cf25ad3f..c8cc833ae2 100644
--- a/input/drivers/linuxraw_input.c
+++ b/input/drivers/linuxraw_input.c
@@ -24,6 +24,7 @@
 #include <boolean.h>
 
 #include "../../general.h"
+#include "../../verbosity.h"
 
 #include "../common/linux_common.h"
 #include "../input_keymaps.h"
diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c
index 99798aed6a..27d7fcb2ca 100644
--- a/input/drivers/sdl_input.c
+++ b/input/drivers/sdl_input.c
@@ -24,6 +24,7 @@
 #include "SDL.h"
 #include "../../gfx/video_context_driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../../libretro.h"
 #include "../input_autodetect.h"
 #include "../input_common.h"
diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index 2594a7436c..1e743fabf6 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -40,6 +40,7 @@
 #include "../input_joypad.h"
 #include "../input_keymaps.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c
index f719d6b8eb..c89557c0ed 100644
--- a/input/drivers/x11_input.c
+++ b/input/drivers/x11_input.c
@@ -28,6 +28,7 @@
 
 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 typedef struct x11_input
 {
diff --git a/input/drivers_hid/iohidmanager_hid.c b/input/drivers_hid/iohidmanager_hid.c
index 3ff8a203e3..71bb3f48b3 100644
--- a/input/drivers_hid/iohidmanager_hid.c
+++ b/input/drivers_hid/iohidmanager_hid.c
@@ -17,12 +17,11 @@
 #include <IOKit/hid/IOHIDManager.h>
 #include <IOKit/hid/IOHIDKeys.h>
 
-#include <retro_log.h>
-
 #include "../connect/joypad_connection.h"
 #include "../input_autodetect.h"
 #include "../input_hid_driver.h"
 #include "../../configuration.h"
+#include "../../verbosity.h"
 
 typedef struct apple_hid
 {
diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c
index efe38a5972..0400576bd3 100644
--- a/input/drivers_hid/libusb_hid.c
+++ b/input/drivers_hid/libusb_hid.c
@@ -18,11 +18,11 @@
 #include <rthreads/rthreads.h>
 #include <compat/strl.h>
 #include <queues/fifo_buffer.h>
-#include <retro_log.h>
 
 #include "../connect/joypad_connection.h"
 #include "../input_autodetect.h"
 #include "../input_hid_driver.h"
+#include "../../verbosity.h"
 
 #ifndef LIBUSB_CAP_HAS_HOTPLUG
 #define LIBUSB_CAP_HAS_HOTPLUG 0x0001
diff --git a/input/drivers_hid/wiiusb_hid.c b/input/drivers_hid/wiiusb_hid.c
index 3fdac3cc53..1627c01734 100644
--- a/input/drivers_hid/wiiusb_hid.c
+++ b/input/drivers_hid/wiiusb_hid.c
@@ -18,11 +18,11 @@
 #include <rthreads/rthreads.h>
 #include <compat/strl.h>
 #include <queues/fifo_buffer.h>
-#include <retro_log.h>
 
 #include "../connect/joypad_connection.h"
 #include "../input_autodetect.h"
 #include "../input_hid_driver.h"
+#include "../../verbosity.h"
 
 typedef struct wiiusb_hid
 {
diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c
index f0355c7068..488fdcd413 100644
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@@ -22,9 +22,9 @@
 #include <dinput.h>
 
 #include <boolean.h>
-#include <retro_log.h>
 
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../input_autodetect.h"
 #include "../input_common.h"
 #include "../input_joypad.h"
diff --git a/input/drivers_joypad/linuxraw_joypad.c b/input/drivers_joypad/linuxraw_joypad.c
index 9b6fad893c..20ecd4d802 100644
--- a/input/drivers_joypad/linuxraw_joypad.c
+++ b/input/drivers_joypad/linuxraw_joypad.c
@@ -27,6 +27,7 @@
 
 #include "../input_autodetect.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 #define NUM_BUTTONS 32
 #define NUM_AXES 32
diff --git a/input/drivers_joypad/parport_joypad.c b/input/drivers_joypad/parport_joypad.c
index 3806bb409a..115c46d26f 100644
--- a/input/drivers_joypad/parport_joypad.c
+++ b/input/drivers_joypad/parport_joypad.c
@@ -25,6 +25,7 @@
 
 #include "../input_autodetect.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 /* Linux parport driver does not support reading the control register
    Other platforms may support up to 17 buttons */
diff --git a/input/drivers_joypad/sdl_joypad.c b/input/drivers_joypad/sdl_joypad.c
index 16c9ad016d..47abd0d0df 100644
--- a/input/drivers_joypad/sdl_joypad.c
+++ b/input/drivers_joypad/sdl_joypad.c
@@ -17,6 +17,7 @@
 #include "../input_autodetect.h"
 #include "SDL.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 typedef struct _sdl_joypad
 {
diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c
index e4e39b51f5..4d34deeab1 100644
--- a/input/drivers_joypad/udev_joypad.c
+++ b/input/drivers_joypad/udev_joypad.c
@@ -31,6 +31,7 @@
 
 #include "../input_autodetect.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 
 /* Udev/evdev Linux joypad driver.
  * More complex and extremely low level,
diff --git a/input/input_autodetect.c b/input/input_autodetect.c
index 9e185bc9f2..1af5ba4e2c 100644
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@@ -25,6 +25,7 @@
 #include "input_autodetect.h"
 
 #include "../general.h"
+#include "../verbosity.h"
 
 static bool remote_is_bound = false;
 
diff --git a/input/input_common.c b/input/input_common.c
index 53a0403260..3c8021de01 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -24,6 +24,7 @@
 #include "input_keymaps.h"
 
 #include "../general.h"
+#include "../verbosity.h"
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
diff --git a/input/input_driver.c b/input/input_driver.c
index 0d09b66a93..b9aa16add9 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -18,6 +18,7 @@
 
 #include "../general.h"
 #include "../string_list_special.h"
+#include "../verbosity.h"
 
 static const input_driver_t *input_drivers[] = {
 #ifdef __CELLOS_LV2__
diff --git a/input/input_hid_driver.c b/input/input_hid_driver.c
index 9ce7570387..910a69f013 100644
--- a/input/input_hid_driver.c
+++ b/input/input_hid_driver.c
@@ -21,6 +21,7 @@
 #include "input_hid_driver.h"
 #include "../general.h"
 #include "../string_list_special.h"
+#include "../verbosity.h"
 
 static hid_driver_t *hid_drivers[] = {
 #if defined(HAVE_BTSTACK)
diff --git a/input/input_joypad_driver.c b/input/input_joypad_driver.c
index ace08f002d..f0418756dd 100644
--- a/input/input_joypad_driver.c
+++ b/input/input_joypad_driver.c
@@ -21,6 +21,7 @@
 #include "input_keymaps.h"
 #include "../general.h"
 #include "../string_list_special.h"
+#include "../verbosity.h"
 
 static input_device_driver_t *joypad_drivers[] = {
 #ifdef __CELLOS_LV2__
diff --git a/input/input_overlay.c b/input/input_overlay.c
index 1b23bd588c..7ddfe3b435 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -32,6 +32,7 @@
 #include "keyboard_line.h"
 
 #include "../configuration.h"
+#include "../verbosity.h"
 #include "input_common.h"
 
 #define BOX_RADIAL       0x18df06d2U
diff --git a/libretro-common/file/retro_file.c b/libretro-common/file/retro_file.c
index 8978bb038c..73ec9608f5 100644
--- a/libretro-common/file/retro_file.c
+++ b/libretro-common/file/retro_file.c
@@ -63,10 +63,6 @@
 #include <fcntl.h>
 #endif
 
-#ifdef RARCH_INTERNAL
-#include <retro_log.h>
-#endif
-
 #include <retro_file.h>
 #include <memmap.h>
 
@@ -227,12 +223,7 @@ RFILE *retro_fopen(const char *path, unsigned mode, ssize_t len)
          stream->mapped = (uint8_t*)mmap((void*)0, stream->mapsize, PROT_READ,  MAP_SHARED, stream->fd, 0);
 
          if (stream->mapped == MAP_FAILED)
-         {
-#ifdef RARCH_INTERNAL
-            RARCH_WARN("mmap()ing %s failed: %s\n", path, strerror(errno));
-#endif
             stream->hints &= ~RFILE_HINT_MMAP;
-         }
       }
 #endif
    }
@@ -480,13 +471,7 @@ int retro_read_file(const char *path, void **buf, ssize_t *len)
       goto error;
 
    if ((ret = retro_fread(file, content_buf, content_buf_size)) < content_buf_size)
-   {
-#ifdef RARCH_INTERNAL
-      RARCH_WARN("Didn't read whole file: %s.\n", path);
-#else
       printf("Didn't read whole file: %s.\n", path);
-#endif
-   }
 
    if (!content_buf)
       goto error;
diff --git a/libretro-common/include/retro_assert.h b/libretro-common/include/retro_assert.h
index 90c84c08f1..a4173edc0d 100644
--- a/libretro-common/include/retro_assert.h
+++ b/libretro-common/include/retro_assert.h
@@ -23,15 +23,11 @@
 #ifndef __RETRO_ASSERT_H
 #define __RETRO_ASSERT_H
 
-#ifdef RARCH_INTERNAL
-#include <retro_log.h>
-#else
 #include <assert.h>
-#endif
 
 #ifdef RARCH_INTERNAL
 #define retro_assert(cond) do { \
-   if (!(cond)) { RARCH_ERR("Assertion failed at %s:%d.\n", __FILE__, __LINE__); abort(); } \
+   if (!(cond)) { printf("Assertion failed at %s:%d.\n", __FILE__, __LINE__); abort(); } \
 } while(0)
 #else
 #define retro_assert(cond) assert(cond)
diff --git a/libretro_version_1.c b/libretro_version_1.c
index 5b0b79e383..e3e244ab13 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 
 #include <retro_inline.h>
-#include <retro_log.h>
 #include <boolean.h>
 
 #include "libretro.h"
@@ -35,6 +34,7 @@
 #include "input/input_remapping.h"
 #include "record/record_driver.h"
 #include "gfx/video_pixel_converter.h"
+#include "verbosity.h"
 
 #ifdef HAVE_NETPLAY
 #include "netplay.h"
diff --git a/location/location_driver.c b/location/location_driver.c
index aa369c09dd..f75cb33c2a 100644
--- a/location/location_driver.c
+++ b/location/location_driver.c
@@ -18,6 +18,7 @@
 
 #include "../general.h"
 #include "../string_list_special.h"
+#include "../verbosity.h"
 
 static const location_driver_t *location_drivers[] = {
 #ifdef ANDROID
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index aceb0565a5..c1ee2fe727 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -22,7 +22,6 @@
 #include <string/stdstring.h>
 #include <limits.h>
 
-#include <retro_log.h>
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 #include <formats/image.h>
@@ -40,6 +39,7 @@
 #include "../../configuration.h"
 #include "../../runloop.h"
 #include "../../runloop_data.h"
+#include "../../verbosity.h"
 
 enum
 {
diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index 8d98aad662..da3f6cee81 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -16,7 +16,6 @@
  */
 
 #include <compat/strl.h>
-#include <retro_log.h>
 
 #include "menu_generic.h"
 
@@ -34,6 +33,7 @@
 #include "../../cheevos.h"
 
 #include "../../runloop.h"
+#include "../../verbosity.h"
 
 static int action_iterate_help(char *s, size_t len, const char *label)
 {
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index ed7f739821..4f6d4f5650 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -23,7 +23,6 @@
 #include <file/file_path.h>
 #include <compat/posix_string.h>
 #include <compat/strl.h>
-#include <retro_log.h>
 #include <formats/image.h>
 #include <string/stdstring.h>
 #include <string/string_list.h>
@@ -41,6 +40,7 @@
 
 #include "../menu_cbs.h"
 
+#include "../../verbosity.h"
 #include "../../configuration.h"
 #include "../../file_ext.h"
 
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index 8f3d6b3e06..c6d41c62a0 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -27,7 +27,6 @@
 #include <gfx/math/matrix_4x4.h>
 #include <formats/image.h>
 #include <compat/strl.h>
-#include <retro_log.h>
 #include <retro_stat.h>
 
 #include "menu_generic.h"
@@ -47,6 +46,7 @@
 
 #include "../../configuration.h"
 #include "../../runloop.h"
+#include "../../verbosity.h"
 
 #if 0
 #define ZARCH_DEBUG
diff --git a/menu/intl/menu_hash_es.c b/menu/intl/menu_hash_es.c
index a76c944152..a5df95848d 100644
--- a/menu/intl/menu_hash_es.c
+++ b/menu/intl/menu_hash_es.c
@@ -18,6 +18,7 @@
 #include <string.h>
 
 #include <retro_assert.h>
+#include <compat/strl.h>
 
 #include "../../configuration.h"
 #include "../menu_hash.h"
diff --git a/menu/intl/menu_hash_pt.c b/menu/intl/menu_hash_pt.c
index 09a5458f8f..f2534f63cb 100644
--- a/menu/intl/menu_hash_pt.c
+++ b/menu/intl/menu_hash_pt.c
@@ -18,6 +18,7 @@
 #include <string.h>
 
 #include <retro_assert.h>
+#include <compat/strl.h>
 
 #include "../menu_hash.h"
 #include "../../configuration.h"
diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c
index 2a2bdcf636..8363b95121 100644
--- a/menu/menu_cbs.c
+++ b/menu/menu_cbs.c
@@ -15,11 +15,11 @@
 
 #include <compat/strl.h>
 #include <string/string_list.h>
-#include <retro_log.h>
 
 #include "menu.h"
 #include "menu_hash.h"
 #include "menu_cbs.h"
+#include "../verbosity.h"
 
 #if 0
 #define DEBUG_LOG
diff --git a/menu/menu_shader.c b/menu/menu_shader.c
index 08031bb3a2..6fd841c4c3 100644
--- a/menu/menu_shader.c
+++ b/menu/menu_shader.c
@@ -25,6 +25,7 @@
 #include "menu_shader.h"
 #include "../configuration.h"
 #include "../runloop.h"
+#include "../verbosity.h"
 
 /**
  * menu_shader_manager_init:
diff --git a/movie.c b/movie.c
index 1dd71175a1..f97580ff13 100644
--- a/movie.c
+++ b/movie.c
@@ -22,6 +22,7 @@
 #include <retro_endianness.h>
 
 #include "general.h"
+#include "verbosity.h"
 
 struct bsv_movie
 {
diff --git a/netlogger.c b/netlogger.c
index a92eb0becb..5b2c60a0de 100644
--- a/netlogger.c
+++ b/netlogger.c
@@ -26,7 +26,7 @@
 #include <retro_miscellaneous.h>
 #include <net/net_compat.h>
 
-#include <retro_log.h>
+#include "verbosity.h"
 
 #if !defined(PC_DEVELOPMENT_IP_ADDRESS)
 #error "An IP address for the PC logging server was not set in the Makefile, cannot continue."
diff --git a/netplay.c b/netplay.c
index 16c1e9d798..eb99b85e72 100644
--- a/netplay.c
+++ b/netplay.c
@@ -32,6 +32,7 @@
 #include "msg_hash.h"
 #include "system.h"
 #include "runloop.h"
+#include "verbosity.h"
 
 struct delta_frame
 {
diff --git a/patch.c b/patch.c
index e2eff32aec..4f90edd766 100644
--- a/patch.c
+++ b/patch.c
@@ -21,7 +21,6 @@
 #include <string.h>
 
 #include <boolean.h>
-#include <retro_log.h>
 
 #include <compat/msvc.h>
 #include <file/file_path.h>
@@ -30,6 +29,7 @@
 #include "patch.h"
 #include "file_ops.h"
 #include "general.h"
+#include "verbosity.h"
 
 enum bps_mode
 {
diff --git a/performance.c b/performance.c
index e35264c3e0..f1338a725a 100644
--- a/performance.c
+++ b/performance.c
@@ -19,6 +19,7 @@
 #include "performance.h"
 #include "general.h"
 #include "compat/strl.h"
+#include "verbosity.h"
 
 #ifdef _WIN32
 #define PERF_LOG_FMT "[PERF]: Avg (%s): %I64u ticks, %I64u runs.\n"
diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk
index 7d4ed2db94..ad1943cbb1 100644
--- a/pkg/android/phoenix/jni/Android.mk
+++ b/pkg/android/phoenix/jni/Android.mk
@@ -12,7 +12,8 @@ LOCAL_SRC_FILES := apk-extract/apk-extract.c \
 						$(RARCH_DIR)/libretro-common/string/string_list.c \
 						$(RARCH_DIR)/libretro-common/compat/compat_strl.c \
 						$(RARCH_DIR)/libretro-common/file/retro_file.c \
-						$(RARCH_DIR)/libretro-common/file/retro_stat.c
+						$(RARCH_DIR)/libretro-common/file/retro_stat.c \
+						$(RARCH_DIR)/verbosity.c
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
 
diff --git a/pkg/android/phoenix/jni/apk-extract/apk-extract.c b/pkg/android/phoenix/jni/apk-extract/apk-extract.c
index 850f5a726b..ef49aff309 100644
--- a/pkg/android/phoenix/jni/apk-extract/apk-extract.c
+++ b/pkg/android/phoenix/jni/apk-extract/apk-extract.c
@@ -10,13 +10,6 @@
 
 #include "../native/com_retroarch_browser_NativeInterface.h"
 
-//#define VERBOSE_LOG
-
-#ifndef VERBOSE_LOG
-#undef RARCH_LOG
-#define RARCH_LOG(...)
-#endif
-
 struct userdata
 {
    const char *subdir;
@@ -45,7 +38,7 @@ static int zlib_cb(const char *name, const char *valid_exts,
    if (!path_mkdir(path_dir))
       goto error;
 
-   RARCH_LOG("Extracting %s -> %s ...\n", name, path);
+   printf("Extracting %s -> %s ...\n", name, path);
 
    if (!zlib_perform_mode(path, valid_exts,
             cdata, cmode, csize, size, crc32, userdata))
@@ -54,7 +47,7 @@ static int zlib_cb(const char *name, const char *valid_exts,
    return 1;
 
 error:
-   RARCH_ERR("Failed to deflate to: %s.\n", path);
+   printf("Failed to deflate to: %s.\n", path);
    return 0;
 }
 
@@ -74,7 +67,7 @@ JNIEXPORT jboolean JNICALL Java_com_retroarch_browser_NativeInterface_extractArc
 
    if (!zlib_parse_file(archive_c, NULL, zlib_cb, &data))
    {
-      RARCH_ERR("Failed to parse APK: %s.\n", archive_c);
+      printf("Failed to parse APK: %s.\n", archive_c);
       ret = JNI_FALSE;
    }
 
diff --git a/playlist.c b/playlist.c
index eafbd128f6..428962d1e6 100644
--- a/playlist.c
+++ b/playlist.c
@@ -21,9 +21,9 @@
 
 #include <boolean.h>
 #include <compat/posix_string.h>
-#include <retro_log.h>
 
 #include "playlist.h"
+#include "verbosity.h"
 
 /**
  * content_playlist_get_index:
diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c
index e95e92250b..420517f3d8 100644
--- a/record/drivers/record_ffmpeg.c
+++ b/record/drivers/record_ffmpeg.c
@@ -60,6 +60,7 @@ extern "C" {
 #include <file/config_file.h>
 
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../../audio/audio_utils.h"
 #include "../record_driver.h"
 
diff --git a/record/record_driver.c b/record/record_driver.c
index 3a13d5ed3f..55d06bc51c 100644
--- a/record/record_driver.c
+++ b/record/record_driver.c
@@ -22,6 +22,7 @@
 
 #include "../driver.h"
 #include "../general.h"
+#include "../verbosity.h"
 #include "../msg_hash.h"
 #include "../string_list_special.h"
 
diff --git a/retroarch.c b/retroarch.c
index 3f40885f28..5929b1aed3 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -38,6 +38,7 @@
 #include <retro_stat.h>
 
 #include "msg_hash.h"
+#include "verbosity.h"
 
 #include "libretro_version_1.h"
 #include "configuration.h"
diff --git a/rewind.c b/rewind.c
index 12ab70bf56..fa4bef13ab 100644
--- a/rewind.c
+++ b/rewind.c
@@ -25,6 +25,7 @@
 #include "msg_hash.h"
 #include "rewind.h"
 #include "performance.h"
+#include "verbosity.h"
 
 /* This makes Valgrind throw errors if a core overflows its savestate size. */
 /* Keep it off unless you're chasing a core bug, it slows things down. */
diff --git a/runloop.c b/runloop.c
index 34157c76b9..6dcdf8d3ae 100644
--- a/runloop.c
+++ b/runloop.c
@@ -18,7 +18,6 @@
 
 #include <file/file_path.h>
 #include <retro_inline.h>
-#include <retro_log.h>
 
 #include <compat/strl.h>
 
@@ -44,12 +43,13 @@
 #include "netplay.h"
 #endif
 
+#include "verbosity.h"
+
 static struct global g_extern;
 
 static bool main_is_idle;
 static bool main_is_paused;
 static bool main_is_slowmotion;
-static bool main_verbosity;
 
 static unsigned main_max_frames;
 
@@ -767,11 +767,6 @@ static void rarch_main_iterate_linefeed_overlay(driver_t *driver,
 }
 #endif
 
-bool *retro_main_verbosity(void)
-{
-   return &main_verbosity;
-}
-
 FILE *retro_main_log_file(void)
 {
    global_t *global = global_get_ptr();
diff --git a/runloop.h b/runloop.h
index 687f96ec96..d89186f586 100644
--- a/runloop.h
+++ b/runloop.h
@@ -354,8 +354,6 @@ void rarch_main_msg_queue_free(void);
 
 void rarch_main_msg_queue_init(void);
 
-bool *retro_main_verbosity(void);
-
 FILE *retro_main_log_file(void);
 
 bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data);
diff --git a/runloop_data.c b/runloop_data.c
index 32b3d507d6..ddf8fc45d7 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -20,6 +20,7 @@
 #include <file/file_path.h>
 
 #include "general.h"
+#include "verbosity.h"
 
 #include "tasks/tasks.h"
 #include "input/input_overlay.h"
diff --git a/screenshot.c b/screenshot.c
index c96f152bdf..f50b709394 100644
--- a/screenshot.c
+++ b/screenshot.c
@@ -26,7 +26,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <retro_log.h>
 #include <retro_file.h>
 #include <file/file_path.h>
 #include <compat/strl.h>
@@ -45,6 +44,7 @@
 #include "gfx/scaler/scaler.h"
 #include "retroarch.h"
 #include "screenshot.h"
+#include "verbosity.h"
 #include "gfx/video_driver.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 3673ca5c93..43c257967c 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -27,6 +27,7 @@
 #include "../file_ops.h"
 #include "../msg_hash.h"
 #include "../general.h"
+#include "../verbosity.h"
 
 #define CB_DB_SCAN_FILE                0x70ce56d2U
 #define CB_DB_SCAN_FOLDER              0xde2bef8eU
diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index 2900126e07..72b10a4b2f 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -32,6 +32,7 @@
 #include "../file_ops.h"
 #include "../msg_hash.h"
 #include "../general.h"
+#include "../verbosity.h"
 
 #define MAGIC_LEN 16
 
diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c
index 335dc43c2c..eeb6430255 100644
--- a/tasks/task_file_transfer.c
+++ b/tasks/task_file_transfer.c
@@ -26,6 +26,7 @@
 #include <rhash.h>
 
 #include "tasks.h"
+#include "../verbosity.h"
 
 #define CB_MENU_WALLPAPER     0xb476e505U
 #define CB_MENU_BOXART        0x68b307cdU
diff --git a/tasks/task_http.c b/tasks/task_http.c
index 0367e8549f..7bb402516c 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -27,6 +27,7 @@
 #include "../file_ops.h"
 #include "../general.h"
 #include "../msg_hash.h"
+#include "../verbosity.h"
 #include "tasks.h"
 
 #define CB_CORE_UPDATER_DOWNLOAD       0x7412da7dU
diff --git a/verbosity.c b/verbosity.c
new file mode 100644
index 0000000000..2b3a5fc49c
--- /dev/null
+++ b/verbosity.c
@@ -0,0 +1,23 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "verbosity.h"
+
+static bool main_verbosity;
+
+bool *retro_main_verbosity(void)
+{
+   return &main_verbosity;
+}
diff --git a/libretro-common/include/retro_log.h b/verbosity.h
similarity index 92%
rename from libretro-common/include/retro_log.h
rename to verbosity.h
index 2ebffa728f..0baf442dbf 100644
--- a/libretro-common/include/retro_log.h
+++ b/verbosity.h
@@ -1,5 +1,4 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -14,8 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __RARCH_LOGGER_H
-#define __RARCH_LOGGER_H
+#ifndef __RARCH_VERBOSITY_H
+#define __RARCH_VERBOSITY_H
 
 #ifdef _XBOX1
 #include <xtl.h>
@@ -41,7 +40,13 @@
 #include <compat/posix_string.h>
 #include <compat/strl.h>
 
-#if defined(HAVE_FILE_LOGGER) && defined(RARCH_INTERNAL)
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool *retro_main_verbosity(void);
+
+#if defined(HAVE_FILE_LOGGER)
 
 #ifdef __cplusplus
 extern "C"
@@ -65,27 +70,21 @@ FILE *retro_main_log_file(void);
 #define PROGRAM_NAME "N/A"
 #endif
 
-#ifdef RARCH_INTERNAL
-#include "../../runloop.h"
-#endif
-
 static INLINE bool RARCH_LOG_VERBOSE(void)
 {
    bool *verbose = NULL;
-#ifdef RARCH_INTERNAL
    verbose = retro_main_verbosity();
-#endif
    if (!verbose)
       return false;
    return *verbose;
 }
 
-#if TARGET_OS_IPHONE && defined(RARCH_INTERNAL) && !TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
 static aslclient asl_client;
 static int asl_inited = 0;
 #endif
 
-#if defined(HAVE_LOGGER) && defined(RARCH_INTERNAL)
+#if defined(HAVE_LOGGER)
 
 #define BUFSIZE	(64 * 1024)
 #define TCPDUMP_STACKSIZE	(16 * 1024)
@@ -179,7 +178,7 @@ static INLINE void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
 {
    if (!RARCH_LOG_VERBOSE())
       return;
-#if TARGET_OS_IPHONE && defined(RARCH_INTERNAL)
+#if TARGET_OS_IPHONE
 #if TARGET_IPHONE_SIMULATOR
    vprintf(fmt, ap);
 #else
@@ -204,7 +203,7 @@ static INLINE void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
          fmt);
    wvsprintf(buffer, msg_new, ap);
    OutputDebugStringA(buffer);
-#elif defined(ANDROID) && defined(HAVE_LOGGER) && defined(RARCH_INTERNAL)
+#elif defined(ANDROID) && defined(HAVE_LOGGER)
    int prio = ANDROID_LOG_INFO;
    if (tag)
    {
@@ -274,5 +273,9 @@ static INLINE void RARCH_ERR(const char *fmt, ...)
 }
 #endif
 
+
+#ifdef __cplusplus
+}
 #endif
 
+#endif