In many places, string, map, or Common.h were included but not needed.
It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.