Working through the C files. Regoing through the header files
to correct the forward decls in namespaces.