Refactoring and cleanup

- Updated header dependencies.
- Updated the EGL example harness.