diff --git a/src/server/qgsserverinterfaceimpl.cpp b/src/server/qgsserverinterfaceimpl.cpp
index 29aca9ac531..31449b90ab2 100644
--- a/src/server/qgsserverinterfaceimpl.cpp
+++ b/src/server/qgsserverinterfaceimpl.cpp
@@ -95,6 +95,10 @@ void QgsServerInterfaceImpl::registerServerCache( QgsServerCacheFilter *serverCa
 #endif
 }
 
+QgsServerCacheManager *QgsServerInterfaceImpl::cacheManager() const
+{
+  return mCacheManager.get();
+}
 
 void QgsServerInterfaceImpl::removeConfigCacheEntry( const QString &path )
 {
diff --git a/src/server/qgsserverinterfaceimpl.h b/src/server/qgsserverinterfaceimpl.h
index 1bad84c4abf..d6f41002254 100644
--- a/src/server/qgsserverinterfaceimpl.h
+++ b/src/server/qgsserverinterfaceimpl.h
@@ -24,6 +24,7 @@
 
 #include "qgsserverinterface.h"
 #include "qgscapabilitiescache.h"
+#include "qgsservercachemanager.h"
 
 /**
  * \ingroup server
@@ -74,7 +75,7 @@ class QgsServerInterfaceImpl : public QgsServerInterface
      * \returns the server cache helper
      * \since QGIS 3.4
      */
-    QgsServerCacheManager *cacheManager() const override { return mCacheManager.get(); }
+    QgsServerCacheManager *cacheManager() const override;
 
     QString getEnv( const QString &name ) const override;
     QString configFilePath() override { return mConfigFilePath; }
diff --git a/src/server/services/wfs/qgswfsutils.cpp b/src/server/services/wfs/qgswfsutils.cpp
index 238eaddbe2b..00ac4c3063b 100644
--- a/src/server/services/wfs/qgswfsutils.cpp
+++ b/src/server/services/wfs/qgswfsutils.cpp
@@ -25,6 +25,7 @@
 #include "qgsconfigcache.h"
 #include "qgsserverprojectutils.h"
 #include "qgswfsparameters.h"
+#include "qgsvectorlayer.h"
 
 namespace QgsWfs
 {
diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
index 15de9541749..02ef4c35b01 100644
--- a/src/server/services/wms/qgswmsgetcapabilities.cpp
+++ b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -39,6 +39,7 @@
 
 #include "qgsexception.h"
 #include "qgsexpressionnodeimpl.h"
+#include "qgsvectorlayer.h"
 
 
 namespace QgsWms
diff --git a/tests/src/core/testqgsvectorlayerutils.cpp b/tests/src/core/testqgsvectorlayerutils.cpp
index 1c81f919281..76d68a2a1d5 100644
--- a/tests/src/core/testqgsvectorlayerutils.cpp
+++ b/tests/src/core/testqgsvectorlayerutils.cpp
@@ -15,6 +15,7 @@
 #include "qgstest.h"
 
 #include "qgsvectorlayerutils.h"
+#include "qgsvectorlayer.h"
 
 /**
  * \ingroup UnitTests