diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index cc7ec00bbb..901b203953 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -355,6 +355,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <warnings>max</warnings>
+        <cppflags-watcom>-wcd=549</cppflags-watcom>
     </template>
 
     <!-- for both GUI and wxBase libs/samples: -->
diff --git a/include/wx/defs.h b/include/wx/defs.h
index ea65618572..fb6d8b018c 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -82,12 +82,6 @@
 #endif
 #endif /*  __VISUALC__ */
 
-/*  suppress some Watcom C++ warnings */
-#ifdef __WATCOMC__
-#   pragma warning 849 9            /*  Disable 'virtual function hidden' */
-#   pragma warning 549 9            /*  Disable 'operand contains compiler generated information' */
-#endif /*  __VISUALC__ */
-
 /*  suppress some Salford C++ warnings */
 #ifdef __SALFORDC__
 #   pragma suppress 353             /*  Possible nested comments */