Fix some more headers' visibility