Fix cmakelists, cleanup headers