Lib folder includes cleanup
Merge pull request #2660 from srgnuclear/lincludes

Lib folder includes cleanup