Minor changes on includes