diff --git a/gfx/common/d3d8_common.c b/gfx/common/d3d8_common.c
index bb6028fe07..eae24cfd6f 100644
--- a/gfx/common/d3d8_common.c
+++ b/gfx/common/d3d8_common.c
@@ -28,55 +28,16 @@
 
 #include "../../verbosity.h"
 
-#ifdef HAVE_D3DX
-#include <d3dx8core.h>
-#include <d3dx8tex.h>
-#endif
-
 #include "d3d8_common.h"
 
-#ifdef _XBOX
-#include <xgraphics.h>
-#endif
-
 /* TODO/FIXME - static globals */
 #ifdef HAVE_DYNAMIC_D3D
 static dylib_t g_d3d8_dll;
-#ifdef HAVE_D3DX
-static dylib_t g_d3d8x_dll;
-#endif
 static bool dylib_initialized = false;
 #endif
 
 typedef IDirect3D8 *(__stdcall *D3DCreate_t)(UINT);
-#ifdef HAVE_D3DX
-typedef HRESULT (__stdcall
-    *D3DCreateTextureFromFile_t)(
-        LPDIRECT3DDEVICE8         pDevice,
-        LPCSTR                    pSrcFile,
-        UINT                      Width,
-        UINT                      Height,
-        UINT                      MipLevels,
-        DWORD                     Usage,
-        D3DFORMAT                 Format,
-        D3DPOOL                   Pool,
-        DWORD                     Filter,
-        DWORD                     MipFilter,
-        D3DCOLOR                  ColorKey,
-        D3DXIMAGE_INFO*           pSrcInfo,
-        PALETTEENTRY*             pPalette,
-        LPDIRECT3DTEXTURE8*       ppTexture);
 
-typedef HRESULT (__stdcall
-    *D3DXCreateFontIndirect_t)(
-        LPDIRECT3DDEVICE8       pDevice,
-        CONST LOGFONT*   pDesc,
-        LPD3DXFONT*             ppFont);
-#endif
-
-#ifdef HAVE_D3DX
-static D3DCreateTextureFromFile_t D3DCreateTextureFromFile;
-#endif
 static D3DCreate_t D3DCreate;
 
 void *d3d8_create(void)
@@ -89,18 +50,6 @@ void *d3d8_create(void)
    return D3DCreate(ver);
 }
 
