header simplification. (ideal here is each source just includes own <filename.h>, and headers manage eachother, we just need to cut things up more until 100% possible.)