Moving private definitions back into .cpp and normalizing public definitions.
Merge pull request #1 from fkautz/fix-headers

Moving private definitions back into .cpp and normalizing public definit...