X include-file use cleanup.