diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 7d3316487f..210495eac6 100644
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -44,27 +44,6 @@
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_4 1
 
-// In wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
-// but this is very dangerous because you can mistakenly pass an icon instead
-// of a bitmap to a function taking "const wxBitmap&" - which will *not* work
-// because an icon is not a valid bitmap
-//
-// Starting from 2.1.12, you have the choice under this backwards compatible
-// behaviour (your code will still compile, but probably won't behave as
-// expected!) and not deriving wxIcon class from wxBitmap, but providing a
-// conversion ctor wxBitmap(const wxIcon&) instead.
-//
-// Recommended setting: 0
-#define wxICON_IS_BITMAP    0
-
-// Define as 1 for font size to be backward compatible to 1.63 and earlier.
-// 1.64 and later define point sizes to be compatible with Windows.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxFONT_SIZE_COMPATIBILITY    0
-
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.
 //
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index eac70a3750..70471a1349 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -44,14 +44,6 @@
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_4 1
 
-// Define as 1 for font size to be backward compatible to 1.63 and earlier.
-// 1.64 and later define point sizes to be compatible with Windows.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxFONT_SIZE_COMPATIBILITY    0
-
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.
 //
diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h
index d241ea6762..8f291d8ecd 100644
--- a/include/wx/msw/setup_microwin.h
+++ b/include/wx/msw/setup_microwin.h
@@ -28,7 +28,7 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.0 API: set it to 1 to
+// This setting determines the compatibility with 2.2 API: set it to 1 to
 // enable it
 //
 // Default is 1.
@@ -36,27 +36,6 @@
 // Recommended setting: 0 (please update your code instead!)
 #define WXWIN_COMPATIBILITY_2_2 1
 
-// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
-// but this is very dangerous because you can mistakenly pass an icon instead
-// of a bitmap to a function taking "const wxBitmap&" - which will *not* work
-// because an icon is not a valid bitmap
-//
-// Starting from 2.1.12, you have the choice under this backwards compatible
-// behaviour (your code will still compile, but probably won't behave as
-// expected!) and not deriving wxIcon class from wxBitmap, but providing a
-// conversion ctor wxBitmap(const wxIcon&) instead.
-//
-// Recommended setting: 0
-#define wxICON_IS_BITMAP    0
-
-// Define as 1 for font size to be backward compatible to 1.63 and earlier.
-// 1.64 and later define point sizes to be compatible with Windows.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxFONT_SIZE_COMPATIBILITY    0
-
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.
 //
diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 86c960cffc..c691ae3137 100644
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -44,14 +44,6 @@
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_4 1
 
-// Define as 1 for font size to be backward compatible to 1.63 and earlier.
-// 1.64 and later define point sizes to be compatible with Windows.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxFONT_SIZE_COMPATIBILITY    0
-
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.
 //
diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index ca57b257cc..2f000c4aa4 100644
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -16,23 +16,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
-// compatible (even if incorrect) behaviour by default: derive wxIcon from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
-    #define wxICON_IS_BITMAP 1
-#endif
-
 #include "wx/bitmap.h"
-#if wxICON_IS_BITMAP
+#include "wx/os2/gdiimage.h"
 