-#ifdef HAVE_DYNAMIC_D3D
-#ifdef HAVE_D3DX
-static dylib_t dylib_load_d3dx(void)
-{
-   dylib_t dll           = NULL;
-
-   return dll;
-}
-#endif
-
-#endif
-
 bool d3d8_initialize_symbols(enum gfx_ctx_api api)
 {
 #ifdef HAVE_DYNAMIC_D3D
@@ -119,14 +68,8 @@ bool d3d8_initialize_symbols(enum gfx_ctx_api api)
 
 #ifdef HAVE_DYNAMIC_D3D
    D3DCreate                = (D3DCreate_t)dylib_proc(g_d3d8_dll, "Direct3DCreate8");
-#ifdef HAVE_D3DX
-   D3DCreateTextureFromFile = (D3DCreateTextureFromFile_t)dylib_proc(g_d3d8x_dll, "D3DXCreateTextureFromFileExA");
-#endif
 #else
    D3DCreate                = Direct3DCreate8;
-#ifdef HAVE_D3DX
-   D3DCreateTextureFromFile = D3DXCreateTextureFromFileExA;
-#endif
 #endif
 
    if (!D3DCreate)
@@ -148,46 +91,25 @@ void d3d8_deinitialize_symbols(void)
 #ifdef HAVE_DYNAMIC_D3D
    if (g_d3d8_dll)
       dylib_close(g_d3d8_dll);
-#ifdef HAVE_D3DX
-   if (g_d3d8x_dll)
-      dylib_close(g_d3d8x_dll);
-   g_d3d8x_dll        = NULL;
-#endif
    g_d3d8_dll         = NULL;
-
    dylib_initialized = false;
 #endif
 }
 
 void *d3d8_texture_new(LPDIRECT3DDEVICE8 dev,
-      const char *path, unsigned width, unsigned height,
+      unsigned width, unsigned height,
       unsigned miplevels, unsigned usage, INT32 format,
       INT32 pool, unsigned filter, unsigned mipfilter,
       INT32 color_key, void *src_info_data,
       PALETTEENTRY *palette, bool want_mipmap)
 {
    void *buf             = NULL;
-
-   if (path)
-   {
-#ifdef HAVE_D3DX
-      void *buf  = NULL;
-      if (SUCCEEDED(D3DCreateTextureFromFile(dev,
-                  path, width, height, miplevels, usage, format,
-                  pool, filter, mipfilter, color_key, src_info_data,
-                  palette, (struct IDirect3DTeture8**)&buf)))
-         return buf;
-#endif
-      return NULL;
-   }
-
-   if (FAILED(IDirect3DDevice8_CreateTexture(dev,
+   if (SUCCEEDED(IDirect3DDevice8_CreateTexture(dev,
                width, height, miplevels, usage,
                (D3DFORMAT)format, (D3DPOOL)pool,
                (struct IDirect3DTexture8**)&buf)))
-      return NULL;
-
-   return buf;
+      return buf;
+   return NULL;
 }
 
 static bool d3d8_reset_internal(LPDIRECT3DDEVICE8 dev,
diff --git a/gfx/common/d3d8_common.h b/gfx/common/d3d8_common.h
index 3a7c04e439..bf3bf684fb 100644
--- a/gfx/common/d3d8_common.h
+++ b/gfx/common/d3d8_common.h
@@ -82,7 +82,7 @@ d3d8_vertex_buffer_lock(LPDIRECT3DVERTEXBUFFER8 vertbuf)
 }
 
 void *d3d8_texture_new(LPDIRECT3DDEVICE8 dev,
-      const char *path, unsigned width, unsigned height,
+      unsigned width,     unsigned height,
       unsigned miplevels, unsigned usage, INT32 format,
       INT32 pool, unsigned filter, unsigned mipfilter,
       INT32 color_key, void *src_info_data,
diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c
index 7fe26a11af..b6934bf37d 100644
--- a/gfx/drivers/d3d8.c
+++ b/gfx/drivers/d3d8.c
@@ -314,7 +314,7 @@ static bool d3d8_setup_init(void *data,
    if (!chain->vertex_buf)
       return false;
 
-   chain->tex = (LPDIRECT3DTEXTURE8)d3d8_texture_new(d3dr, NULL,
+   chain->tex = (LPDIRECT3DTEXTURE8)d3d8_texture_new(d3dr,
          chain->tex_w, chain->tex_h, 1, 0,
          video_info->rgb32
          ?
@@ -1370,7 +1370,7 @@ static bool d3d8_overlay_load(void *data,
       unsigned height    = images[i].height;
       overlay_t *overlay = (overlay_t*)&d3d->overlays[i];
 
-      overlay->tex       = d3d8_texture_new(d3d->dev, NULL,
+      overlay->tex       = d3d8_texture_new(d3d->dev,
                   width, height, 1, 0,
                   D3D8_ARGB8888_FORMAT,
                   D3DPOOL_MANAGED, 0, 0, 0,
@@ -1612,7 +1612,7 @@ static void d3d8_set_menu_texture_frame(void *data,
       if (tex)
          IDirect3DTexture8_Release(tex);
 
-      d3d->menu->tex = d3d8_texture_new(d3d->dev, NULL,
+      d3d->menu->tex = d3d8_texture_new(d3d->dev,
             width, height, 1,
             0, D3D8_ARGB8888_FORMAT,
             D3DPOOL_MANAGED, 0, 0, 0, NULL, NULL, false);
@@ -1697,7 +1697,7 @@ static void d3d8_video_texture_load_d3d(
    unsigned usage            = 0;
    d3d8_video_t *d3d         = (d3d8_video_t*)info->userdata;
    struct texture_image *ti  = (struct texture_image*)info->data;
-   LPDIRECT3DTEXTURE8 tex    = (LPDIRECT3DTEXTURE8)d3d8_texture_new(d3d->dev, NULL,
+   LPDIRECT3DTEXTURE8 tex    = (LPDIRECT3DTEXTURE8)d3d8_texture_new(d3d->dev,
                ti->width, ti->height, 0,
                usage, D3D8_ARGB8888_FORMAT,
                D3DPOOL_MANAGED, 0, 0, 0,