Small include cleanup