diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
index b51b45bc4..917765e16 100644
--- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
+++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
@@ -459,7 +459,7 @@ g_EmuCDPD;
     XB_MACRO(xbox::hresult_xt,    WINAPI,     Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ecx_ppReturnedDeviceInterface, (xbox::uint_xt, xbox::X_D3DDEVTYPE, xbox::X_HWND, xbox::X_D3DPRESENT_PARAMETERS*)                 );  \
     XB_MACRO(xbox::hresult_xt,    WINAPI,     Direct3D_CreateDevice_4,                            (xbox::X_D3DPRESENT_PARAMETERS*)                                                                                              );  \
     XB_MACRO(xbox::void_xt,       WINAPI,     Lock2DSurface,                                      (xbox::X_D3DPixelContainer*, xbox::X_D3DCUBEMAP_FACES, xbox::uint_xt, xbox::X_D3DLOCKED_RECT*, xbox::X_RECT*, xbox::dword_xt) );  \
-    XB_MACRO(xbox::void_xt,       WINAPI,     Lock3DSurface,                                      (xbox::X_D3DPixelContainer*, xbox::uint_xt, xbox::X_D3DLOCKED_BOX*, D3DBOX*, xbox::dword_xt)                                  );  \
+    XB_MACRO(xbox::void_xt,       WINAPI,     Lock3DSurface,                                      (xbox::X_D3DPixelContainer*, xbox::uint_xt, xbox::X_D3DLOCKED_BOX*, xbox::X_D3DBOX*, xbox::dword_xt)                          );  \
     XB_MACRO(xbox::void_xt,       WINAPI,     D3D_CommonSetRenderTarget,                          (xbox::X_D3DSurface*, xbox::X_D3DSurface*, void*)                                                                             );  \
 
 XB_TRAMPOLINES(XB_trampoline_declare);
@@ -7090,8 +7090,8 @@ xbox::void_xt WINAPI xbox::EMUPATCH(Lock3DSurface)
 	X_D3DPixelContainer *pPixelContainer,
 	uint_xt				Level,
 	X_D3DLOCKED_BOX		*pLockedVolume,
-	D3DBOX				*pBox,
-	dword_xt				Flags
+	X_D3DBOX			*pBox,
+	dword_xt			Flags
 	)
 {
 	LOG_FUNC_BEGIN
diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.h b/src/core/hle/D3D8/Direct3D9/Direct3D9.h
index acb50ba30..718d27552 100644
--- a/src/core/hle/D3D8/Direct3D9/Direct3D9.h
+++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.h
@@ -836,8 +836,8 @@ xbox::void_xt WINAPI EMUPATCH(Lock3DSurface)
     X_D3DPixelContainer *pPixelContainer,
     uint_xt				Level,
 	X_D3DLOCKED_BOX		*pLockedVolume,
-	D3DBOX				*pBox,
-	dword_xt				Flags
+	X_D3DBOX			*pBox,
+	dword_xt			Flags
 );
 
 #if 0 // patch disabled
@@ -918,7 +918,7 @@ xbox::void_xt WINAPI EMUPATCH(D3DVolumeTexture_LockBox)
     X_D3DVolumeTexture *pThis,
     uint_xt                Level,
     X_D3DLOCKED_BOX      *pLockedVolume,
-    CONST D3DBOX       *pBox,
+    CONST X_D3DBOX       *pBox,
     dword_xt               Flags
 );
 
diff --git a/src/core/hle/D3D8/XbD3D8Logging.cpp b/src/core/hle/D3D8/XbD3D8Logging.cpp
index 4dbb21575..592a8ddb1 100644
--- a/src/core/hle/D3D8/XbD3D8Logging.cpp
+++ b/src/core/hle/D3D8/XbD3D8Logging.cpp
@@ -566,21 +566,6 @@ ENUM2STR_START(X_D3DCOMMON_TYPE) // Use unshifted values
 	ENUM2STR_CASE(X_D3DCOMMON_TYPE_FIXUP)
 ENUM2STR_END_and_LOGRENDER(X_D3DCOMMON_TYPE)
 
-LOGRENDER(X_D3DLOCKED_BOX)
-{
-	return os
-		LOGRENDER_MEMBER(RowPitch)
-		LOGRENDER_MEMBER(SlicePitch)
-		LOGRENDER_MEMBER(pBits);
-}
-
-LOGRENDER(X_D3DLOCKED_RECT)
-{
-	return os
-		LOGRENDER_MEMBER(Pitch)
-		LOGRENDER_MEMBER(pBits);
-}
-
 LOGRENDER(X_D3DRESOURCE_COMMON)
 {	
 	return os << (DWORD)value << " :"
@@ -777,4 +762,30 @@ LOGRENDER(X_D3DPixelContainer)
 		LOGRENDER_MEMBER_TYPE(X_D3DRESOURCE_SIZE, Size);
 }
 
