Changed header consolidation to include api.h as module-name.h in preprocessing.
fixed typo