The next step of a general cleanup of our includes. This one mostly adds missing includes but there are a few removals as well.
removes code duplication also move switch-root to shared