diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 5e9e14c09b..da045f1c53 100644
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -31,6 +31,8 @@
     #include "wx/msw/winundef.h"
 #endif
 
+struct WXDLLEXPORT wxNativeEncodingInfo;
+
 #if defined(_WX_X_FONTLIKE)
 
 // the symbolic names for the XLFD fields (with examples for their value)
diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index b5e8925dec..cdbaabf73e 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -521,7 +521,6 @@ const char *IC_CharSet::ms_wcCharsetName = NULL;
 bool IC_CharSet::ms_wcNeedsSwap = FALSE;
 
 IC_CharSet::IC_CharSet(const wxChar *name)
-          : wxCharacterSet(name)
 {
     // Do it the hard way
     char cname[100];
diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index ec02cd8ce4..296142c585 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -35,6 +35,7 @@
     #include "wx/app.h"
     #include "wx/font.h"
     #include "wx/log.h"
+    #include "wx/encinfo.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index cc320215b8..68c3e999f8 100644
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -31,7 +31,8 @@
 #if wxUSE_FONTMAP
 
 #ifndef WX_PRECOMP
-  #include "wx/font.h"
+    #include "wx/font.h"
+    #include "wx/encinfo.h"
 #endif
 
 #include "wx/msw/private.h"
diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 1bff1940f7..8f9844def7 100644
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -32,6 +32,7 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/encinfo.h"
 #endif //WX_PRECOMP
 
 #include "wx/msw/private.h"
diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index 869a546f39..94520acb8d 100644
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -32,6 +32,7 @@
 #include "wx/fontmap.h"
 #include "wx/fontenum.h"
 #include "wx/fontutil.h"
+#include "wx/encinfo.h"
 
 // ----------------------------------------------------------------------------
 // Pango
diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 268300e5fc..55cecc3e1b 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -29,6 +29,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/encinfo.h"
 #endif // PCH
 
 #include "wx/fontutil.h"