diff --git a/ChangeLog.txt b/ChangeLog.txt
index 38ac334dd6..ba02bc670d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,15 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2020-02-05 11:25 UTC+0100 Aleksander Czajczynski (hb fki.pl)
+  * src/vm/fm.c
+  * src/macro/macro.y
+  * src/macro/macro.yyc
+    ! guarded more C++ mode only pragmas for OpenWatcom. Issue #202
+
+  * utils/hbmk2/hbmk2.prg
+    ! reverted C++ check
+
 2020-02-05 08:08 UTC+0100 Aleksander Czajczynski (hb fki.pl)
   * config/dos/watcom.mk
   * config/linux/watcom.mk
diff --git a/src/macro/macro.y b/src/macro/macro.y
index 8a9d5a4842..1bfc246ace 100644
--- a/src/macro/macro.y
+++ b/src/macro/macro.y
@@ -74,7 +74,7 @@
 #  pragma warn -aus
 #  pragma warn -ccc
 #  pragma warn -rch
-#elif defined( __WATCOMC__ )
+#elif defined( __WATCOMC__ ) && defined( __cplusplus )
 #  pragma warning 13 9
 #  pragma warning 368 9
 #elif defined( _MSC_VER )
diff --git a/src/macro/macro.yyc b/src/macro/macro.yyc
index 8bb9227597..bccf54a71b 100644
--- a/src/macro/macro.yyc
+++ b/src/macro/macro.yyc
@@ -140,7 +140,7 @@
 #  pragma warn -aus
 #  pragma warn -ccc
 #  pragma warn -rch
-#elif defined( __WATCOMC__ )
+#elif defined( __WATCOMC__ ) && defined( __cplusplus )
 #  pragma warning 13 9
 #  pragma warning 368 9
 #elif defined( _MSC_VER )
diff --git a/src/vm/fm.c b/src/vm/fm.c
index 84088119e9..243b54392e 100644
--- a/src/vm/fm.c
+++ b/src/vm/fm.c
@@ -164,10 +164,12 @@
 #  elif defined( __POCC__ ) && ! defined( InterlockedCompareExchangePointer )
 #     define InterlockedCompareExchangePointer
 #  elif defined( __WATCOMC__ )
-#     pragma warning 13 9
-#     pragma warning 367 9
-#     pragma warning 368 9
-#     pragma warning 887 9
+#     if defined( __cplusplus )
+#        pragma warning 13 9
+#        pragma warning 367 9
+#        pragma warning 368 9
+#        pragma warning 887 9
+#     endif
 #     pragma disable_message ( 201 )
 #     if ! defined( USE_DL_PREFIX ) && ! defined( HB_FM_DLMT_ALLOC )
 #        define USE_DL_PREFIX
@@ -211,11 +213,12 @@
 #     pragma warn +rch
 #     pragma warn +inl
 #  elif defined( __WATCOMC__ )
-#     pragma warning 13 2
-#     pragma warning 367 2
-#     pragma warning 368 2
-#     pragma warning 887 2
-#     pragma warning 887 2
+#     if defined( __cplusplus )
+#        pragma warning 13 2
+#        pragma warning 367 2
+#        pragma warning 368 2
+#        pragma warning 887 2
+#     endif
 #     pragma enable_message ( 201 )
 #  elif defined( _MSC_VER )
 #     pragma warning( pop )
@@ -471,7 +474,7 @@ static void hb_mspace_cleanup( void )
 
 #elif defined( HB_FM_DL_ALLOC ) && defined( USE_DL_PREFIX )
 
-#if defined( __WATCOMC__ )
+#if defined( __WATCOMC__ ) && defined( __cplusplus )
 #  pragma warning 367 9
 #endif
 
@@ -492,7 +495,7 @@ static void dlmalloc_destroy( void )
    }
 }
 
-#if defined( __WATCOMC__ )
+#if defined( __WATCOMC__ ) && defined( __cplusplus )
 #  pragma warning 367 2
 #endif
 
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index 274d541aeb..481cd732da 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -4803,9 +4803,9 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
             AAdd( hbmk[ _HBMK_aOPTC ], "-w1" )
             IF hbmk[ _HBMK_lCPP ] != NIL
                IF hbmk[ _HBMK_lCPP ]
-                  AAdd( hbmk[ _HBMK_aOPTC ], "-wcd124 -wcd136 -wcd201" )
-               ELSE
                   AAdd( hbmk[ _HBMK_aOPTC ], "-wcd367 -wcd368" )
+               ELSE
+                  AAdd( hbmk[ _HBMK_aOPTC ], "-wcd124 -wcd136 -wcd201" )
                ENDIF
             ENDIF
             EXIT