diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index c4f4bfb899..b22a79ba26 100644
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -37,11 +37,11 @@ wxStringTokenizer::~wxStringTokenizer()
 
 off_t wxStringTokenizer::FindDelims(const wxString& str, const wxString& delims) const
 {
-    for ( int i = 0; i < str.Length(); i++ )
+    for ( size_t i = 0; i < str.Length(); i++ )
     {
         char c = str[i];
 
-        for ( int j = 0; j < delims.Length() ; j++ )
+        for ( size_t j = 0; j < delims.Length() ; j++ )
         {
             if ( delims[j] == c )
                 return i;
diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index fba42b9352..90ec19c7b6 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -146,7 +146,7 @@ int WXDLLEXPORT wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
 #endif
 
 #ifndef wxStrdup
-wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz)
+WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz)
 {
   size_t size = (wxStrlen(psz) + 1) * sizeof(wxChar);
   wxChar *ret = (wxChar *) malloc(size);
@@ -168,7 +168,7 @@ int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
 #endif
 
 #ifndef wxStrtok
-wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
+WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {
   if (!psz) psz = *save_ptr;
   psz += wxStrspn(psz, delim);