-    #define wxIconRefDataBase   wxBitmapRefData
-    #define wxIconBase          wxBitmap
-#else
-    #include "wx/os2/gdiimage.h"
-
-    #define wxIconRefDataBase   wxGDIImageRefData
-    #define wxIconBase          wxGDIImage
-#endif
+#define wxIconRefDataBase   wxGDIImageRefData
+#define wxIconBase          wxGDIImage
 
 class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
 {
diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 3116862a7f..9b4e88ed66 100644
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -18,9 +18,6 @@
 
 #define wxUSE_EXCEPTIONS    1
 
-// define this to 1 if you want icons to behave as bitmaps
-#define wxICON_IS_BITMAP     0
-
 // define this to 0 when building wxBase library
 #define wxUSE_GUI            1
 
diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 9743a02702..a5b7d68066 100644
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -44,14 +44,6 @@
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_4 1
 
-// Define as 1 for font size to be backward compatible to 1.63 and earlier.
-// 1.64 and later define point sizes to be compatible with Windows.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxFONT_SIZE_COMPATIBILITY    0
-
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.
 //
diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index fc1d87c29b..a8eb0fec27 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -44,14 +44,6 @@
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_4 1
 
-// Define as 1 for font size to be backward compatible to 1.63 and earlier.
-// 1.64 and later define point sizes to be compatible with Windows.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxFONT_SIZE_COMPATIBILITY 0
-
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.
 //
@@ -868,10 +860,11 @@
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
 
 // Set to 0 to disable MDI document/view architecture
+//
+// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
 #define wxUSE_MDI_ARCHITECTURE 1
 
 // Set to 0 to disable print/preview architecture code
-//
 #define wxUSE_PRINTING_ARCHITECTURE 1
 
 // wxHTML sublibrary allows to display HTML in wxWindow programs and much,
diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index 034eefb85b..183c9e59c6 100644
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -183,14 +183,7 @@ void MyFrame::AddSampleText(wxLayoutList *llist)
    llist->LineBreak();
 
     llist->Insert(_T("Hello "));
-    wxBitmap *icon =
-#if wxICON_IS_BITMAP
-        new wxIcon(Micon_xpm)
-#else
-        new wxBitmap (wxIcon(Micon_xpm))
-#endif
-
-        ;
+    wxBitmap *icon = new wxBitmap (wxIcon(Micon_xpm));
 
     llist->Insert(new wxLayoutObjectIcon(icon));
     llist->SetFontWeight(wxBOLD);
diff --git a/setup.h.in b/setup.h.in
index 6dfba67f8b..7a0753391d 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -256,7 +256,6 @@
 #define wxUSE_ODBC 0
 #define wxUSE_BUILTIN_IODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
-#define wxODBC_BACKWARD_COMPATABILITY 0
 /*
  * Use freetype
  */
diff --git a/setup.h_vms b/setup.h_vms
index f82c4156e8..e6d40f1ced 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -265,7 +265,6 @@
 #define wxUSE_ODBC 1
 #define wxUSE_BUILTIN_IODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
-#define wxODBC_BACKWARD_COMPATABILITY 0
 /*
  * Use freetype
  */
diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 7a718ff004..9b40d9cb92 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -506,16 +506,11 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
 
 void wxNativeFontInfo::SetPointSize(int pointsize)
 {
-#if wxFONT_SIZE_COMPATIBILITY
-    // Incorrect, but compatible with old wxWidgets behaviour
-    lf.lfHeight = (pointSize*ppInch)/72;
-#else // wxFONT_SIZE_COMPATIBILITY
     // FIXME: using the screen here results in incorrect font size calculation
     //        for printing!
     const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
 
     lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5);
-#endif // wxFONT_SIZE_COMPATIBILITY/!wxFONT_SIZE_COMPATIBILITY
 }
 
 void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
diff --git a/utils/configtool/configs/wxwin250.wxs b/utils/configtool/configs/wxwin250.wxs
index c6dd6586be..42e3c4c1ec 100644
--- a/utils/configtool/configs/wxwin250.wxs
+++ b/utils/configtool/configs/wxwin250.wxs
@@ -1044,28 +1044,6 @@ Recommended setting: 0 (please update your code)
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>1</active>
-                <enabled>1</enabled>
-                <name>wxFONT_SIZE_COMPATIBILITY</name>
-                <description>&lt;B&gt;Define as 1 for font size to be backward compatible to 1.63 and earlier.&lt;/B&gt;&lt;P&gt;
-
-1.64 and later define point sizes to be compatible with Windows.&lt;P&gt;
-
-Default is 0.
-</description>
-                <default-state>1</default-state>
-                <requires></requires>
-                <precludes></precludes>
-                <enabled-if></enabled-if>
-                <enabled-if-not></enabled-if-not>
-                <indeterminate-if></indeterminate-if>
-                <exclusivity></exclusivity>
-                <context>__WXMSW__</context>
-                <configure-command></configure-command>
-                <help-topic>wxFont</help-topic>
-                <notes></notes>
-            </setting>
             <setting type="bool-check">
                 <active>1</active>
                 <enabled>1</enabled>