Updates sources and makefiles to compiling version; avoid using namespaces in headers