Includes for other folders removed or shifted to .cpp
Merge pull request #2651 from srgnuclear/tincludes

Includes for other folders removed or shifted to .cpp #2557