finalising include, ready to merge