Fixed includes in several files