diff --git a/roofit/roofitcore/inc/RooMinimizer.h b/roofit/roofitcore/inc/RooMinimizer.h
index 81854f833739b..814650cd237b3 100644
--- a/roofit/roofitcore/inc/RooMinimizer.h
+++ b/roofit/roofitcore/inc/RooMinimizer.h
@@ -39,13 +39,11 @@ class RooRealVar;
 class RooArgSet;
 class RooPlot;
 class RooDataSet;
-#ifdef ROOFIT_MULTIPROCESS
 namespace RooFit {
 namespace TestStatistics {
 class LikelihoodGradientJob;
 }
 } // namespace RooFit
-#endif // ROOFIT_MULTIPROCESS
 
 class RooMinimizer : public TObject {
 public:
@@ -163,9 +161,7 @@ class RooMinimizer : public TObject {
 private:
    friend class RooAbsMinimizerFcn;
    friend class RooMinimizerFcn;
-#ifdef ROOFIT_MULTIPROCESS
    friend class RooFit::TestStatistics::LikelihoodGradientJob;
-#endif // ROOFIT_MULTIPROCESS
 
    std::unique_ptr<RooAbsReal::EvalErrorContext> makeEvalErrorContext() const;
 
diff --git a/roofit/roofitcore/src/RooAbsMinimizerFcn.cxx b/roofit/roofitcore/src/RooAbsMinimizerFcn.cxx
index d4b596dfb88d1..9ea6e541eee59 100644
--- a/roofit/roofitcore/src/RooAbsMinimizerFcn.cxx
+++ b/roofit/roofitcore/src/RooAbsMinimizerFcn.cxx
@@ -83,8 +83,8 @@ RooAbsMinimizerFcn::RooAbsMinimizerFcn(const RooAbsMinimizerFcn &other)
      _evalCounter(other._evalCounter),
      _nDim(other._nDim),
      _optConst(other._optConst),
-     _floatParamList(new RooArgList(*other._floatParamList)),
-     _constParamList(new RooArgList(*other._constParamList)),
+     _floatParamList(std::make_unique<RooArgList>(*other._floatParamList)),
+     _constParamList(std::make_unique<RooArgList>(*other._constParamList)),
      _initFloatParamList(std::make_unique<RooArgList>()),
      _initConstParamList(std::make_unique<RooArgList>()),
      _logfile(other._logfile)