diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 953b4dd2126..63b88dc2af0 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -7010,14 +7010,6 @@ HFONT CreateFont(
   <define name="afx_msg" value=""/>
   <define name="AFX_EXT_CLASS" value=""/>
   <define name="DEBUG_NEW" value="new"/>
-  <define name="DECLARE_MESSAGE_MAP()" value=""/>
-  <define name="DECLARE_DYNAMIC(x)" value=""/>
-  <define name="DECLARE_DYNAMIC_CLASS(x)" value=""/>
-  <define name="DECLARE_DYNCREATE(x)" value=""/>
-  <define name="DECLARE_SERIAL(x)" value=""/>
-  <define name="IMPLEMENT_DYNAMIC(name,base)" value=""/>
-  <define name="IMPLEMENT_DYNCREATE(name,base)" value=""/>
-  <define name="IMPLEMENT_SERIAL(name,base,schema)" value=""/>
   <define name="INVALID_HANDLE_VALUE" value="0"/>
   <define name="INVALID_SOCKET" value="0"/>
   <define name="WINAPI" value="__stdcall"/>
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
index 75e461d6389..6e1968064f6 100644
--- a/test/testlibrary.cpp
+++ b/test/testlibrary.cpp
@@ -1076,6 +1076,10 @@ class TestLibrary : public TestFixture {
             const Settings s = settingsBuilder().library("std.cfg").library("microsoft_sal.cfg").build();
             ASSERT_EQUALS(s.library.defines.empty(), false);
         }
+        {
+            const Settings s = settingsBuilder().library("std.cfg").library("windows.cfg").library("mfc.cfg").build();
+            ASSERT_EQUALS(s.library.defines.empty(), false);
+        }
     }
 };