diff --git a/Makefile.common b/Makefile.common
index 4c92c23fb5..a6bf00da77 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -343,7 +343,7 @@ ifeq ($(HAVE_QT), 1)
           ui/drivers/qt/coreinfodialog.o \
           ui/drivers/qt/playlistentrydialog.o \
           ui/drivers/qt/viewoptionsdialog.o \
-          ui/drivers/qt/playlist.o \
+          ui/drivers/qt/qt_playlist.o \
           ui/drivers/qt/updateretroarch.o \
           ui/drivers/qt/thumbnaildownload.o \
           ui/drivers/qt/thumbnailpackdownload.o \
diff --git a/deps/mbedtls/dhm.c b/deps/mbedtls/dhm.c
index c82926c713..241e0590ae 100644
--- a/deps/mbedtls/dhm.c
+++ b/deps/mbedtls/dhm.c
@@ -530,7 +530,7 @@ static int load_file( const char *path, unsigned char **buf, size_t *n )
     *n = (size_t) size;
 
     if( *n + 1 == 0 ||
-        ( *buf = mbedtls_calloc( 1, *n + 1 ) ) == NULL )
+        ( *buf = (unsigned char*)mbedtls_calloc( 1, *n + 1 ) ) == NULL )
     {
         fclose( f );
         return( MBEDTLS_ERR_DHM_ALLOC_FAILED );
diff --git a/deps/mbedtls/ecp.c b/deps/mbedtls/ecp.c
index 92df13da57..da49ad20d6 100644
--- a/deps/mbedtls/ecp.c
+++ b/deps/mbedtls/ecp.c
@@ -811,7 +811,7 @@ static int ecp_normalize_jac_many( const mbedtls_ecp_group *grp,
     }
 #endif
 
-    if( ( c = mbedtls_calloc( t_len, sizeof( mbedtls_mpi ) ) ) == NULL )
+    if( ( c = (mbedtls_mpi*)mbedtls_calloc( t_len, sizeof( mbedtls_mpi ) ) ) == NULL )
         return( MBEDTLS_ERR_ECP_ALLOC_FAILED );
 
     mbedtls_mpi_init( &u ); mbedtls_mpi_init( &Zi ); mbedtls_mpi_init( &ZZi );
@@ -1406,7 +1406,7 @@ static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
 
     if( T == NULL )
     {
-        T = mbedtls_calloc( pre_len, sizeof( mbedtls_ecp_point ) );
+        T = (mbedtls_ecp_point*)mbedtls_calloc( pre_len, sizeof( mbedtls_ecp_point ) );
         if( T == NULL )
         {
             ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
diff --git a/deps/mbedtls/net_sockets.c b/deps/mbedtls/net_sockets.c
index 60a307fbb1..9e319f40ad 100644
--- a/deps/mbedtls/net_sockets.c
+++ b/deps/mbedtls/net_sockets.c
@@ -578,7 +578,7 @@ int mbedtls_net_send( void *ctx, const unsigned char *buf, size_t len )
 
     if( ret < 0 )
     {
-        if( net_would_block( ctx ) != 0 )
+        if( net_would_block((const mbedtls_net_context*)ctx) != 0 )
             return( MBEDTLS_ERR_SSL_WANT_WRITE );
 
 #if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
diff --git a/dynamic.h b/dynamic.h
index 79b7d50fff..86685b1575 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -151,9 +151,9 @@ void uninit_libretro_sym(struct retro_core_t *core);
 /* Arbitrary 10 roms for each subsystem limit */
 #define SUBSYSTEM_MAX_SUBSYSTEM_ROMS 10
 
-struct retro_subsystem_info subsystem_data[SUBSYSTEM_MAX_SUBSYSTEMS];
-struct retro_subsystem_rom_info subsystem_data_roms[SUBSYSTEM_MAX_SUBSYSTEMS][SUBSYSTEM_MAX_SUBSYSTEM_ROMS];
-unsigned subsystem_current_count;
+extern struct retro_subsystem_info subsystem_data[SUBSYSTEM_MAX_SUBSYSTEMS];
+extern struct retro_subsystem_rom_info subsystem_data_roms[SUBSYSTEM_MAX_SUBSYSTEMS][SUBSYSTEM_MAX_SUBSYSTEM_ROMS];
+extern unsigned subsystem_current_count;
 
 RETRO_END_DECLS
 
diff --git a/gfx/common/d3d9_common.c b/gfx/common/d3d9_common.c
index ac0b567011..dd302671a4 100644
--- a/gfx/common/d3d9_common.c
+++ b/gfx/common/d3d9_common.c
@@ -601,7 +601,7 @@ void d3d9x_constant_table_set_matrix(LPDIRECT3DDEVICE9 dev,
 #if defined(HAVE_D3DX)
    LPD3DXCONSTANTTABLE consttbl = (LPD3DXCONSTANTTABLE)p;
    D3DXHANDLE        handle     = (D3DXHANDLE)data;
-   const D3DXMATRIX  *matrix    = (const D3DXMATRIX*)matrix;
+   const D3DXMATRIX  *matrix    = (const D3DXMATRIX*)_matrix;
    if (consttbl && dev && handle)
       consttbl->lpVtbl->SetMatrix(consttbl, dev, handle, matrix);
 #endif
diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c
index 079af6665a..2d5af2a9d1 100644
--- a/gfx/drivers/d3d9.c
+++ b/gfx/drivers/d3d9.c
@@ -1742,7 +1742,7 @@ static bool d3d9_read_viewport(void *data, uint8_t *buffer, bool is_idle)
       goto end;
    }
 
-   if (d3d9_surface_lock_rect(dest, (void*)&rect))
+   if (d3d9_surface_lock_rect(dest, &rect))
    {
       unsigned x, y;
       unsigned pitchpix       = rect.Pitch / 4;
@@ -1762,7 +1762,7 @@ static bool d3d9_read_viewport(void *data, uint8_t *buffer, bool is_idle)
          }
       }
 
-      d3d9_surface_unlock_rect((void*)dest);
+      d3d9_surface_unlock_rect(dest);
    }
    else
       ret = false;
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index e34561659f..6490d713c2 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -50,7 +50,7 @@ UI
 #include "../ui/drivers/qt/coreinfodialog.cpp"
 #include "../ui/drivers/qt/playlistentrydialog.cpp"
 #include "../ui/drivers/qt/viewoptionsdialog.cpp"
-#include "../ui/drivers/qt/playlist.cpp"
+#include "../ui/drivers/qt/qt_playlist.cpp"
 #include "../ui/drivers/qt/updateretroarch.cpp"
 #include "../ui/drivers/qt/thumbnaildownload.cpp"
 #include "../ui/drivers/qt/thumbnailpackdownload.cpp"
diff --git a/managers/cheat_manager.h b/managers/cheat_manager.h
index c1f4dbff15..14243f0451 100644
--- a/managers/cheat_manager.h
+++ b/managers/cheat_manager.h
@@ -186,7 +186,7 @@ struct cheat_manager
 
 typedef struct cheat_manager cheat_manager_t;
 
-cheat_manager_t cheat_manager_state;
+extern cheat_manager_t cheat_manager_state;
 
 unsigned cheat_manager_get_size(void);
 
diff --git a/ui/drivers/qt/playlist.cpp b/ui/drivers/qt/qt_playlist.cpp
similarity index 100%
rename from ui/drivers/qt/playlist.cpp
rename to ui/drivers/qt/qt_playlist.cpp