move some more source files between directories, following include cluster analysis

Joachim Wuttkerequested to merge
sh1 into develop

opportunities discovered with script tps/analyze-includes

Merge request reports