Support for third part inclusion.

This release contains some small bug fixes allowing the headers to be included from third party projects without creating issues of multiple symbol definitions.