Reorganize build to limit extra warnings to guihck