+LOGRENDER(X_D3DBOX)
+{
+	return os
+		LOGRENDER_MEMBER(Left)
+		LOGRENDER_MEMBER(Top)
+		LOGRENDER_MEMBER(Right)
+		LOGRENDER_MEMBER(Bottom)
+		LOGRENDER_MEMBER(Front)
+		LOGRENDER_MEMBER(Back);
+}
+
+LOGRENDER(X_D3DLOCKED_BOX)
+{
+	return os
+		LOGRENDER_MEMBER(RowPitch)
+		LOGRENDER_MEMBER(SlicePitch)
+		LOGRENDER_MEMBER(pBits);
+}
+
+LOGRENDER(X_D3DLOCKED_RECT)
+{
+	return os
+		LOGRENDER_MEMBER(Pitch)
+		LOGRENDER_MEMBER(pBits);
+}
+
 } // end of namespace xbox
diff --git a/src/core/hle/D3D8/XbD3D8Logging.h b/src/core/hle/D3D8/XbD3D8Logging.h
index 3666b01ff..cc740f77f 100644
--- a/src/core/hle/D3D8/XbD3D8Logging.h
+++ b/src/core/hle/D3D8/XbD3D8Logging.h
@@ -157,6 +157,7 @@ LOGRENDER_HEADER(X_D3DVIEWPORT8)
 LOGRENDER_HEADER(X_D3DDISPLAYMODE)
 LOGRENDER_HEADER(X_D3DResource)
 LOGRENDER_HEADER(X_D3DPixelContainer)
+LOGRENDER_HEADER(X_D3DBOX)
 LOGRENDER_HEADER(X_D3DLOCKED_BOX)
 LOGRENDER_HEADER(X_D3DLOCKED_RECT)
 
diff --git a/src/core/hle/D3D8/XbD3D8Types.h b/src/core/hle/D3D8/XbD3D8Types.h
index e7254c229..f893ffb8a 100644
--- a/src/core/hle/D3D8/XbD3D8Types.h
+++ b/src/core/hle/D3D8/XbD3D8Types.h
@@ -164,6 +164,19 @@ typedef struct _X_D3DVECTOR {
 typedef D3DVECTOR X_D3DVECTOR;
 #endif
 
+#ifdef CXBX_USE_D3D11
+typedef struct _X_D3DBOX {
+	UINT Left;
+	UINT Top;
+	UINT Right;
+	UINT Bottom;
+	UINT Front;
+	UINT Back;
+} X_D3DBOX;
+#else
+typedef D3DBOX X_D3DBOX;
+#endif
+
 #ifdef CXBX_USE_D3D11
 typedef struct _X_D3DLOCKED_BOX {
 	int  RowPitch;
diff --git a/src/core/hle/XGRAPHIC/XGraphic.cpp b/src/core/hle/XGRAPHIC/XGraphic.cpp
index 164f06d11..a42018ca7 100644
--- a/src/core/hle/XGRAPHIC/XGraphic.cpp
+++ b/src/core/hle/XGRAPHIC/XGraphic.cpp
@@ -119,7 +119,7 @@ xbox::void_xt WINAPI xbox::EMUPATCH(XGSwizzleBox)
     LPCVOID          pSource,
     DWORD            RowPitch,
     DWORD            SlicePitch,
-    CONST D3DBOX    *pBox,
+    CONST X_D3DBOX  *pBox,
     LPVOID           pDest,
     DWORD            Width,
     DWORD            Height,
diff --git a/src/core/hle/XGRAPHIC/XGraphic.h b/src/core/hle/XGRAPHIC/XGraphic.h
index e8a636ef5..1ef133c45 100644
--- a/src/core/hle/XGRAPHIC/XGraphic.h
+++ b/src/core/hle/XGRAPHIC/XGraphic.h
@@ -70,7 +70,7 @@ xbox::void_xt WINAPI EMUPATCH(XGSwizzleBox)
     LPCVOID          pSource,
     DWORD            RowPitch,
     DWORD            SlicePitch,
-    CONST D3DBOX    *pBox,
+    CONST X_D3DBOX  *pBox,
     LPVOID           pDest,
     DWORD            Width,
     DWORD            Height,