Fixed numerous include-related glitches
Merge pull request #72 from pjackson28/fixglitches

Fixed numerous include-related glitches