diff --git a/apple/common/apple_camera_ios.c.inl b/apple/common/apple_camera_ios.c.inl
index 8d68bc2c9f..1c889e927a 100644
--- a/apple/common/apple_camera_ios.c.inl
+++ b/apple/common/apple_camera_ios.c.inl
@@ -70,7 +70,7 @@ static bool ios_camera_poll(void *data, retro_camera_frame_raw_framebuffer_t fra
    return true;
 }
 
-const camera_driver_t camera_ios = {
+camera_driver_t camera_ios = {
    ios_camera_init,
    ios_camera_free,
    ios_camera_start,
diff --git a/apple/common/apple_location.c.inl b/apple/common/apple_location.c.inl
index 88988177b1..ac0d4bdc0d 100644
--- a/apple/common/apple_location.c.inl
+++ b/apple/common/apple_location.c.inl
@@ -71,7 +71,7 @@ fail:
    return false;
 }
 
-const location_driver_t location_apple = {
+location_driver_t location_apple = {
 	apple_location_init,
 	apple_location_free,
 	apple_location_start,
diff --git a/audio/alsa.c b/audio/alsa.c
index bd513fa256..1f5052221c 100644
--- a/audio/alsa.c
+++ b/audio/alsa.c
@@ -284,7 +284,7 @@ static size_t alsa_buffer_size(void *data)
    return alsa->buffer_size;
 }
 
-const audio_driver_t audio_alsa = {
+audio_driver_t audio_alsa = {
    alsa_init,
    alsa_write,
    alsa_stop,
diff --git a/audio/alsa_qsa.c b/audio/alsa_qsa.c
index 61e705a8a8..73bceff718 100644
--- a/audio/alsa_qsa.c
+++ b/audio/alsa_qsa.c
@@ -361,7 +361,7 @@ static size_t alsa_qsa_buffer_size(void *data)
    return alsa->buf_size * alsa->buf_count; 
 }
 
-const audio_driver_t audio_alsa = {
+audio_driver_t audio_alsa = {
    alsa_qsa_init,
    alsa_qsa_write,
    alsa_qsa_stop,
diff --git a/audio/alsathread.c b/audio/alsathread.c
index 9afa339aed..1c6bc11cb6 100644
--- a/audio/alsathread.c
+++ b/audio/alsathread.c
@@ -316,7 +316,7 @@ static size_t alsa_thread_buffer_size(void *data)
    return alsa->buffer_size;
 }
 
-const audio_driver_t audio_alsathread = {
+audio_driver_t audio_alsathread = {
    alsa_thread_init,
    alsa_thread_write,
    alsa_thread_stop,
diff --git a/audio/coreaudio.c b/audio/coreaudio.c
index 56cf6d4c72..d9f3a43bc9 100644
--- a/audio/coreaudio.c
+++ b/audio/coreaudio.c
@@ -402,7 +402,7 @@ static size_t coreaudio_buffer_size(void *data)
    return dev->buffer_size;
 }
 
-const audio_driver_t audio_coreaudio = {
+audio_driver_t audio_coreaudio = {
    coreaudio_init,
    coreaudio_write,
    coreaudio_stop,
@@ -414,4 +414,3 @@ const audio_driver_t audio_coreaudio = {
    coreaudio_write_avail,
    coreaudio_buffer_size,
 };
-
diff --git a/audio/dsound.c b/audio/dsound.c
index 2003a8ef14..7c757b7e2e 100644
--- a/audio/dsound.c
+++ b/audio/dsound.c
@@ -457,7 +457,7 @@ static bool dsound_use_float(void *data)
    return false;
 }
 
-const audio_driver_t audio_dsound = {
+audio_driver_t audio_dsound = {
    dsound_init,
    dsound_write,
    dsound_stop,
@@ -469,4 +469,3 @@ const audio_driver_t audio_dsound = {
    dsound_write_avail,
    dsound_buffer_size,
 };
-
diff --git a/audio/gx_audio.c b/audio/gx_audio.c
index 76411ef89e..d2d2b3f4b8 100644
--- a/audio/gx_audio.c
+++ b/audio/gx_audio.c
@@ -220,7 +220,7 @@ static bool gx_audio_use_float(void *data)
    return false;
 }
 
-const audio_driver_t audio_gx = {
+audio_driver_t audio_gx = {
    gx_audio_init,
    gx_audio_write,
    gx_audio_stop,
diff --git a/audio/jack.c b/audio/jack.c
index 26f5d239a4..059e358c47 100644
--- a/audio/jack.c
+++ b/audio/jack.c
@@ -330,7 +330,7 @@ static size_t ja_buffer_size(void *data)
    return jd->buffer_size;
 }
 
-const audio_driver_t audio_jack = {
+audio_driver_t audio_jack = {
    ja_init,
    ja_write,
    ja_stop,
@@ -342,4 +342,3 @@ const audio_driver_t audio_jack = {
    ja_write_avail,
    ja_buffer_size,
 };
-
diff --git a/audio/nullaudio.c b/audio/nullaudio.c
index 36647edd73..18b55872e3 100644
--- a/audio/nullaudio.c
+++ b/audio/nullaudio.c
@@ -61,7 +61,7 @@ static bool null_audio_use_float(void *data)
    return true;
 }
 
-const audio_driver_t audio_null = {
+audio_driver_t audio_null = {
    null_audio_init,
    null_audio_write,
    null_audio_stop,
@@ -73,4 +73,3 @@ const audio_driver_t audio_null = {
    NULL,
    NULL
 };
-
diff --git a/audio/openal.c b/audio/openal.c
index db6ffc66f0..2cf43d9fef 100644
--- a/audio/openal.c
+++ b/audio/openal.c
@@ -239,7 +239,7 @@ static bool al_use_float(void *data)
    return false;
 }
 
-const audio_driver_t audio_openal = {
+audio_driver_t audio_openal = {
    al_init,
    al_write,
    al_stop,
@@ -251,4 +251,3 @@ const audio_driver_t audio_openal = {
    al_write_avail,
    al_buffer_size,
 };
-
diff --git a/audio/opensl.c b/audio/opensl.c
index 12f43e3f3d..bf520ef5e8 100644
--- a/audio/opensl.c
+++ b/audio/opensl.c
@@ -284,7 +284,7 @@ static bool sl_use_float(void *data)
    return false;
 }
 
-const audio_driver_t audio_opensl = {
+audio_driver_t audio_opensl = {
    sl_init,
    sl_write,
    sl_stop,
@@ -296,4 +296,3 @@ const audio_driver_t audio_opensl = {
    sl_write_avail,
    sl_buffer_size,
 };
-
diff --git a/audio/oss.c b/audio/oss.c
index 44d2057391..b633c24fc8 100644
--- a/audio/oss.c
+++ b/audio/oss.c
@@ -187,7 +187,7 @@ static bool oss_use_float(void *data)
    return false;
 }
 
-const audio_driver_t audio_oss = {
+audio_driver_t audio_oss = {
    oss_init,
    oss_write,
    oss_stop,
@@ -199,4 +199,3 @@ const audio_driver_t audio_oss = {
    oss_write_avail,
    oss_buffer_size,
 };
-
diff --git a/audio/ps3_audio.c b/audio/ps3_audio.c
index 5cbdb5fab2..cfc39b2579 100644
--- a/audio/ps3_audio.c
+++ b/audio/ps3_audio.c
@@ -218,7 +218,7 @@ static bool ps3_audio_use_float(void *data)
    return true;
 }
 
-const audio_driver_t audio_ps3 = {
+audio_driver_t audio_ps3 = {
    ps3_audio_init,
    ps3_audio_write,
    ps3_audio_stop,
@@ -230,4 +230,3 @@ const audio_driver_t audio_ps3 = {
    NULL,
    NULL
 };
-
diff --git a/audio/psp1_audio.c b/audio/psp1_audio.c
index aea6cedc49..4f7915592d 100644
--- a/audio/psp1_audio.c
+++ b/audio/psp1_audio.c
@@ -217,7 +217,7 @@ static size_t psp_buffer_size(void *data)
 }
 
 
-const audio_driver_t audio_psp1 = {
+audio_driver_t audio_psp1 = {
    psp_audio_init,
    psp_audio_write,
    psp_audio_stop,
diff --git a/audio/pulse.c b/audio/pulse.c
index e3c4d5ca67..0b4ed54068 100644
--- a/audio/pulse.c
+++ b/audio/pulse.c
@@ -298,7 +298,7 @@ static size_t pulse_buffer_size(void *data)
    return pa->buffer_size;
 }
 
-const audio_driver_t audio_pulse = {
+audio_driver_t audio_pulse = {
    pulse_init,
    pulse_write,
    pulse_stop,
@@ -310,4 +310,3 @@ const audio_driver_t audio_pulse = {
    pulse_write_avail,
    pulse_buffer_size,
 };
-
diff --git a/audio/roar.c b/audio/roar.c
index 836338cb2f..9c970cfcc8 100644
--- a/audio/roar.c
+++ b/audio/roar.c
@@ -109,7 +109,7 @@ static bool ra_use_float(void *data)
    return false;
 }
 
-const audio_driver_t audio_roar = {
+audio_driver_t audio_roar = {
    ra_init,
    ra_write,
    ra_stop,
diff --git a/audio/rsound.c b/audio/rsound.c
index b958c2a41d..c7819ab326 100644
--- a/audio/rsound.c
+++ b/audio/rsound.c
@@ -203,7 +203,7 @@ static bool rs_use_float(void *data)
    return false;
 }
 
-const audio_driver_t audio_rsound = {
+audio_driver_t audio_rsound = {
    rs_init,
    rs_write,
    rs_stop,
@@ -215,4 +215,3 @@ const audio_driver_t audio_rsound = {
    rs_write_avail,
    rs_buffer_size,
 };
-   
diff --git a/audio/rwebaudio.c b/audio/rwebaudio.c
index 23fa87e656..8e04c73429 100644
--- a/audio/rwebaudio.c
+++ b/audio/rwebaudio.c
@@ -75,7 +75,7 @@ static size_t rwebaudio_buffer_size(void *data)
    return RWebAudioBufferSize();
 }
 
-const audio_driver_t audio_rwebaudio = {
+audio_driver_t audio_rwebaudio = {
    rwebaudio_init,
    rwebaudio_write,
    rwebaudio_stop,
@@ -87,4 +87,3 @@ const audio_driver_t audio_rwebaudio = {
    rwebaudio_write_avail,
    rwebaudio_buffer_size,
 };
-
diff --git a/audio/sdl_audio.c b/audio/sdl_audio.c
index 79a2ec7ac7..7fcd125840 100644
--- a/audio/sdl_audio.c
+++ b/audio/sdl_audio.c
@@ -196,7 +196,7 @@ static bool sdl_use_float(void *data)
    return false;
 }
 
-const audio_driver_t audio_sdl = {
+audio_driver_t audio_sdl = {
    sdl_audio_init,
    sdl_audio_write,
    sdl_audio_stop,
@@ -212,4 +212,3 @@ const audio_driver_t audio_sdl = {
    NULL,
    NULL
 };
-   
diff --git a/audio/xaudio.c b/audio/xaudio.c
index 2014b9b9ef..8978e501f9 100644
--- a/audio/xaudio.c
+++ b/audio/xaudio.c
@@ -125,7 +125,7 @@ static size_t xa_buffer_size(void *data)
    return xa->bufsize;
 }
 
-const audio_driver_t audio_xa = {
+audio_driver_t audio_xa = {
    xa_init,
    xa_write,
    xa_stop,
diff --git a/audio/xenon360_audio.c b/audio/xenon360_audio.c
index a4bb47bb08..e71df95891 100644
--- a/audio/xenon360_audio.c
+++ b/audio/xenon360_audio.c
@@ -114,7 +114,7 @@ static bool xenon360_use_float(void *data)
    return false;
 }
 
-const audio_driver_t audio_xenon360 = {
+audio_driver_t audio_xenon360 = {
    xenon360_audio_init,
    xenon360_audio_write,
    xenon360_audio_stop,
@@ -126,4 +126,3 @@ const audio_driver_t audio_xenon360 = {
    NULL,
    NULL
 };
-
diff --git a/camera/android.c b/camera/android.c
index 441d7ebf58..ad746304d2 100644
--- a/camera/android.c
+++ b/camera/android.c
@@ -187,7 +187,7 @@ static bool android_camera_poll(void *data,
    return false;
 }
 
-const camera_driver_t camera_android = {
+camera_driver_t camera_android = {
    android_camera_init,
    android_camera_free,
    android_camera_start,
@@ -195,4 +195,3 @@ const camera_driver_t camera_android = {
    android_camera_poll,
    "android",
 };
-
diff --git a/camera/nullcamera.c b/camera/nullcamera.c
index 722486de64..d44910976c 100644
--- a/camera/nullcamera.c
+++ b/camera/nullcamera.c
@@ -40,7 +40,7 @@ static bool nullcamera_poll(void *data, retro_camera_frame_raw_framebuffer_t fra
    return true;
 }
 
-const camera_driver_t camera_null = {
+camera_driver_t camera_null = {
    nullcamera_init,
    nullcamera_free,
    nullcamera_start,
diff --git a/camera/rwebcam.c b/camera/rwebcam.c
index 44657754be..26fcb5b355 100644
--- a/camera/rwebcam.c
+++ b/camera/rwebcam.c
@@ -43,7 +43,7 @@ static bool rwebcam_poll(void *data, retro_camera_frame_raw_framebuffer_t frame_
    return RWebCamPoll(data, frame_raw_cb, frame_gl_cb);
 }
 
-const camera_driver_t camera_rwebcam = {
+camera_driver_t camera_rwebcam = {
    rwebcam_init,
    rwebcam_free,
    rwebcam_start,
diff --git a/camera/video4linux2.c b/camera/video4linux2.c
index 85ae073172..928c090902 100644
--- a/camera/video4linux2.c
+++ b/camera/video4linux2.c
@@ -434,7 +434,7 @@ static bool v4l_poll(void *data,
       return false;
 }
 
-const camera_driver_t camera_v4l2 = {
+camera_driver_t camera_v4l2 = {
    v4l_init,
    v4l_free,
    v4l_start,
@@ -442,4 +442,3 @@ const camera_driver_t camera_v4l2 = {
    v4l_poll,
    "video4linux2",
 };
-
diff --git a/driver.h b/driver.h
index c9cf86a833..7ca66b58c8 100644
--- a/driver.h
+++ b/driver.h
@@ -588,75 +588,79 @@ bool driver_update_system_av_info(const struct retro_system_av_info *info);
 extern driver_t driver;
 
 /* Backends */
-extern const audio_driver_t audio_rsound;
-extern const audio_driver_t audio_oss;
-extern const audio_driver_t audio_alsa;
-extern const audio_driver_t audio_alsathread;
-extern const audio_driver_t audio_roar;
-extern const audio_driver_t audio_openal;
-extern const audio_driver_t audio_opensl;
-extern const audio_driver_t audio_jack;
-extern const audio_driver_t audio_sdl;
-extern const audio_driver_t audio_xa;
-extern const audio_driver_t audio_pulse;
-extern const audio_driver_t audio_dsound;
-extern const audio_driver_t audio_coreaudio;
-extern const audio_driver_t audio_xenon360;
-extern const audio_driver_t audio_ps3;
-extern const audio_driver_t audio_gx;
-extern const audio_driver_t audio_psp1;
-extern const audio_driver_t audio_rwebaudio;
-extern const audio_driver_t audio_null;
-extern const video_driver_t video_gl;
-extern const video_driver_t video_psp1;
-extern const video_driver_t video_vita;
-extern const video_driver_t video_d3d;
-extern const video_driver_t video_gx;
-extern const video_driver_t video_xenon360;
-extern const video_driver_t video_xvideo;
-extern const video_driver_t video_xdk_d3d;
-extern const video_driver_t video_sdl;
-extern const video_driver_t video_sdl2;
-extern const video_driver_t video_vg;
-extern const video_driver_t video_null;
-extern const video_driver_t video_omap;
-extern const video_driver_t video_exynos;
-extern const input_driver_t input_android;
-extern const input_driver_t input_sdl;
-extern const input_driver_t input_dinput;
-extern const input_driver_t input_x;
-extern const input_driver_t input_wayland;
-extern const input_driver_t input_ps3;
-extern const input_driver_t input_psp;
-extern const input_driver_t input_xenon360;
-extern const input_driver_t input_gx;
-extern const input_driver_t input_xinput;
-extern const input_driver_t input_linuxraw;
-extern const input_driver_t input_udev;
-extern const input_driver_t input_apple;
-extern const input_driver_t input_qnx;
-extern const input_driver_t input_rwebinput;
-extern const input_driver_t input_null;
-extern const camera_driver_t camera_v4l2;
-extern const camera_driver_t camera_android;
-extern const camera_driver_t camera_rwebcam;
-extern const camera_driver_t camera_ios;
-extern const camera_driver_t camera_null;
-extern const location_driver_t location_apple;
-extern const location_driver_t location_android;
-extern const location_driver_t location_null;
+extern audio_driver_t audio_rsound;
+extern audio_driver_t audio_oss;
+extern audio_driver_t audio_alsa;
+extern audio_driver_t audio_alsathread;
+extern audio_driver_t audio_roar;
+extern audio_driver_t audio_openal;
+extern audio_driver_t audio_opensl;
+extern audio_driver_t audio_jack;
+extern audio_driver_t audio_sdl;
+extern audio_driver_t audio_xa;
+extern audio_driver_t audio_pulse;
+extern audio_driver_t audio_dsound;
+extern audio_driver_t audio_coreaudio;
+extern audio_driver_t audio_xenon360;
+extern audio_driver_t audio_ps3;
+extern audio_driver_t audio_gx;
+extern audio_driver_t audio_psp1;
+extern audio_driver_t audio_rwebaudio;
+extern audio_driver_t audio_null;
 
-extern const input_osk_driver_t input_ps3_osk;
-extern const input_osk_driver_t input_null_osk;
+extern video_driver_t video_gl;
+extern video_driver_t video_psp1;
+extern video_driver_t video_vita;
+extern video_driver_t video_d3d;
+extern video_driver_t video_gx;
+extern video_driver_t video_xenon360;
+extern video_driver_t video_xvideo;
+extern video_driver_t video_xdk_d3d;
+extern video_driver_t video_sdl;
+extern video_driver_t video_sdl2;
+extern video_driver_t video_vg;
+extern video_driver_t video_null;
+extern video_driver_t video_omap;
+extern video_driver_t video_exynos;
 
-extern const menu_ctx_driver_t menu_ctx_rmenu;
-extern const menu_ctx_driver_t menu_ctx_rmenu_xui;
-extern const menu_ctx_driver_t menu_ctx_rgui;
-extern const menu_ctx_driver_t menu_ctx_glui;
-extern const menu_ctx_driver_t menu_ctx_lakka;
+extern input_driver_t input_android;
+extern input_driver_t input_sdl;
+extern input_driver_t input_dinput;
+extern input_driver_t input_x;
+extern input_driver_t input_wayland;
+extern input_driver_t input_ps3;
+extern input_driver_t input_psp;
+extern input_driver_t input_xenon360;
+extern input_driver_t input_gx;
+extern input_driver_t input_xinput;
+extern input_driver_t input_linuxraw;
+extern input_driver_t input_udev;
+extern input_driver_t input_apple;
+extern input_driver_t input_qnx;
+extern input_driver_t input_rwebinput;
+extern input_driver_t input_null;
 
-extern const menu_ctx_driver_backend_t menu_ctx_backend_common;
-extern const menu_ctx_driver_backend_t menu_ctx_backend_lakka;
+extern camera_driver_t camera_v4l2;
+extern camera_driver_t camera_android;
+extern camera_driver_t camera_rwebcam;
+extern camera_driver_t camera_ios;
+extern camera_driver_t camera_null;
+
+extern location_driver_t location_apple;
+extern location_driver_t location_android;
+extern location_driver_t location_null;
+
+extern input_osk_driver_t input_ps3_osk;
+extern input_osk_driver_t input_null_osk;
+
+extern menu_ctx_driver_t menu_ctx_rmenu;
+extern menu_ctx_driver_t menu_ctx_rmenu_xui;
+extern menu_ctx_driver_t menu_ctx_rgui;
+extern menu_ctx_driver_t menu_ctx_glui;
+extern menu_ctx_driver_t menu_ctx_lakka;
+
+extern menu_ctx_driver_backend_t menu_ctx_backend_common;
+extern menu_ctx_driver_backend_t menu_ctx_backend_lakka;
 
 static inline bool input_key_pressed_func(int key)
 {
diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index a2f7124290..58eea647e7 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -1739,7 +1739,7 @@ static void menu_common_setting_set_label(char *type_str,
          type, menu_label, label, index);
 }
 
-const menu_ctx_driver_backend_t menu_ctx_backend_common = {
+menu_ctx_driver_backend_t menu_ctx_backend_common = {
    menu_common_iterate,
 #ifdef HAVE_SHADER_MANAGER
    menu_common_shader_manager_init,
diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c
index 404bad6d55..a6b854aa77 100644
--- a/frontend/menu/backend/menu_lakka_backend.c
+++ b/frontend/menu/backend/menu_lakka_backend.c
@@ -427,7 +427,7 @@ static int menu_lakka_iterate(unsigned action)
    return 0;
 }
 
-const menu_ctx_driver_backend_t menu_ctx_backend_lakka = {
+menu_ctx_driver_backend_t menu_ctx_backend_lakka = {
    menu_lakka_iterate,
 //#ifndef HAVE_SHADER_MANAGER
    NULL,
diff --git a/frontend/menu/disp/glui.c b/frontend/menu/disp/glui.c
index b99d084f93..58efe9dabc 100644
--- a/frontend/menu/disp/glui.c
+++ b/frontend/menu/disp/glui.c
@@ -311,7 +311,7 @@ static void glui_context_reset(void *data)
       g_settings.video.font_size);
 }
 
-const menu_ctx_driver_t menu_ctx_glui = {
+menu_ctx_driver_t menu_ctx_glui = {
    NULL,
    NULL,
    NULL,
diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c
index 3e65870f4d..16044dc0bf 100644
--- a/frontend/menu/disp/lakka.c
+++ b/frontend/menu/disp/lakka.c
@@ -1150,7 +1150,7 @@ static void *lakka_init(void)
    return menu;
 }
 
-const menu_ctx_driver_t menu_ctx_lakka = {
+menu_ctx_driver_t menu_ctx_lakka = {
    NULL,
    NULL,
    NULL,
diff --git a/frontend/menu/disp/rgui.c b/frontend/menu/disp/rgui.c
index c35640f736..276278fc3b 100644
--- a/frontend/menu/disp/rgui.c
+++ b/frontend/menu/disp/rgui.c
@@ -469,7 +469,7 @@ void rgui_set_texture(void *data)
             menu_framebuf, false, menu->width, menu->height, 1.0f);
 }
 
-const menu_ctx_driver_t menu_ctx_rgui = {
+menu_ctx_driver_t menu_ctx_rgui = {
    rgui_set_texture,
    rgui_render_messagebox,
    rgui_render,
diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c
index e7f273f144..12cd0d142e 100644
--- a/frontend/menu/disp/rmenu.c
+++ b/frontend/menu/disp/rmenu.c
@@ -341,7 +341,7 @@ static int rmenu_input_postprocess(uint64_t old_state)
    return 0;
 }
 
-const menu_ctx_driver_t menu_ctx_rmenu = {
+menu_ctx_driver_t menu_ctx_rmenu = {
    rmenu_set_texture,
    rmenu_render_messagebox,
    rmenu_render,
diff --git a/frontend/menu/disp/rmenu_xui.cpp b/frontend/menu/disp/rmenu_xui.cpp
index 8a44784af6..f14f863606 100644
--- a/frontend/menu/disp/rmenu_xui.cpp
+++ b/frontend/menu/disp/rmenu_xui.cpp
@@ -531,7 +531,7 @@ static void rmenu_xui_list_set_selection(void *data)
       XuiListSetCurSel(m_menulist, file_list_get_directory_ptr(list));
 }
 
-const menu_ctx_driver_t menu_ctx_rmenu_xui = {
+menu_ctx_driver_t menu_ctx_rmenu_xui = {
    NULL,
    rmenu_xui_render_messagebox,
    rmenu_xui_render,
diff --git a/gfx/d3d9/d3d.cpp b/gfx/d3d9/d3d.cpp
index 48b94d3118..7a7c53323e 100644
--- a/gfx/d3d9/d3d.cpp
+++ b/gfx/d3d9/d3d.cpp
@@ -1255,7 +1255,7 @@ static void *d3d_init(const video_info_t *info, const input_driver_t **input,
    return vid;
 }
 
-const video_driver_t video_d3d = {
+video_driver_t video_d3d = {
    d3d_init,
    d3d_frame,
    d3d_set_nonblock_state,
diff --git a/gfx/d3d9/xdk_d3d.cpp b/gfx/d3d9/xdk_d3d.cpp
index d67450c20b..7177b9c0af 100644
--- a/gfx/d3d9/xdk_d3d.cpp
+++ b/gfx/d3d9/xdk_d3d.cpp
@@ -969,7 +969,7 @@ static bool d3d_read_viewport(void *data, uint8_t *buffer)
    return false;
 }
 
-const video_driver_t video_d3d = {
+video_driver_t video_d3d = {
    d3d_init,
    d3d_frame,
    d3d_set_nonblock_state,
diff --git a/gfx/exynos_gfx.c b/gfx/exynos_gfx.c
index ee79b44df7..f1b37455dc 100644
--- a/gfx/exynos_gfx.c
+++ b/gfx/exynos_gfx.c
@@ -1475,7 +1475,7 @@ static bool exynos_gfx_read_viewport(void *data, uint8_t *buffer)
    return true;
 }
 
-const video_driver_t video_exynos = {
+video_driver_t video_exynos = {
   exynos_gfx_init,
   exynos_gfx_frame,
   exynos_gfx_set_nonblock_state,
diff --git a/gfx/gl.c b/gfx/gl.c
index 2696b7b0f5..327f29cf62 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -2963,7 +2963,7 @@ static void gl_get_poke_interface(void *data, const video_poke_interface_t **ifa
    *iface = &gl_poke_interface;
 }
 
-const video_driver_t video_gl = {
+video_driver_t video_gl = {
    gl_init,
    gl_frame,
    gl_set_nonblock_state,
diff --git a/gfx/gx/gx_gfx.c b/gfx/gx/gx_gfx.c
index 8baaa5ad9c..c404f7bfc9 100644
--- a/gfx/gx/gx_gfx.c
+++ b/gfx/gx/gx_gfx.c
@@ -1329,7 +1329,7 @@ static bool gx_set_shader(void *data,
    return false; 
 }
 
-const video_driver_t video_gx = {
+video_driver_t video_gx = {
    gx_init,
    gx_frame,
    gx_set_nonblock_state,
diff --git a/gfx/nullgfx.c b/gfx/nullgfx.c
index 0b8f5fc23d..de101f5d54 100644
--- a/gfx/nullgfx.c
+++ b/gfx/nullgfx.c
@@ -101,7 +101,7 @@ static void null_gfx_get_poke_interface(void *data,
    (void)iface;
 }
 
-const video_driver_t video_null = {
+video_driver_t video_null = {
    null_gfx_init,
    null_gfx_frame,
    null_gfx_set_nonblock_state,
diff --git a/gfx/omap_gfx.c b/gfx/omap_gfx.c
index 2f28b8075f..45894fd543 100644
--- a/gfx/omap_gfx.c
+++ b/gfx/omap_gfx.c
@@ -910,7 +910,7 @@ static void omap_gfx_get_poke_interface(void *data,
    (void)iface;
 }
 
-const video_driver_t video_omap = {
+video_driver_t video_omap = {
   omap_gfx_init,
   omap_gfx_frame,
   omap_gfx_set_nonblock_state,
diff --git a/gfx/psp/psp1_gfx.c b/gfx/psp/psp1_gfx.c
index 8c484c1df0..25d4ea07ae 100644
--- a/gfx/psp/psp1_gfx.c
+++ b/gfx/psp/psp1_gfx.c
@@ -814,7 +814,7 @@ static bool psp_set_shader(void *data,
    return false; 
 }
 
-const video_driver_t video_psp1 = {
+video_driver_t video_psp1 = {
    psp_init,
    psp_frame,
    psp_set_nonblock_state,
diff --git a/gfx/sdl2_gfx.c b/gfx/sdl2_gfx.c
index c3f339a274..6de0e2e85e 100644
--- a/gfx/sdl2_gfx.c
+++ b/gfx/sdl2_gfx.c
@@ -714,7 +714,7 @@ static bool sdl2_gfx_set_shader(void *data,
    return false; 
 }
 
-const video_driver_t video_sdl2 = {
+video_driver_t video_sdl2 = {
    sdl2_gfx_init,
    sdl2_gfx_frame,
    sdl2_gfx_set_nonblock_state,
diff --git a/gfx/sdl_gfx.c b/gfx/sdl_gfx.c
index cb2489e0be..5affe6158c 100644
--- a/gfx/sdl_gfx.c
+++ b/gfx/sdl_gfx.c
@@ -516,7 +516,7 @@ static bool sdl_gfx_read_viewport(void *data, uint8_t *buffer)
    return true;
 }
 
-const video_driver_t video_sdl = {
+video_driver_t video_sdl = {
    sdl_gfx_init,
    sdl_gfx_frame,
    sdl_gfx_set_nonblock_state,
@@ -533,4 +533,3 @@ const video_driver_t video_sdl = {
 #endif
    sdl_get_poke_interface
 };
-
diff --git a/gfx/vg.c b/gfx/vg.c
index 67f8c10666..35fa2163fc 100644
--- a/gfx/vg.c
+++ b/gfx/vg.c
@@ -451,7 +451,7 @@ static void vg_get_poke_interface(void *data,
    (void)iface;
 }
 
-const video_driver_t video_vg = {
+video_driver_t video_vg = {
    vg_init,
    vg_frame,
    vg_set_nonblock_state,
diff --git a/gfx/xenon360_gfx.c b/gfx/xenon360_gfx.c
index 9c66403fb7..0316d40451 100644
--- a/gfx/xenon360_gfx.c
+++ b/gfx/xenon360_gfx.c
@@ -300,7 +300,7 @@ static void xenon360_gfx_get_poke_interface(void *data,
    (void)iface;
 }
 
-const video_driver_t video_xenon360 = {
+video_driver_t video_xenon360 = {
    xenon360_gfx_init,
    xenon360_gfx_frame,
    xenon360_gfx_set_nonblock_state,
@@ -318,4 +318,3 @@ const video_driver_t video_xenon360 = {
 #endif
    xenon360_gfx_get_poke_interface
 };
-
diff --git a/gfx/xvideo.c b/gfx/xvideo.c
index f0c25fd488..d896f15c51 100644
--- a/gfx/xvideo.c
+++ b/gfx/xvideo.c
@@ -840,7 +840,7 @@ static bool xv_set_shader(void *data,
    return false; 
 }
 
-const video_driver_t video_xvideo = {
+video_driver_t video_xvideo = {
    xv_init,
    xv_frame,
    xv_set_nonblock_state,
@@ -857,4 +857,3 @@ const video_driver_t video_xvideo = {
 #endif
   xv_get_poke_interface
 };
-
diff --git a/input/android_input.c b/input/android_input.c
index 315553466f..afcd1c231b 100644
--- a/input/android_input.c
+++ b/input/android_input.c
@@ -752,7 +752,7 @@ static const rarch_joypad_driver_t *android_input_get_joypad_driver(void *data)
    return android->joypad;
 }
 
-const input_driver_t input_android = {
+input_driver_t input_android = {
    android_input_init,
    android_input_poll,
    android_input_state,
diff --git a/input/android_input_joypad.c b/input/android_input_joypad.c
index a00c6b9fef..df4f369e7c 100644
--- a/input/android_input_joypad.c
+++ b/input/android_input_joypad.c
@@ -131,7 +131,7 @@ static void android_joypad_destroy(void)
 {
 }
 
-const rarch_joypad_driver_t android_joypad = {
+rarch_joypad_driver_t android_joypad = {
    android_joypad_init,
    android_joypad_query_pad,
    android_joypad_destroy,
diff --git a/input/apple_input.c b/input/apple_input.c
index 142532a4a9..84b9a018bf 100644
--- a/input/apple_input.c
+++ b/input/apple_input.c
@@ -623,7 +623,7 @@ static const rarch_joypad_driver_t *apple_get_joypad_driver(void *data)
    return joypad;
 }
 
-const input_driver_t input_apple = {
+input_driver_t input_apple = {
    apple_input_init,
    apple_input_poll,
    apple_input_state,
diff --git a/input/apple_joypad.c b/input/apple_joypad.c
index ef085de9fd..069c9518c9 100644
--- a/input/apple_joypad.c
+++ b/input/apple_joypad.c
@@ -410,7 +410,7 @@ static const char *apple_joypad_name(unsigned joypad)
    return NULL;
 }
 
-const rarch_joypad_driver_t apple_joypad = {
+rarch_joypad_driver_t apple_joypad = {
    apple_joypad_init,
    apple_joypad_query_pad,
    apple_joypad_destroy,
diff --git a/input/dinput.c b/input/dinput.c
index b1873bbdba..57054885c0 100644
--- a/input/dinput.c
+++ b/input/dinput.c
@@ -956,7 +956,7 @@ static const char *dinput_joypad_name(unsigned pad)
    return NULL;
 }
 
-const rarch_joypad_driver_t dinput_joypad = {
+rarch_joypad_driver_t dinput_joypad = {
    dinput_joypad_init,
    dinput_joypad_query_pad,
    dinput_joypad_destroy,
diff --git a/input/gx_input.c b/input/gx_input.c
index 35290b9407..c85feb627e 100644
--- a/input/gx_input.c
+++ b/input/gx_input.c
@@ -540,7 +540,7 @@ static const rarch_joypad_driver_t *gx_input_get_joypad_driver(void *data)
    return &gx_joypad;
 }
 
-const input_driver_t input_gx = {
+input_driver_t input_gx = {
    gx_input_init,
    gx_input_poll,
    gx_input_state,
diff --git a/input/gx_input_joypad.c b/input/gx_input_joypad.c
index 36f6533f51..4b5e8d1bb9 100644
--- a/input/gx_input_joypad.c
+++ b/input/gx_input_joypad.c
@@ -116,7 +116,7 @@ static void gx_joypad_destroy(void)
    }
 }
 
-const rarch_joypad_driver_t gx_joypad = {
+rarch_joypad_driver_t gx_joypad = {
    gx_joypad_init,
    gx_joypad_query_pad,
    gx_joypad_destroy,
diff --git a/input/input_common.c b/input/input_common.c
index 0d36c36cd4..b1f8021662 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -45,7 +45,7 @@
 
 #include "../file.h"
 
-static const rarch_joypad_driver_t *joypad_drivers[] = {
+static rarch_joypad_driver_t *joypad_drivers[] = {
 #ifndef IS_RETROLAUNCH
 #ifdef __CELLOS_LV2__
    &ps3_joypad,
diff --git a/input/input_common.h b/input/input_common.h
index c947761794..94740ae812 100644
--- a/input/input_common.h
+++ b/input/input_common.h
@@ -106,18 +106,18 @@ bool input_joypad_hat_raw(const rarch_joypad_driver_t *driver,
 const char *input_joypad_name(const rarch_joypad_driver_t *driver,
       unsigned joypad);
 
-extern const rarch_joypad_driver_t dinput_joypad;
-extern const rarch_joypad_driver_t linuxraw_joypad;
-extern const rarch_joypad_driver_t udev_joypad;
-extern const rarch_joypad_driver_t winxinput_joypad;
-extern const rarch_joypad_driver_t sdl_joypad;
-extern const rarch_joypad_driver_t ps3_joypad;
-extern const rarch_joypad_driver_t psp_joypad;
-extern const rarch_joypad_driver_t xdk_joypad;
-extern const rarch_joypad_driver_t gx_joypad;
-extern const rarch_joypad_driver_t apple_joypad;
-extern const rarch_joypad_driver_t android_joypad;
-extern const rarch_joypad_driver_t qnx_joypad;
+extern rarch_joypad_driver_t dinput_joypad;
+extern rarch_joypad_driver_t linuxraw_joypad;
+extern rarch_joypad_driver_t udev_joypad;
+extern rarch_joypad_driver_t winxinput_joypad;
+extern rarch_joypad_driver_t sdl_joypad;
+extern rarch_joypad_driver_t ps3_joypad;
+extern rarch_joypad_driver_t psp_joypad;
+extern rarch_joypad_driver_t xdk_joypad;
+extern rarch_joypad_driver_t gx_joypad;
+extern rarch_joypad_driver_t apple_joypad;
+extern rarch_joypad_driver_t android_joypad;
+extern rarch_joypad_driver_t qnx_joypad;
 
 struct rarch_key_map
 {
diff --git a/input/linuxraw_input.c b/input/linuxraw_input.c
index 72fc9ac921..487339ff44 100644
--- a/input/linuxraw_input.c
+++ b/input/linuxraw_input.c
@@ -236,7 +236,7 @@ static uint64_t linuxraw_get_capabilities(void *data)
    return caps;
 }
 
-const input_driver_t input_linuxraw = {
+input_driver_t input_linuxraw = {
    linuxraw_input_init,
    linuxraw_input_poll,
    linuxraw_input_state,
diff --git a/input/linuxraw_joypad.c b/input/linuxraw_joypad.c
index ceb03216ac..7944fd99f7 100644
--- a/input/linuxraw_joypad.c
+++ b/input/linuxraw_joypad.c
@@ -305,7 +305,7 @@ static const char *linuxraw_joypad_name(unsigned pad)
    return *g_pads[pad].ident ? g_pads[pad].ident : NULL;
 }
 
-const rarch_joypad_driver_t linuxraw_joypad = {
+rarch_joypad_driver_t linuxraw_joypad = {
    linuxraw_joypad_init,
    linuxraw_joypad_query_pad,
    linuxraw_joypad_destroy,
@@ -316,4 +316,3 @@ const rarch_joypad_driver_t linuxraw_joypad = {
    linuxraw_joypad_name,
    "linuxraw",
 };
-
diff --git a/input/nullinput.c b/input/nullinput.c
index 92ad65b69b..cbb44f9344 100644
--- a/input/nullinput.c
+++ b/input/nullinput.c
@@ -68,7 +68,7 @@ static bool nullinput_set_sensor_state(void *data,
    return false;
 }
 
-const input_driver_t input_null = {
+input_driver_t input_null = {
    nullinput_input_init,
    nullinput_input_poll,
    nullinput_input_state,
diff --git a/input/osk/nullosk.c b/input/osk/nullosk.c
index 530a021ee2..454bbc2e3f 100644
--- a/input/osk/nullosk.c
+++ b/input/osk/nullosk.c
@@ -59,7 +59,7 @@ static void nullosk_lifecycle(void *data, uint64_t status)
 {
 }
 
-const input_osk_driver_t input_null_osk = {
+input_osk_driver_t input_null_osk = {
    nullosk_init,
    nullosk_free,
    nullosk_enable_key_layout,
diff --git a/input/osk/ps3_osk.c b/input/osk/ps3_osk.c
index cb4369676a..62528fbe0e 100644
--- a/input/osk/ps3_osk.c
+++ b/input/osk/ps3_osk.c
@@ -183,7 +183,7 @@ static void oskutil_lifecycle(void *data, uint64_t status)
    }
 }
 
-const input_osk_driver_t input_ps3_osk = {
+input_osk_driver_t input_ps3_osk = {
    oskutil_init,
    oskutil_free,
    oskutil_enable_key_layout,
diff --git a/input/ps3_input.c b/input/ps3_input.c
index 53c664e5a5..9eb184ac77 100644
--- a/input/ps3_input.c
+++ b/input/ps3_input.c
@@ -351,7 +351,7 @@ static const rarch_joypad_driver_t *ps3_input_get_joypad_driver(void *data)
    return ps3->joypad;
 }
 
-const input_driver_t input_ps3 = {
+input_driver_t input_ps3 = {
    ps3_input_init,
    ps3_input_poll,
    ps3_input_state,
diff --git a/input/ps3_input_joypad.c b/input/ps3_input_joypad.c
index 3ce0892b75..72c252482e 100644
--- a/input/ps3_input_joypad.c
+++ b/input/ps3_input_joypad.c
@@ -109,7 +109,7 @@ static void ps3_joypad_destroy(void)
 {
 }
 
-const rarch_joypad_driver_t ps3_joypad = {
+rarch_joypad_driver_t ps3_joypad = {
    ps3_joypad_init,
    ps3_joypad_query_pad,
    ps3_joypad_destroy,
diff --git a/input/psp_input.c b/input/psp_input.c
index 3ca94101a4..fc5bd33880 100644
--- a/input/psp_input.c
+++ b/input/psp_input.c
@@ -167,7 +167,7 @@ static const rarch_joypad_driver_t *psp_input_get_joypad_driver(void *data)
    return psp->joypad;
 }
 
-const input_driver_t input_psp = {
+input_driver_t input_psp = {
    psp_input_initialize,
    psp_input_poll,
    psp_input_state,
diff --git a/input/psp_input_joypad.c b/input/psp_input_joypad.c
index 46138c7b9c..85d734cf3d 100644
--- a/input/psp_input_joypad.c
+++ b/input/psp_input_joypad.c
@@ -108,7 +108,7 @@ static void psp_joypad_destroy(void)
 {
 }
 
-const rarch_joypad_driver_t psp_joypad = {
+rarch_joypad_driver_t psp_joypad = {
    psp_joypad_init,
    psp_joypad_query_pad,
    psp_joypad_destroy,
diff --git a/input/qnx_input.c b/input/qnx_input.c
index 9e32a23803..1eae84a49d 100644
--- a/input/qnx_input.c
+++ b/input/qnx_input.c
@@ -802,7 +802,7 @@ static const rarch_joypad_driver_t *qnx_input_get_joypad_driver(void *data)
    return qnx->joypad;
 }
 
-const input_driver_t input_qnx = {
+input_driver_t input_qnx = {
    qnx_input_init,
    qnx_input_poll,
    qnx_input_state,
diff --git a/input/qnx_input_joypad.c b/input/qnx_input_joypad.c
index fead02ab6b..90ed28fbf8 100644
--- a/input/qnx_input_joypad.c
+++ b/input/qnx_input_joypad.c
@@ -108,7 +108,7 @@ static void qnx_joypad_destroy(void)
 {
 }
 
-const rarch_joypad_driver_t qnx_joypad = {
+rarch_joypad_driver_t qnx_joypad = {
    qnx_joypad_init,
    qnx_joypad_query_pad,
    qnx_joypad_destroy,
diff --git a/input/rwebinput_input.c b/input/rwebinput_input.c
index ec9d2c0ab8..070db4b5e5 100644
--- a/input/rwebinput_input.c
+++ b/input/rwebinput_input.c
@@ -180,7 +180,7 @@ static uint64_t rwebinput_get_capabilities(void *data)
    return caps;
 }
 
-const input_driver_t input_rwebinput = {
+input_driver_t input_rwebinput = {
    rwebinput_input_init,
    rwebinput_input_poll,
    rwebinput_input_state,
@@ -192,4 +192,3 @@ const input_driver_t input_rwebinput = {
    "rwebinput",
    rwebinput_grab_mouse,
 };
-
diff --git a/input/sdl_input.c b/input/sdl_input.c
index 5a4689ff88..959167b5df 100644
--- a/input/sdl_input.c
+++ b/input/sdl_input.c
@@ -353,7 +353,7 @@ static uint64_t sdl_get_capabilities(void *data)
    return caps;
 }
 
-const input_driver_t input_sdl = {
+input_driver_t input_sdl = {
    sdl_input_init,
    sdl_input_poll,
    sdl_input_state,
@@ -372,4 +372,3 @@ const input_driver_t input_sdl = {
    sdl_set_rumble,
    sdl_get_joypad_driver,
 };
-
diff --git a/input/sdl_joypad.c b/input/sdl_joypad.c
index 768d938022..7df3d45581 100644
--- a/input/sdl_joypad.c
+++ b/input/sdl_joypad.c
@@ -404,7 +404,7 @@ static const char *sdl_joypad_name(unsigned pad)
    return pad_name(pad);
 }
 
-const rarch_joypad_driver_t sdl_joypad = {
+rarch_joypad_driver_t sdl_joypad = {
    sdl_joypad_init,
    sdl_joypad_query_pad,
    sdl_joypad_destroy,
@@ -423,4 +423,3 @@ const rarch_joypad_driver_t sdl_joypad = {
    "sdl"
 #endif
 };
-
diff --git a/input/udev_input.c b/input/udev_input.c
index f1adacb51b..cacf9ee167 100644
--- a/input/udev_input.c
+++ b/input/udev_input.c
@@ -818,7 +818,7 @@ static const rarch_joypad_driver_t *udev_input_get_joypad_driver(void *data)
    return udev->joypad;
 }
 
-const input_driver_t input_udev = {
+input_driver_t input_udev = {
    udev_input_init,
    udev_input_poll,
    udev_input_state,
@@ -832,4 +832,3 @@ const input_driver_t input_udev = {
    udev_input_set_rumble,
    udev_input_get_joypad_driver,
 };
-
diff --git a/input/udev_joypad.c b/input/udev_joypad.c
index 99faf11bbf..f88a6cee07 100644
--- a/input/udev_joypad.c
+++ b/input/udev_joypad.c
@@ -571,7 +571,7 @@ static const char *udev_joypad_name(unsigned pad)
    return *g_pads[pad].ident ? g_pads[pad].ident : NULL;
 }
 
-const rarch_joypad_driver_t udev_joypad = {
+rarch_joypad_driver_t udev_joypad = {
    udev_joypad_init,
    udev_joypad_query_pad,
    udev_joypad_destroy,
@@ -582,4 +582,3 @@ const rarch_joypad_driver_t udev_joypad = {
    udev_joypad_name,
    "udev",
 };
-
diff --git a/input/winxinput_joypad.c b/input/winxinput_joypad.c
index 5d37d42319..1340a2ac66 100644
--- a/input/winxinput_joypad.c
+++ b/input/winxinput_joypad.c
@@ -426,7 +426,7 @@ static bool winxinput_joypad_rumble(unsigned pad,
       == ERROR_SUCCESS;
 }
 
-const rarch_joypad_driver_t winxinput_joypad = {
+rarch_joypad_driver_t winxinput_joypad = {
    winxinput_joypad_init,
    winxinput_joypad_query_pad,
    winxinput_joypad_destroy,
@@ -437,4 +437,3 @@ const rarch_joypad_driver_t winxinput_joypad = {
    winxinput_joypad_name,
    "winxinput",
 };
-
diff --git a/input/x11_input.c b/input/x11_input.c
index b6f04e92d1..d0033ccf22 100644
--- a/input/x11_input.c
+++ b/input/x11_input.c
@@ -329,7 +329,7 @@ static uint64_t x_input_get_capabilities(void *data)
    return caps;
 }
 
-const input_driver_t input_x = {
+input_driver_t input_x = {
    x_input_init,
    x_input_poll,
    x_input_state,
@@ -343,4 +343,3 @@ const input_driver_t input_x = {
    x_set_rumble,
    x_get_joypad_driver,
 };
-
diff --git a/input/xdk_xinput_input.c b/input/xdk_xinput_input.c
index 64590089f1..14289ac8df 100644
--- a/input/xdk_xinput_input.c
+++ b/input/xdk_xinput_input.c
@@ -276,8 +276,7 @@ static const rarch_joypad_driver_t *xdk_input_get_joypad_driver(void *data)
    return xdk->joypad;
 }
 
-const input_driver_t input_xinput = 
-{
+input_driver_t input_xinput = {
    xdk_input_init,
    xdk_input_poll,
    xdk_input_state,
diff --git a/input/xdk_xinput_input_joypad.c b/input/xdk_xinput_input_joypad.c
index 36b7b45bac..833e247202 100644
--- a/input/xdk_xinput_input_joypad.c
+++ b/input/xdk_xinput_input_joypad.c
@@ -115,7 +115,7 @@ static void xdk_joypad_destroy(void)
 {
 }
 
-const rarch_joypad_driver_t xdk_joypad = {
+rarch_joypad_driver_t xdk_joypad = {
    xdk_joypad_init,
    xdk_joypad_query_pad,
    xdk_joypad_destroy,
diff --git a/input/xenon360_input.c b/input/xenon360_input.c
index fe84925996..141a87cf50 100644
--- a/input/xenon360_input.c
+++ b/input/xenon360_input.c
@@ -101,7 +101,7 @@ static uint64_t xenon360_get_capabilities(void *data)
    return caps;
 }
 
-const input_driver_t input_xenon360 = {
+input_driver_t input_xenon360 = {
    xenon360_input_init,
    xenon360_input_poll,
    xenon360_input_state,
diff --git a/location/android.c b/location/android.c
index 543a8e4e7e..b9f8adfaeb 100644
--- a/location/android.c
+++ b/location/android.c
@@ -203,7 +203,7 @@ static void android_location_set_interval(void *data, unsigned interval_ms,
          (int)interval_distance);
 }
 
-const location_driver_t location_android = {
+location_driver_t location_android = {
    android_location_init,
    android_location_free,
    android_location_start,
diff --git a/location/nulllocation.c b/location/nulllocation.c
index 6ec1d12341..bb66961314 100644
--- a/location/nulllocation.c
+++ b/location/nulllocation.c
@@ -53,7 +53,7 @@ static void null_location_set_interval(void *data,
 {
 }
 
-const location_driver_t location_null = {
+location_driver_t location_null = {
    null_location_init,
    null_location_free,
    null_location_start,