diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 7a8d472c78..0ae5bbd7ff 100644
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -153,7 +153,7 @@
     #endif
     #pragma comment(lib, wxBASE_LIB_NAME("net"))
 #endif
-#ifndef wxNO_XML_LIB
+#if wxUSE_XML && !defined(wxNO_XML_LIB)
     #pragma comment(lib, wxBASE_LIB_NAME("xml"))
 #endif
 #if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL)
@@ -183,7 +183,7 @@
         #pragma comment(lib, wxTOOLKIT_LIB_NAME("adv"))
     #endif
 
-    #ifndef wxNO_HTML_LIB
+    #if wxUSE_HTML && !defined(wxNO_HTML_LIB)
         #pragma comment(lib, wxTOOLKIT_LIB_NAME("html"))
     #endif
     #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)