Giving up on resolving include dependencies, but commit some more cleanup.
Giving up on resolving include dependencies, but commit some more cleanup.

SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack