#69 Renamed header files to resolve conflicts with globally installed compiler headers.
Merge pull request #70 from morcmarc/master

#69 Renamed header files to resolve conflicts