Move all the declarations into one header file. More work through the CPP files.