Fixed numerous include-related glitches