diff --git a/gfx/gl.c b/gfx/gl.c
index a2ed3ccb01..37749d4669 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -187,7 +187,7 @@ void gl_shader_use(unsigned index)
 #endif
 }
 
-static void gl_shader_deinit(void)
+static inline void gl_shader_deinit(void)
 {
 #ifdef HAVE_CG
    gl_cg_deinit();
@@ -198,7 +198,7 @@ static void gl_shader_deinit(void)
 #endif
 }
 
-static void gl_shader_set_proj_matrix(void)
+static inline void gl_shader_set_proj_matrix(void)
 {
 #ifdef HAVE_CG
    gl_cg_set_proj_matrix();
@@ -209,7 +209,7 @@ static void gl_shader_set_proj_matrix(void)
 #endif
 }
 
-static void gl_shader_set_params(unsigned width, unsigned height, 
+static inline void gl_shader_set_params(unsigned width, unsigned height, 
       unsigned tex_width, unsigned tex_height, 
       unsigned out_width, unsigned out_height,
       unsigned frame_count,
diff --git a/wii/video.c b/wii/video.c
index e01f1c7499..338f8b00ff 100644
--- a/wii/video.c
+++ b/wii/video.c
@@ -275,22 +275,6 @@ static void wii_free(void *data)
    (void)data;
 }
 
-static void wii_swap(void * data)
-{
-   (void)data;
-   /* TODO */
-}
-
-static void wii_set_aspect_ratio(void * data, uint32_t aspectratio_index)
-{
-   (void)data;
-
-   g_settings.video.aspect_ratio = aspectratio_lut[g_console.aspect_ratio_index].value;
-   g_settings.video.force_aspect = false;
-
-   /* TODO */
-}
-
 static void wii_set_rotation(void * data, uint32_t orientation)
 {
    (void)data;
@@ -299,12 +283,6 @@ static void wii_set_rotation(void * data, uint32_t orientation)
    /* TODO */
 }
 
-static void wii_set_swap_block_state(void * data, bool toggle)
-{
-   (void)data;
-   (void)toggle;
-}
-
 const video_driver_t video_wii = {
    .init = wii_init,
    .frame = wii_frame,
@@ -313,8 +291,5 @@ const video_driver_t video_wii = {
    .focus = wii_focus,
    .free = wii_free,
    .ident = "wii",
-   .set_swap_block_state = wii_set_swap_block_state,
    .set_rotation = wii_set_rotation,
-   .set_aspect_ratio = wii_set_aspect_ratio,
-   .swap = wii_swap
 };