Fix build issues

This fixes build issues on Windows 8.1 regarding DirectX header
conflictions.