diff --git a/gfx/d3d9/d3d_wrapper.c b/gfx/d3d9/d3d_wrapper.c
index 8f2e3ddbcc..28037e16d2 100644
--- a/gfx/d3d9/d3d_wrapper.c
+++ b/gfx/d3d9/d3d_wrapper.c
@@ -15,8 +15,9 @@
  */
 
 #include "../context/win32_common.h"
+#include "d3d_wrapper.h"
 
-void D3DDevice_Presents(d3d_video_t *d3d, LPDIRECT3DDEVICE dev)
+void d3d_swap(d3d_video_t *d3d, LPDIRECT3DDEVICE dev)
 {
 #if defined(_XBOX1)
    D3DDevice_Swap(0);
@@ -31,101 +32,126 @@ void D3DDevice_Presents(d3d_video_t *d3d, LPDIRECT3DDEVICE dev)
 #endif
 }
 
-HRESULT D3DDevice_CreateVertexBuffers(LPDIRECT3DDEVICE dev, unsigned length,
-      unsigned usage, unsigned fvf, d3DPOOL pool,
-      LPDIRECT3DVERTEXBUFFER** vert_buf, void *handle)
+HRESULT d3d_create_vertex_buffer(LPDIRECT3DDEVICE dev,
+      unsigned length, unsigned usage, unsigned fvf,
+      d3DPOOL pool, LPDIRECT3DVERTEXBUFFER** vert_buf, void *handle)
 {
 #if defined(_XBOX1)
+   IDirect3DDevice8_CreateVertexBuffer(dev, length, usage, fvf, pool,
+         vert_buf);
 #elif defined(_XBOX360)
+   IDirect3DDevice9_CreateVertexBuffer(dev, length, usage, fvf, pool,
+         vert_buf, NULL);
 #else
-   dev->CreateVertexBuffer(length, usage, fvf, pool, vert_buf, NULL)
+   dev->CreateVertexBuffer(length, usage, fvf, pool, vert_buf, NULL);
 #endif
 }
 
