diff --git a/python/core/auto_generated/geometry/qgswkbptr.sip.in b/python/core/auto_generated/geometry/qgswkbptr.sip.in
index da02b15db01..3bad9588403 100644
--- a/python/core/auto_generated/geometry/qgswkbptr.sip.in
+++ b/python/core/auto_generated/geometry/qgswkbptr.sip.in
@@ -38,7 +38,6 @@ class QgsConstWkbPtr
 
 
 
-
   public:
     QgsConstWkbPtr( const unsigned char *p /Array/, int size /ArraySize/ );
 
@@ -46,6 +45,7 @@ class QgsConstWkbPtr
 
 
 
+
 };
 
 /************************************************************************
diff --git a/python/gui/auto_generated/qgsnewmemorylayerdialog.sip.in b/python/gui/auto_generated/qgsnewmemorylayerdialog.sip.in
index 3bbd0d64938..8471c10c856 100644
--- a/python/gui/auto_generated/qgsnewmemorylayerdialog.sip.in
+++ b/python/gui/auto_generated/qgsnewmemorylayerdialog.sip.in
@@ -28,6 +28,9 @@ Runs the dialog and creates a new memory layer
 %End
 
     QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
+%Docstring
+New dialog constructor.
+%End
     ~QgsNewMemoryLayerDialog();
 
     QgsWkbTypes::Type selectedType() const;
diff --git a/python/gui/auto_generated/qgsnewvectorlayerdialog.sip.in b/python/gui/auto_generated/qgsnewvectorlayerdialog.sip.in
index c870a0a047a..e9dcb23c762 100644
--- a/python/gui/auto_generated/qgsnewvectorlayerdialog.sip.in
+++ b/python/gui/auto_generated/qgsnewvectorlayerdialog.sip.in
@@ -28,6 +28,9 @@ If the ``initialPath`` argument is specified, then the dialog will default to th
 %End
 
     QgsNewVectorLayerDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
+%Docstring
+New dialog constructor.
+%End
     ~QgsNewVectorLayerDialog();
     QgsWkbTypes::Type selectedType() const;
 %Docstring
diff --git a/src/core/geometry/qgswkbptr.h b/src/core/geometry/qgswkbptr.h
index f509349527e..0a002fb3790 100644
--- a/src/core/geometry/qgswkbptr.h
+++ b/src/core/geometry/qgswkbptr.h
@@ -132,19 +132,6 @@ class CORE_EXPORT QgsConstWkbPtr
     mutable bool mEndianSwap;
     mutable QgsWkbTypes::Type mWkbType;
 
-#ifndef SIP_RUN
-    template<typename T>
-    void endian_swap( T &value ) const
-    {
-      char *data = reinterpret_cast<char *>( &value );
-      std::size_t n = sizeof( value );
-      for ( std::size_t i = 0, m = n / 2; i < m; ++i )
-      {
-        std::swap( data[i], data[n - 1 - i] );
-      }
-    }
-#endif
-
     /**
      * \brief Verify bounds
      * \note note available in Python bindings
@@ -196,6 +183,17 @@ class CORE_EXPORT QgsConstWkbPtr
      * \note note available in Python bindings
      */
     inline int remaining() const { return mEnd - mP; } SIP_SKIP
+
+  private:
+    template<typename T> void endian_swap( T &value ) const SIP_SKIP
+    {
+      char *data = reinterpret_cast<char *>( &value );
+      std::size_t n = sizeof( value );
+      for ( std::size_t i = 0, m = n / 2; i < m; ++i )
+      {
+        std::swap( data[i], data[n - 1 - i] );
+      }
+    }
 };
 
 #endif // QGSWKBPTR_H
diff --git a/src/gui/qgsnewmemorylayerdialog.h b/src/gui/qgsnewmemorylayerdialog.h
index b94fca06676..68b09321acd 100644
--- a/src/gui/qgsnewmemorylayerdialog.h
+++ b/src/gui/qgsnewmemorylayerdialog.h
@@ -43,6 +43,9 @@ class GUI_EXPORT QgsNewMemoryLayerDialog: public QDialog, private Ui::QgsNewMemo
      */
     static QgsVectorLayer *runAndCreateLayer( QWidget *parent = nullptr, const QgsCoordinateReferenceSystem &defaultCrs = QgsCoordinateReferenceSystem() );
 
+    /**
+     * New dialog constructor.
+     */
     QgsNewMemoryLayerDialog( QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
     ~QgsNewMemoryLayerDialog() override;
 
diff --git a/src/gui/qgsnewvectorlayerdialog.h b/src/gui/qgsnewvectorlayerdialog.h
index 9780b8bfe15..31775346610 100644
--- a/src/gui/qgsnewvectorlayerdialog.h
+++ b/src/gui/qgsnewvectorlayerdialog.h
@@ -44,6 +44,9 @@ class GUI_EXPORT QgsNewVectorLayerDialog: public QDialog, private Ui::QgsNewVect
     static QString runAndCreateLayer( QWidget *parent = nullptr, QString *enc = nullptr, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem(),
                                       const QString &initialPath = QString() );
 
+    /**
+     * New dialog constructor.
+     */
     QgsNewVectorLayerDialog( QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
     ~QgsNewVectorLayerDialog() override;
     //! Returns the selected geometry type