First attempt to reorganize include order. Experiment with minimal variant.