[ReconstructType] Reorder and prune includes
[ReconstructType] Reorder and prune includes

No promise that this is minimal or optimal.

khizkhiz/swift,khizkhiz/swift,khizkhiz/swift,khizkhiz/swift,khizkhiz/swift,khizkhiz/swift,khizkhiz/swift