Removed extraneous #includes
Blank line removal
Removed extraneous #includes
Moved names to library's internal namespace