diff --git a/python/server/auto_generated/qgsaccesscontrol.sip.in b/python/server/auto_generated/qgsaccesscontrol.sip.in
index 32b6c672e01..ac892cbf703 100644
--- a/python/server/auto_generated/qgsaccesscontrol.sip.in
+++ b/python/server/auto_generated/qgsaccesscontrol.sip.in
@@ -16,8 +16,7 @@
 class QgsAccessControl : QgsFeatureFilterProvider
 {
 %Docstring
-A helper class that centralize the restrictions given by all the
-access control filter plugins.
+A helper class that centralize the restrictions given by all the access control filter plugins.
 
 .. versionadded:: 2.14
 %End
diff --git a/src/server/qgsaccesscontrol.h b/src/server/qgsaccesscontrol.h
index 97cb21684d9..7541a15e863 100644
--- a/src/server/qgsaccesscontrol.h
+++ b/src/server/qgsaccesscontrol.h
@@ -33,8 +33,7 @@ class QgsAccessControlPlugin;
 /**
  * \ingroup server
  * \class QgsAccessControl
- * \brief A helper class that centralize the restrictions given by all the
- *        access control filter plugins.
+ * \brief A helper class that centralize the restrictions given by all the access control filter plugins.
  * \since QGIS 2.14
  **/
 class SERVER_EXPORT QgsAccessControl : public QgsFeatureFilterProvider
diff --git a/src/server/services/wms/qgswmsparameters.h b/src/server/services/wms/qgswmsparameters.h
index ad771157248..07be0f316c8 100644
--- a/src/server/services/wms/qgswmsparameters.h
+++ b/src/server/services/wms/qgswmsparameters.h
@@ -30,12 +30,6 @@
 #include "qgsgeometry.h"
 #include "qgsprojectversion.h"
 
-/**
- * \ingroup server
- * QgsWmsParameters provides an interface to retrieve and manipulate WMS
- *  parameters received from the client.
- * \since QGIS 3.0
- */
 namespace QgsWms
 {
   struct QgsWmsParametersLayer
@@ -74,6 +68,12 @@ namespace QgsWms
     QList<QgsWmsParametersHighlightLayer> mHighlightLayers; // list of highlight layers for this composer map
   };
 
+  /**
+   * \ingroup server
+   * \class QgsWmsParameters
+   * \brief Interface to retrieve and manipulate WMS parameters received from the client.
+   * \since QGIS 3.0
+   */
   class QgsWmsParameters
   {
       Q_GADGET
diff --git a/src/server/services/wms/qgswmsserviceexception.h b/src/server/services/wms/qgswmsserviceexception.h
index 92cd04538a6..4d949bef9e0 100644
--- a/src/server/services/wms/qgswmsserviceexception.h
+++ b/src/server/services/wms/qgswmsserviceexception.h
@@ -29,13 +29,14 @@ namespace QgsWms
    * \ingroup server
    * \class  QgsserviceException
    * \brief Exception class for WMS service exceptions.
-   * \since QGIS 3.0
    *
    * The most important codes are:
    *  * "InvalidFormat"
    *  * "Invalid CRS"
    *  * "LayerNotDefined" / "StyleNotDefined"
    *  * "OperationNotSupported"
+   *
+   * \since QGIS 3.0
    */
   class QgsServiceException : public QgsOgcServiceException
   {