diff --git a/gfx/common/win32_common.cpp b/gfx/common/win32_common.cpp
index 36c32842a5..b5f15eb389 100644
--- a/gfx/common/win32_common.cpp
+++ b/gfx/common/win32_common.cpp
@@ -217,8 +217,6 @@ static LRESULT CALLBACK WndProcCommon(bool *quit, HWND hwnd, UINT message,
    return 0;
 }
 
-extern bool d3d_restore(void *data);
-
 LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message,
       WPARAM wparam, LPARAM lparam)
 {
diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 7d04323dbb..d376cfd1cc 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -102,9 +102,7 @@ static void d3d_free_overlay(d3d_video_t *d3d, overlay_t *overlay);
 
 static void d3d_deinit_chain(d3d_video_t *d3d)
 {
-   if (!d3d)
-      return;
-   if (!d3d->renderchain_driver)
+   if (!d3d || !d3d->renderchain_driver)
       return;
 
    if (d3d->renderchain_driver->chain_free)
@@ -440,7 +438,7 @@ static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info)
    return true;
 }
 
-bool d3d_restore(void *data)
+static bool d3d_restore(void *data)
 {
    d3d_video_t            *d3d = (d3d_video_t*)data;