-void D3DDevice_SetStreamSources(LPDIRECT3DDEVICE dev, unsigned stream_no,
+void d3d_set_stream_source(LPDIRECT3DDEVICE dev, unsigned stream_no,
       LPDIRECT3DVERTEXBUFFER stream_vertbuf, unsigned offset_bytes,
       unsigned stride)
 {
 #if defined(_XBOX1)
+   IDirect3DDevice8_SetStreamSource(dev, stream_no, stream_vertbuf, stride);
 #elif defined(_XBOX360)
+   D3DDevice_SetStreamSource_Inline(dev, stream_no, stream_vertbuf,
+         offset_bytes, stride);
 #else
    dev->SetStreamSource(steam_no, stream_vertbuf, offset_bytes, stride);
 #endif
 }
 
-void D3DDevice_SetSamplerState_AddressU(LPDIRECT3DDEVICE dev,
-      unsigned sampler, unsigned type)
+void d3d_set_sampler_address_u(LPDIRECT3DDEVICE dev,
+      unsigned sampler, unsigned type, unsigned value)
 {
 #if defined(_XBOX1)
+   D3D__DirtyFlags |= (D3DDIRTYFLAG_TEXTURE_STATE_0 << sampler);
+   D3D__TextureState[sampler][D3DTSS_ADDRESSU] = value;
 #elif defined(_XBOX360)
+   D3DDevice_SetSamplerState_AddressU_Inline(dev, sampler, value);
 #else
    dev->SetSamplerState(sampler, D3DSAMP_ADDRESSU, type);
 #endif
 }
 
-void D3DDevice_SetSamplerState_AddressV(LPDIRECT3DDEVICE dev,
-      unsigned sampler, unsigned type)
+void d3d_set_sampler_address_v(LPDIRECT3DDEVICE dev,
+      unsigned sampler, unsigned type, unsigned value)
 {
 #if defined(_XBOX1)
+   D3D__DirtyFlags |= (D3DDIRTYFLAG_TEXTURE_STATE_0 << sampler);
+   D3D__TextureState[sampler][D3DTSS_ADDRESSV] = value;
 #elif defined(_XBOX360)
+   D3DDevice_SetSamplerState_AddressV_Inline(dev, sampler, value);
 #else
    dev->SetSamplerState(sampler, D3DSAMP_ADDRESSV, type);
 #endif
 }
 
-void D3DDevice_SetSamplerState_MinFilter(LPDIRECT3DDEVICE dev,
-      unsigned sampler, unsigned type)
+void d3d_set_sampler_minfilter(LPDIRECT3DDEVICE dev,
+      unsigned sampler, unsigned type, unsigned value)
 {
 #if defined(_XBOX1)
+   D3D__DirtyFlags |= (D3DDIRTYFLAG_TEXTURE_STATE_0 << sampler);
+   D3D__TextureState[sampler][D3DTSS_MINFILTER] = value;
 #elif defined(_XBOX360)
+   D3DDevice_SetSamplerState_MinFilter(dev, sampler, value);
 #else
-   dev->SetSamplerState(sampler, D3DSAMP_MINFILTER, type)
+   dev->SetSamplerState(sampler, D3DSAMP_MINFILTER, type);
 #endif
 }
 
-void D3DDevice_SetSamplerState_MagFilter(LPDIRECT3DDEVICE dev,
+void d3d_set_sampler_magfilter(LPDIRECT3DDEVICE dev,
       unsigned sampler, unsigned type)
 {
 #if defined(_XBOX1)
+   D3D__DirtyFlags |= (D3DDIRTYFLAG_TEXTURE_STATE_0 << sampler);
+   D3D__TextureState[sampler][D3DTSS_MAGFILTER] = value;
 #elif defined(_XBOX360)
+   D3DDevice_SetSamplerState_MagFilter(dev, sampler, value);
 #else
-   dev->SetSamplerState(sampler, D3DSAMP_MAGFILTER, type)
+   dev->SetSamplerState(sampler, D3DSAMP_MAGFILTER, type);
 #endif
 }
 
-void D3DDevice_DrawPrimitive(LPDIRECT3DDEVICE dev,
+void d3d_draw_primitive(LPDIRECT3DDEVICE dev,
       unsigned type, unsigned start, unsigned count)
 {
+#if defined(_XBOX1)
+   D3DDevice_DrawVertices(type, start, D3DVERTEXCOUNT(type, count));
+#elif defined(_XBOX360)
+   D3DDevice_DrawVertices(dev, type, start, D3DVERTEXCOUNT(type, count));
+#else
    if (SUCCEEDED(dev->BeginScene()))
    {
       dev->DrawPrimitive(type, start, count);
       dev->EndScene();
    }
+#endif
 }
 
-void D3DDevice_LockRectClear(unsigned pass, LPDIRECT3DTEXTURE tex,
+void d3d_lockrectangle_clear(LPDIRECT3DTEXTURE tex,
+      unsigned tex_width, unsigned tex_height,
       unsigned level, D3DLOCKED_RECT lock_rect, RECT rect,
       unsigned flags)
 {
-#if defined(_XBOX1)
-#elif defined(_XBOX360)
+#if defined(_XBOX)
+   D3DTexture_LockRect(tex, level, &lockedrect, rect, flags);
+   memset(lockedrect.pBits, 0, tex_height * lockedrect.Pitch)
 #else
    if (SUCCEEDED(tex->LockRect(level, &lockedrect, rect, flags)))
    {
-      memset(lockedrect.pBits, level, pass.info.tex_h * lockedrect.Pitch);
+      memset(lockedrect.pBits, level, tex_height * lockedrect.Pitch);
       tex->UnlockRect(0);
    }
 #endif
 }
 
-void D3DDevice_TextureBlit(d3d_video_t *d3d,
+void d3d_textureblit(d3d_video_t *d3d,
       LPDIRECT3DTEXTURE tex, D3DSURFACE_DESC desc,
       D3DLOCKED_RECT rect, const void *frame,
       unsigned width, unsigned height, unsigned pitch)
 {
-#if defined(_XBOX1)
-#elif defined(_XBOX360)
-#else
+#if 1
    if (SUCCEEDED(tex->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK)))
    {
       for (unsigned y = 0; y < height; y++)
diff --git a/gfx/d3d9/d3d_wrapper.h b/gfx/d3d9/d3d_wrapper.h
new file mode 100644
index 0000000000..fd9c09c3e5
--- /dev/null
+++ b/gfx/d3d9/d3d_wrapper.h
@@ -0,0 +1,57 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2014 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _D3D_WRAPPER_H
+#define _D3D_WRAPPER_H
+
+#include "d3d_defines.h"
+
+void d3d_swap(d3d_video_t *d3d, LPDIRECT3DDEVICE dev);
+
+HRESULT d3d_create_vertex_buffer(LPDIRECT3DDEVICE dev,
+      unsigned length, unsigned usage, unsigned fvf,
+      d3DPOOL pool, LPDIRECT3DVERTEXBUFFER** vert_buf, void *handle);
+
+void d3d_set_stream_source(LPDIRECT3DDEVICE dev, unsigned stream_no,
+      LPDIRECT3DVERTEXBUFFER stream_vertbuf, unsigned offset_bytes,
+      unsigned stride);
+
+void d3d_set_sampler_address_u(LPDIRECT3DDEVICE dev,
+      unsigned sampler, unsigned type, unsigned value);
+
+void d3d_set_sampler_address_v(LPDIRECT3DDEVICE dev,
+      unsigned sampler, unsigned type, unsigned value);
+
+void d3d_set_sampler_minfilter(LPDIRECT3DDEVICE dev,
+      unsigned sampler, unsigned type, unsigned value);
+
+void d3d_set_sampler_magfilter(LPDIRECT3DDEVICE dev,
+      unsigned sampler, unsigned type);
+
+void d3d_draw_primitive(LPDIRECT3DDEVICE dev,
+      unsigned type, unsigned start, unsigned count);
+
+void d3d_lockrectangle_clear(LPDIRECT3DTEXTURE tex,
+      unsigned tex_width, unsigned tex_height,
+      unsigned level, D3DLOCKED_RECT lock_rect, RECT rect,
+      unsigned flags);
+
+void d3d_textureblit(d3d_video_t *d3d,
+      LPDIRECT3DTEXTURE tex, D3DSURFACE_DESC desc,
+      D3DLOCKED_RECT rect, const void *frame,
+      unsigned width, unsigned height, unsigned pitch);
+
+#endif