diff --git a/common/gal/color4d.cpp b/common/gal/color4d.cpp
index 391e264c52..f673f5eceb 100644
--- a/common/gal/color4d.cpp
+++ b/common/gal/color4d.cpp
@@ -431,10 +431,10 @@ COLOR4D& COLOR4D::Saturate( double aFactor )
     return *this;
 }
 
-constexpr COLOR4D COLOR4D::UNSPECIFIED( 0, 0, 0, 0 );
-constexpr COLOR4D COLOR4D::WHITE( 1, 1, 1, 1 );
-constexpr COLOR4D COLOR4D::BLACK( 0, 0, 0, 1 );
-constexpr COLOR4D COLOR4D::CLEAR( 1, 0, 1, 0 );
+const COLOR4D COLOR4D::UNSPECIFIED( 0, 0, 0, 0 );
+const COLOR4D COLOR4D::WHITE( 1, 1, 1, 1 );
+const COLOR4D COLOR4D::BLACK( 0, 0, 0, 1 );
+const COLOR4D COLOR4D::CLEAR( 1, 0, 1, 0 );
 
 
 EDA_COLOR_T COLOR4D::FindNearestLegacyColor( int aR, int aG, int aB )
diff --git a/common/view/view_overlay.cpp b/common/view/view_overlay.cpp
index 484dbffb00..35fd65d8e8 100644
--- a/common/view/view_overlay.cpp
+++ b/common/view/view_overlay.cpp
@@ -245,9 +245,9 @@ struct VIEW_OVERLAY::COMMAND_BITMAP_TEXT : public VIEW_OVERLAY::COMMAND
         aView->GetGAL()->BitmapText( m_text, m_pos, m_angle );
     }
 
-    double m_angle;
     wxString m_text;
     VECTOR2D m_pos;
+    double m_angle;
 };
 
 VIEW_OVERLAY::VIEW_OVERLAY()