Fixed includes in solution