diff --git a/common/dialogs/dialog_plugin_options.cpp b/common/dialogs/dialog_plugin_options.cpp
index 70809e9e70..3404e2cccc 100644
--- a/common/dialogs/dialog_plugin_options.cpp
+++ b/common/dialogs/dialog_plugin_options.cpp
@@ -43,8 +43,8 @@ DIALOG_PLUGIN_OPTIONS::DIALOG_PLUGIN_OPTIONS( wxWindow* aParent,
                         const wxString& aFormattedOptions,
                         wxString* aResult ) :
     DIALOG_PLUGIN_OPTIONS_BASE( aParent ),
-    m_choices( aPluginOptions ),
     m_callers_options( aFormattedOptions ),
+    m_choices( aPluginOptions ),
     m_result( aResult ),
     m_initial_help( INITIAL_HELP ),
     m_grid_widths_dirty( true )
diff --git a/common/gal/cairo/cairo_gal.cpp b/common/gal/cairo/cairo_gal.cpp
index 43ed561ac5..307f556759 100644
--- a/common/gal/cairo/cairo_gal.cpp
+++ b/common/gal/cairo/cairo_gal.cpp
@@ -126,7 +126,7 @@ const VECTOR2D CAIRO_GAL_BASE::xform( const VECTOR2D& aP )
 }
 
 
-const double CAIRO_GAL_BASE::angle_xform( const double aAngle )
+double CAIRO_GAL_BASE::angle_xform( double aAngle )
 {
     // calculate rotation angle due to the rotation transform
     // and if flipped on X axis.
@@ -174,7 +174,7 @@ void CAIRO_GAL_BASE::arc_angles_xform_and_normalize( double& aStartAngle, double
 }
 
 
-const double CAIRO_GAL_BASE::xform( double x )
+double CAIRO_GAL_BASE::xform( double x )
 {
     double dx = m_currentWorld2Screen.xx * x;
     double dy = m_currentWorld2Screen.yx * x;
diff --git a/include/gal/cairo/cairo_gal.h b/include/gal/cairo/cairo_gal.h
index c16ad58d53..79346aad68 100644
--- a/include/gal/cairo/cairo_gal.h
+++ b/include/gal/cairo/cairo_gal.h
@@ -248,7 +248,7 @@ public:
 
 protected:
     // Geometric transforms according to the m_currentWorld2Screen transform matrix:
-    const double xform( double x );             // scale
+    double xform( double x );             // scale
     const VECTOR2D xform( double x, double y ); // rotation, scale and offset
     const VECTOR2D xform( const VECTOR2D& aP ); // rotation, scale and offset
 
@@ -258,7 +258,7 @@ protected:
      * @param aAngle is the angle in radians to transform.
      * @return the modified angle.
      */
-    const double angle_xform( const double aAngle );
+    double angle_xform( double aAngle );
 
     /**
      * Transform according to the rotation from m_currentWorld2Screen transform matrix