Multiple changes

- Updated header includes.
- Minor changes in the build system.