small fixes in includes