minor restructure of includes