minor changes

made functions const
removed #include header files from header files
removed using namspance from header file