diff --git a/include/wx/busyinfo.h b/include/wx/busyinfo.h
index b5a94ba6de..ab9f5a6f2d 100644
--- a/include/wx/busyinfo.h
+++ b/include/wx/busyinfo.h
@@ -16,7 +16,7 @@
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 0d70b7be9e..44cd4d489d 100644
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -15,7 +15,7 @@
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index cfc1a99525..0678587f36 100644
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -16,7 +16,7 @@
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 93b65254dd..c2c0e8110a 100644
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index cba29271dc..5304925002 100644
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -25,7 +25,7 @@ limitation)
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index b3c156edd6..eca35ac6ff 100644
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index c65ab541ce..cf0a49cb65 100644
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -15,7 +15,7 @@
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index 5acc107333..830546db0c 100644
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -12,7 +12,7 @@
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index d2abdf0862..ae547bf813 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -17,7 +17,7 @@
 
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 09801f5d1e..7b9deb923b 100644
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -17,7 +17,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 5abb39fbd0..c3a5e3a26b 100644
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -17,7 +17,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index 33607f7ada..47ac16a2e4 100644
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -17,7 +17,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index ebb83bd452..f57311fce4 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -18,7 +18,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index 1f36a7dca0..b8568821c5 100644
--- a/src/html/m_dflist.cpp
+++ b/src/html/m_dflist.cpp
@@ -17,7 +17,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index f847ce3c30..479ceb5ea2 100644
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -16,7 +16,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index 468a4a97e1..adcc8093b9 100644
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -16,7 +16,7 @@
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 8510a3f34f..c428b4fdbf 100644
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -16,7 +16,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 00a2e48b9d..bce598e298 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -15,7 +15,7 @@
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index 14162b93d1..b20c14402e 100644
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -16,7 +16,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index b36a67897c..f45c64d6b3 100644
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -16,7 +16,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_meta.cpp b/src/html/m_meta.cpp
index c95938bded..7f37ce0062 100644
--- a/src/html/m_meta.cpp
+++ b/src/html/m_meta.cpp
@@ -17,7 +17,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index f429d521d6..e5a2c44147 100644
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -15,7 +15,7 @@
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_style.cpp b/src/html/m_style.cpp
index a31b62b502..9f191ff3b8 100644
--- a/src/html/m_style.cpp
+++ b/src/html/m_style.cpp
@@ -17,7 +17,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index c15a1bc8fa..7a09ed6b74 100644
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -15,7 +15,7 @@
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 8c3ee953aa..9e3ccc26a4 100644
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -17,7 +17,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif