Merge pull request #218 from KhronosGroup/fix-ordering

Fix two ordering problems and rebuild headers.