putting includes in the right place