(D3D) Get rid of some D3D macros