diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 6e48b25fd3..d9431063ef 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -228,7 +228,9 @@ void wxColourDatabase::Initialize ()
         {wxT("MEDIUM GREY"), 100, 100, 100},
     };
 
-    for ( size_t n = 0; n < WXSIZEOF(wxColourTable); n++ )
+    size_t      n;
+
+    for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
     {
         const wxColourDesc& cc = wxColourTable[n];
         Append(cc.name, new wxColour(cc.r,cc.g,cc.b));
diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp
index 1785e0a297..5fb6624086 100644
--- a/src/common/matrix.cpp
+++ b/src/common/matrix.cpp
@@ -1,4 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////
 // Name:        matrix.cpp
 // Purpose:     wxTransformMatrix class
 // Author:      Chris Breeze, Julian Smart
@@ -268,12 +267,12 @@ wxTransformMatrix&  wxTransformMatrix::Mirror(bool x, bool y)
     if (x)
     {
         temp.m_matrix[1][1] = -1;
-        temp.m_isIdentity=false;
+        temp.m_isIdentity=FALSE;
     }
     if (y)
     {
         temp.m_matrix[0][0] = -1;
-        temp.m_isIdentity=false;
+        temp.m_isIdentity=FALSE;
     }
 
     *this = temp * (*this);