This commit updates the visibility of various header files and cleans up some unnecessary inclusions. Also, this commit removes certain header include paths which were maintained for backward compatibility.
Regression from f391d610e8185631b5361dc6c844c4c04aac30b1
Closes IDF-4132