[trunk] Fixing MakeFile builds including XML files