Sort samples and add category include headers