Moved includes to appropriate place