Merge pull request #2018 from KhronosGroup/fix-2007-rationalize-include-paths

Fix #2007: Fix a couple relative header paths in header files.