Revert "Make some more needed headers public"

This reverts commit 1327b94b01b0ad0a7983f39d99e181f960ddaa8e.