diff --git a/app/controllers/spree/base_controller.rb b/app/controllers/spree/base_controller.rb
index 21a3d6fe5d..b2e4628bc3 100644
--- a/app/controllers/spree/base_controller.rb
+++ b/app/controllers/spree/base_controller.rb
@@ -3,8 +3,8 @@
 require 'cancan'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/respond_with'
-require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/ssl'
+require 'spree/core/controller_helpers/common'
 
 module Spree
   class BaseController < ApplicationController
diff --git a/app/models/enterprise_group.rb b/app/models/enterprise_group.rb
index 0bf0319bde..5bb20d3821 100644
--- a/app/models/enterprise_group.rb
+++ b/app/models/enterprise_group.rb
@@ -1,5 +1,6 @@
 require 'open_food_network/locking'
 require 'open_food_network/permalink_generator'
+require 'spree/core/s3_support'
 
 class EnterpriseGroup < ActiveRecord::Base
   include PermalinkGenerator
diff --git a/app/models/spree/gateway.rb b/app/models/spree/gateway.rb
index 99d57826fb..4b7533c2d8 100644
--- a/app/models/spree/gateway.rb
+++ b/app/models/spree/gateway.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'concerns/payment_method_distributors'
+require 'spree/core/delegate_belongs_to'
+
 module Spree
   class Gateway < PaymentMethod
     include PaymentMethodDistributors
diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb
index ba1dc3e301..a521122d67 100644
--- a/app/models/spree/payment_method.rb
+++ b/app/models/spree/payment_method.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'concerns/payment_method_distributors'
+require 'spree/core/calculated_adjustments'
+
 module Spree
   class PaymentMethod < ActiveRecord::Base
     include Spree::Core::CalculatedAdjustments
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 5c583a5252..7461ca069e 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'spree/core/gateway_error'
 
 describe Spree::Order do
   include OpenFoodNetwork::EmailHelper