Direct3D D3DX migration to DirectXMath

We have an existing Windows framework for rendering video using Direct3d. We use Direct3D rather than Direct2D because we make use of pixel shaders to convert YUV to RGB in the GPU. We have based our framework on the Rastertek tutorial ([login to view URL]). However, as a result, our code is dependent on D3DX, which is now deprecated and which requires us to install the 5-year-old Direct3D redistributable. We would like someone to remote the dependence on D3DX. As far as I can tell, there are two areas of dependence: 1) Use of D3DX11CompileFromMemory(...). This should readily convert to use of D3DCompile(...) 2) Use of d3dxMath10 - heavy dependence on D3DXVECTOR3, D3DXVECTOR2 and D3DXMATRIX which will need to be migrated to use XMFLOAT* We will supply a simple test application that uses the framework - your job is to return a revised application that no longer requires the old redistributable