slight improvements on includes