Correct name of included files. Remove files that are not used anymore. Add many
new api entries to their sections.