Revert #include reduction.
Rename stuff.