Fix some include loops

19 months ago, Gary Kramlich