diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 049bda1362..3019e028ee 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -71,7 +71,7 @@
 
 #    undef wxUSE_STACKWALKER
 #    define wxUSE_STACKWALKER 0
-#endif // compiler doesn't support SEH
+#endif /* compiler doesn't support SEH */
 
 /* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */
 #if defined(__MWERKS__)
diff --git a/include/wx/platform.h b/include/wx/platform.h
index aa6c716c03..731bcc6187 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -235,7 +235,7 @@
 #endif /* wxUSE_UNICODE */
 
 #if defined( __MWERKS__ ) && !defined(__INTEL__)
-// otherwise MSL headers bring in WIN32 dependant APIs
+/* otherwise MSL headers bring in WIN32 dependant APIs */
 #undef UNICODE
 #endif
 
diff --git a/setup.h.in b/setup.h.in
index 6e58cdf1f3..e28be0bee1 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -1064,8 +1064,9 @@
    with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
+/* Set to 0 to disable PostScript print/preview architecture code under Windows
+  (just use Windows printing).
+ */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 #endif /* __WIN32__ */
diff --git a/src/common/extended.c b/src/common/extended.c
index b3e2bd8cd6..53cf1db8b5 100644
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -9,7 +9,7 @@
 
 
 #if defined(_WIN32_WCE)
-    // eVC cause warnings in its own headers: stdlib.h and winnt.h
+    /* eVC cause warnings in its own headers: stdlib.h and winnt.h */
     #pragma warning (disable:4115)
     #pragma warning (disable:4214)
 #endif