Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 55707)
+++ /trunk/Config.kmk	(revision 55708)
@@ -635,6 +635,4 @@
  VBOX_WITH_CROGL = 1
 endif
-# enable new wined3d code
-VBOX_WITH_NEW_WINE = 1
 # Enable S3 support (requires libcurl)
 VBOX_WITH_S3 = 1
Index: /trunk/Makefile.kmk
===================================================================
--- /trunk/Makefile.kmk	(revision 55707)
+++ /trunk/Makefile.kmk	(revision 55708)
@@ -571,15 +571,15 @@
 	src/VBox/Additions/WINNT/Graphics/Video/mp/wddm \
 	src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm \
-	src/VBox/Additions/WINNT/Graphics/Wine \
-	src/VBox/Additions/WINNT/Graphics/Wine/d3d8 \
-	src/VBox/Additions/WINNT/Graphics/Wine/d3d9 \
-	src/VBox/Additions/WINNT/Graphics/Wine/libWine \
-	src/VBox/Additions/WINNT/Graphics/Wine/switcher \
-	src/VBox/Additions/WINNT/Graphics/Wine/vbox \
-	src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub \
-	src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include \
-	src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/backup \
-	src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine \
-	src/VBox/Additions/WINNT/Graphics/Wine/wined3d \
+	src/VBox/Additions/WINNT/Graphics/Wine_new \
+	src/VBox/Additions/WINNT/Graphics/Wine_new/d3d8 \
+	src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9 \
+	src/VBox/Additions/WINNT/Graphics/Wine_new/libWine \
+	src/VBox/Additions/WINNT/Graphics/Wine_new/switcher \
+	src/VBox/Additions/WINNT/Graphics/Wine_new/vbox \
+	src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub \
+	src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include \
+	src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/backup \
+	src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine \
+	src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d \
 	src/VBox/Additions/WINNT/Installer \
 	src/VBox/Additions/WINNT/Installer/ISO \
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk	(revision 55707)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk	(revision 55708)
@@ -22,9 +22,5 @@
 include $(PATH_SUB_CURRENT)/Video/Makefile.kmk
 ifdef VBOX_WITH_CROGL
- if !defined(VBOX_WITH_NEW_WINE)
-  include $(PATH_SUB_CURRENT)/Wine/Makefile.kmk
- else
-  include $(PATH_SUB_CURRENT)/Wine_new/Makefile.kmk
- endif
+ include $(PATH_SUB_CURRENT)/Wine_new/Makefile.kmk
 endif
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk	(revision 55707)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk	(revision 55708)
@@ -105,7 +105,4 @@
  VBoxDispD3D_DEFS   += VBOX_WITH_CROGL
 endif
-ifdef VBOX_WITH_NEW_WINE
- VBoxDispD3D_DEFS   += VBOX_WITH_NEW_WINE
-endif
 VBoxDispD3D_INCS     = \
 	../../../include \
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.cpp	(revision 55707)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.cpp	(revision 55708)
@@ -712,7 +712,5 @@
             hr = pDevice9If->CreateVertexBuffer(pAllocation->SurfDesc.width,
                     vboxDDI2D3DUsage(pRc->RcDesc.fFlags)
-#ifdef VBOX_WITH_NEW_WINE
                     & (~D3DUSAGE_DYNAMIC) /* <- avoid using dynamic to ensure wine does not switch do user buffer */
-#endif
                     ,
                     pRc->RcDesc.Fvf,
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.h	(revision 55707)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.h	(revision 55708)
@@ -44,9 +44,5 @@
 #       undef  _interlockedbittestandreset64
 
-#ifdef VBOX_WITH_NEW_WINE
 #include "../../../Wine_new/vbox/VBoxWineEx.h"
-#else
-#include "../../../Wine/vbox/VBoxWineEx.h"
-#endif
 
 /* D3D functionality the VBOXDISPD3D provides */