doxygen fixes
config-tool: source reordering
config-tool: correct header includes