This reverts commit c114229c. Commit 1408d5d8 should make it safe to include these headers in the natural order.