5 files changed, 5 insertions, 5 deletions
diff --git a/src/extension/internal/cairo-render-context.h b/src/extension/internal/cairo-render-context.h
index 6fccc71b7..8d3e63775 100644
--- a/src/extension/internal/cairo-render-context.h
+++ b/src/extension/internal/cairo-render-context.h
@@ -29,7 +29,7 @@
 #include <cairo.h>
 
 class SPClipPath;
-struct SPMask;
+class SPMask;
 
 namespace Inkscape {
 class Pixbuf;
diff --git a/src/extension/internal/cairo-renderer.h b/src/extension/internal/cairo-renderer.h
index 1ab8f1872..cfef6bdea 100644
--- a/src/extension/internal/cairo-renderer.h
+++ b/src/extension/internal/cairo-renderer.h
@@ -28,7 +28,7 @@
 #include <cairo.h>
 
 class SPClipPath;
-struct SPMask;
+class SPMask;
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp
index 55d8d8352..7e6941232 100644
--- a/src/extension/internal/latex-text-renderer.cpp
+++ b/src/extension/internal/latex-text-renderer.cpp
@@ -417,7 +417,7 @@ Flowing in rectangle is possible, not in arb shape.
     }
 
     SPRect *frame = SP_RECT(frame_item);
-    Geom::Rect framebox = sp_rect_get_rect(frame) * transform();
+    Geom::Rect framebox = frame->getRect() * transform();
 
     // get position and alignment
     // Align on topleft corner.
diff --git a/src/extension/internal/latex-text-renderer.h b/src/extension/internal/latex-text-renderer.h
index 9aecf5ed9..77d12bc61 100644
--- a/src/extension/internal/latex-text-renderer.h
+++ b/src/extension/internal/latex-text-renderer.h
@@ -22,7 +22,7 @@
 #include <stack>
 
 class SPItem;
-struct SPRoot;
+class SPRoot;
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 9f745cdea..a7c14387f 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -1484,7 +1484,7 @@ bool OdfOutput::processGradient(SPItem *item,
     for (SPStop *stop = grvec->getFirstStop();
          stop ; stop = stop->getNextStop())
     {
-        unsigned long rgba = sp_stop_get_rgba32(stop);
+        unsigned long rgba = stop->get_rgba32();
         unsigned long rgb  = (rgba >> 8) & 0xffffff;
         double opacity     = (static_cast<double>(rgba & 0xff)) / 256.0;
         GradientStop gs(rgb, opacity);