lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] (no subject)


From: Greg Chicares
Subject: [lmi-commits] (no subject)
Date: Mon, 6 Jun 2016 20:25:41 +0000 (UTC)

branch: master
commit ee6c0230a33cbf23da6c56faac72254281804a09
Author: Gregory W. Chicares <address@hidden>
Date:   Mon Jun 6 20:24:16 2016 +0000

    Reimplement precompiled headers
    
    Use reverse include guards so that those who don't use PCH needn't
    rebuild the world upon each replacement of a boost with a standard
    header.
    
    Add PCH headers where they are appropriate but were missing.
    
    Remove PCH headers where they were inappropriately included.
    
    Adjust makefiles and concinnity tests as needed.
    
    The PCH lists were taken from:
      https://raw.githubusercontent.com/vadz/lmi/tt/pchfile.hpp
      https://raw.githubusercontent.com/vadz/lmi/tt/pchfile_wx.hpp
    as of this day.
---
 about_dialog.cpp                   |    5 +-
 account_value_test.cpp             |    5 +-
 accountvalue.cpp                   |    5 +-
 actuarial_table.cpp                |    5 +-
 actuarial_table_test.cpp           |    5 +-
 alert.cpp                          |    5 +-
 alert_cgi.cpp                      |    5 +-
 alert_cli.cpp                      |    5 +-
 alert_test.cpp                     |    5 +-
 alert_wx.cpp                       |    5 +-
 antediluvian_stubs.cpp             |    5 +-
 any_member_test.cpp                |    5 +-
 assert_lmi_test.cpp                |    5 +-
 authenticity.cpp                   |    5 +-
 authenticity_test.cpp              |    5 +-
 basicvalues.cpp                    |    5 +-
 calendar_date.cpp                  |    5 +-
 calendar_date_test.cpp             |    5 +-
 callback_test.cpp                  |    5 +-
 ce_product_name.cpp                |    2 +
 ce_skin_name.cpp                   |    2 +
 census_document.cpp                |    5 +-
 census_view.cpp                    |    5 +-
 comma_punct_test.cpp               |    5 +-
 commutation_functions.cpp          |    5 +-
 commutation_functions_test.cpp     |    5 +-
 configurable_settings.cpp          |    5 +-
 configurable_settings_test.cpp     |    5 +-
 contains_test.cpp                  |    5 +-
 cpp_main.cpp                       |    5 +-
 crc32.cpp                          |    5 +-
 crc32_test.cpp                     |    5 +-
 custom_io_0.cpp                    |    5 +-
 custom_io_1.cpp                    |    5 +-
 data_directory.cpp                 |    5 +-
 database.cpp                       |    5 +-
 database_document.cpp              |    2 +
 database_view.cpp                  |    5 +-
 database_view_editor.cpp           |    2 +
 datum_base.cpp                     |    5 +-
 datum_boolean.cpp                  |    5 +-
 datum_sequence.cpp                 |    5 +-
 datum_string.cpp                   |    5 +-
 dbdict.cpp                         |    5 +-
 dbnames.cpp                        |    5 +-
 dbvalue.cpp                        |    5 +-
 death_benefits.cpp                 |    5 +-
 default_view.cpp                   |    5 +-
 docmanager_ex.cpp                  |    5 +-
 emit_ledger.cpp                    |    5 +-
 expression_template_0_test.cpp     |    7 +-
 facets.cpp                         |    5 +-
 fenv_guard.cpp                     |    5 +-
 fenv_lmi.cpp                       |    5 +-
 fenv_lmi_test.cpp                  |    5 +-
 file_command.cpp                   |    5 +-
 file_command_cgi.cpp               |    5 +-
 file_command_cli.cpp               |    5 +-
 file_command_test.cpp              |    5 +-
 file_command_wx.cpp                |    5 +-
 financial_test.cpp                 |    5 +-
 fund_data.cpp                      |    5 +-
 generate_passkey.cpp               |    5 --
 generate_product_files.cpp         |    5 +-
 getopt.cpp                         |    5 +-
 getopt_test.cpp                    |    5 +-
 global_settings.cpp                |    5 +-
 global_settings_test.cpp           |    5 +-
 gpt_commutation_functions.cpp      |    5 +-
 gpt_document.cpp                   |    5 +-
 gpt_input.cpp                      |    5 +-
 gpt_server.cpp                     |    5 +-
 gpt_specamt.cpp                    |    5 +-
 gpt_state.cpp                      |    5 +-
 gpt_test.cpp                       |    5 +-
 gpt_view.cpp                       |    5 +-
 gpt_xml_document.cpp               |    5 +-
 group_quote_pdf_gen.cpp            |    5 +-
 group_quote_pdf_gen_wx.cpp         |    5 +-
 group_values.cpp                   |    5 +-
 handle_exceptions_test.cpp         |    5 +-
 icon_monger.cpp                    |    5 +-
 ieee754_test.cpp                   |    5 +-
 ihs_acctval.cpp                    |    5 +-
 ihs_avdebug.cpp                    |    5 +-
 ihs_avmly.cpp                      |    5 +-
 ihs_avsolve.cpp                    |    5 +-
 ihs_avstrtgy.cpp                   |    5 +-
 ihs_basicval.cpp                   |    5 +-
 ihs_irc7702.cpp                    |    5 +-
 ihs_irc7702a.cpp                   |    5 +-
 ihs_mortal.cpp                     |    5 +-
 ihs_server7702.cpp                 |    5 +-
 illustration_document.cpp          |    5 +-
 illustration_view.cpp              |    5 +-
 illustrator.cpp                    |    5 +-
 input.cpp                          |    5 +-
 input_harmonization.cpp            |    5 +-
 input_realization.cpp              |    5 +-
 input_seq_helpers.cpp              |    5 +-
 input_seq_test.cpp                 |    5 +-
 input_sequence.cpp                 |    5 +-
 input_sequence_entry.cpp           |    5 +-
 input_test.cpp                     |    5 +-
 input_xml_io.cpp                   |    5 +-
 interest_rates.cpp                 |    5 +-
 irc7702a_test.cpp                  |    5 +-
 istream_to_string_test.cpp         |    5 +-
 ledger.cpp                         |    5 +-
 ledger_base.cpp                    |    5 +-
 ledger_invariant.cpp               |    5 +-
 ledger_text_formats.cpp            |    5 +-
 ledger_variant.cpp                 |    5 +-
 ledger_xml_io.cpp                  |    2 +
 ledger_xsl.cpp                     |    5 +-
 ledgervalues.cpp                   |    5 +-
 license.cpp                        |    5 +-
 lmi.cpp                            |    5 +-
 loads.cpp                          |    5 +-
 loads_test.cpp                     |    5 +-
 main_cgi.cpp                       |    5 +-
 main_cli.cpp                       |    5 +-
 main_common.cpp                    |    5 +-
 main_common_non_wx.cpp             |    5 +-
 main_wx.cpp                        |    5 +-
 main_wx_test.cpp                   |    5 +-
 map_lookup_test.cpp                |    5 +-
 materially_equal_test.cpp          |    5 +-
 math_functors_test.cpp             |    5 +-
 mc_enum.cpp                        |    5 +-
 mc_enum_test.cpp                   |    5 +-
 mc_enum_test_aux.cpp               |    5 +-
 mc_enum_types.cpp                  |    5 +-
 mc_enum_types_aux.cpp              |    5 +-
 md5.cpp                            |    2 +
 mec_document.cpp                   |    5 +-
 mec_input.cpp                      |    5 +-
 mec_server.cpp                     |    5 +-
 mec_state.cpp                      |    5 +-
 mec_view.cpp                       |    5 +-
 mec_xml_document.cpp               |    5 +-
 miscellany.cpp                     |    5 +-
 miscellany_test.cpp                |    5 +-
 mortality_rates.cpp                |    5 +-
 mortality_rates_fetch.cpp          |    5 +-
 mortality_rates_test.cpp           |    5 +-
 msw_workarounds.cpp                |    5 +-
 multidimgrid_any.cpp               |    5 +-
 multidimgrid_tools.cpp             |    2 +
 multiple_cell_document.cpp         |    5 +-
 mvc_controller.cpp                 |    5 +-
 mvc_model.cpp                      |    5 +-
 mvc_view.cpp                       |    5 +-
 my_db.cpp                          |    5 +-
 my_fund.cpp                        |    5 +-
 my_prod.cpp                        |    5 +-
 my_proem.cpp                       |    5 +-
 my_rnd.cpp                         |    5 +-
 my_test_coding_rules.cpp           |    5 +-
 my_tier.cpp                        |    5 +-
 name_value_pairs.cpp               |    5 +-
 name_value_pairs_test.cpp          |    5 +-
 ncnnnpnn_test.cpp                  |    5 +-
 null_stream.cpp                    |    5 +-
 numeric_io_test.cpp                |    5 +-
 obstruct_slicing_test.cpp          |    5 +-
 outlay.cpp                         |    5 +-
 path_utility.cpp                   |    5 +-
 path_utility_test.cpp              |    5 +-
 pchfile.hpp                        |   27 ++++----
 default_view.cpp => pchfile_wx.hpp |   44 ++++++-------
 pchlist.hpp                        |  125 ++++++++++++++++++++++++++++++++++++
 default_view.cpp => pchlist_wx.hpp |   44 ++++++-------
 policy_document.cpp                |    5 +-
 policy_view.cpp                    |    5 +-
 preferences_model.cpp              |    5 +-
 preferences_view.cpp               |    5 +-
 premium_tax.cpp                    |    5 +-
 premium_tax_test.cpp               |    5 +-
 previewframe_ex.cpp                |    5 +-
 print_matrix_test.cpp              |    5 +-
 product_data.cpp                   |    5 +-
 product_editor.cpp                 |    2 +
 product_file_test.cpp              |    5 +-
 progress_meter.cpp                 |    5 +-
 progress_meter_cgi.cpp             |    5 +-
 progress_meter_cli.cpp             |    5 +-
 progress_meter_test.cpp            |    5 +-
 progress_meter_wx.cpp              |    5 +-
 rate_table.cpp                     |    5 +-
 rate_table_test.cpp                |    5 +-
 rate_table_tool.cpp                |    5 +-
 regex_test.cpp                     |    5 +-
 round_test.cpp                     |    5 +-
 round_to_test.cpp                  |    5 +-
 rounding_document.cpp              |    2 +
 rounding_rules.cpp                 |    5 +-
 rounding_view.cpp                  |    5 +-
 rounding_view_editor.cpp           |    2 +
 rtti_lmi_test.cpp                  |    5 +-
 safely_dereference_as_test.cpp     |    5 +-
 sandbox_test.cpp                   |    5 +-
 sigfpe.cpp                         |    5 +-
 single_cell_document.cpp           |    5 +-
 single_choice_popup_menu.cpp       |    5 +-
 skeleton.cpp                       |    5 +-
 snprintf_test.cpp                  |    5 +-
 soa2xml.cpp                        |    5 +-
 soa_stress_test.cpp                |    5 +-
 solve.cpp                          |    5 +-
 stratified_algorithms.cpp          |    5 +-
 stratified_algorithms_test.cpp     |    5 +-
 stratified_charges.cpp             |    5 +-
 stream_cast_test.cpp               |    5 +-
 surrchg_rates.cpp                  |    5 +-
 system_command.cpp                 |    5 +-
 system_command_non_wx.cpp          |    5 +-
 system_command_test.cpp            |    5 +-
 system_command_wx.cpp              |    5 +-
 test_coding_rules.cpp              |   29 ++++++---
 test_main.cpp                      |    5 +-
 test_tools_test.cpp                |    5 +-
 text_doc.cpp                       |    5 +-
 text_view.cpp                      |    5 +-
 tier_document.cpp                  |    5 +-
 tier_view.cpp                      |    5 +-
 tier_view_editor.cpp               |    2 +
 timer.cpp                          |    5 +-
 timer_test.cpp                     |    5 +-
 tn_range_test.cpp                  |    5 +-
 tn_range_test_aux.cpp              |    5 +-
 tn_range_types.cpp                 |    5 +-
 transferor.cpp                     |    5 +-
 value_cast_test.cpp                |    5 +-
 vector_test.cpp                    |    5 +-
 view_ex.cpp                        |    5 +-
 workhorse.make                     |   29 +++++----
 wx_checks.cpp                      |    5 +-
 wx_new.cpp                         |    5 +-
 wx_new_test.cpp                    |    5 +-
 wx_table_generator.cpp             |    5 +-
 wx_test_about_version.cpp          |    5 +-
 wx_test_benchmark_census.cpp       |    5 +-
 wx_test_calculation_summary.cpp    |    5 +-
 wx_test_config_settings.cpp        |    5 +-
 wx_test_create_open.cpp            |    5 +-
 wx_test_default_input.cpp          |    5 +-
 wx_test_default_update.cpp         |    5 +-
 wx_test_expiry_dates.cpp           |    5 +-
 wx_test_input_sequences.cpp        |    5 +-
 wx_test_input_validation.cpp       |    5 +-
 wx_test_log_errors.cpp             |    5 +-
 wx_test_paste_census.cpp           |    5 +-
 wx_test_pdf_create.cpp             |    5 +-
 wx_test_validate_output.cpp        |    5 +-
 wx_utility.cpp                     |    5 +-
 xml_lmi.cpp                        |    5 +-
 xml_serializable.tpp               |    5 --
 xml_serialize_test.cpp             |    5 +-
 xml_xslt_wrapp.cpp                 |    5 +-
 yare_input.cpp                     |    5 +-
 zero_test.cpp                      |    5 +-
 262 files changed, 481 insertions(+), 1066 deletions(-)

diff --git a/about_dialog.cpp b/about_dialog.cpp
index 26643b3..fa48dda 100644
--- a/about_dialog.cpp
+++ b/about_dialog.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "about_dialog.hpp"
 
diff --git a/account_value_test.cpp b/account_value_test.cpp
index 357f3ac..4e9df8f 100644
--- a/account_value_test.cpp
+++ b/account_value_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "account_value.hpp"
 
diff --git a/accountvalue.cpp b/accountvalue.cpp
index 74581c5..d3c1869 100644
--- a/accountvalue.cpp
+++ b/accountvalue.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "account_value.hpp"
 
diff --git a/actuarial_table.cpp b/actuarial_table.cpp
index c145335..03833b8 100644
--- a/actuarial_table.cpp
+++ b/actuarial_table.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "actuarial_table.hpp"
 
diff --git a/actuarial_table_test.cpp b/actuarial_table_test.cpp
index b0b2167..4256325 100644
--- a/actuarial_table_test.cpp
+++ b/actuarial_table_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "actuarial_table.hpp"
 
diff --git a/alert.cpp b/alert.cpp
index 10fbb73..90cfb3b 100644
--- a/alert.cpp
+++ b/alert.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "alert.hpp"
 
diff --git a/alert_cgi.cpp b/alert_cgi.cpp
index 88d69d8..77aba58 100644
--- a/alert_cgi.cpp
+++ b/alert_cgi.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "alert.hpp"
 
diff --git a/alert_cli.cpp b/alert_cli.cpp
index 5fd7cb5..5cc1882 100644
--- a/alert_cli.cpp
+++ b/alert_cli.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "alert.hpp"
 
diff --git a/alert_test.cpp b/alert_test.cpp
index 123df71..d04ab24 100644
--- a/alert_test.cpp
+++ b/alert_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "alert.hpp"
 
diff --git a/alert_wx.cpp b/alert_wx.cpp
index 543110d..8e01855 100644
--- a/alert_wx.cpp
+++ b/alert_wx.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "alert.hpp"
 
diff --git a/antediluvian_stubs.cpp b/antediluvian_stubs.cpp
index 0cc7b97..7a8693e 100644
--- a/antediluvian_stubs.cpp
+++ b/antediluvian_stubs.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "gpt_server.hpp"
 #include "lmi.hpp"                      // is_antediluvian_fork()
diff --git a/any_member_test.cpp b/any_member_test.cpp
index ac910a0..72b7ecf 100644
--- a/any_member_test.cpp
+++ b/any_member_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "any_member.hpp"
 
diff --git a/assert_lmi_test.cpp b/assert_lmi_test.cpp
index 3f52246..92d667a 100644
--- a/assert_lmi_test.cpp
+++ b/assert_lmi_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "assert_lmi.hpp"
 
diff --git a/authenticity.cpp b/authenticity.cpp
index 3ac1ef5..b6605b5 100644
--- a/authenticity.cpp
+++ b/authenticity.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "authenticity.hpp"
 
diff --git a/authenticity_test.cpp b/authenticity_test.cpp
index 62cbe2d..0b05a66 100644
--- a/authenticity_test.cpp
+++ b/authenticity_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "authenticity.hpp"
 
diff --git a/basicvalues.cpp b/basicvalues.cpp
index a2dc4f1..8b7086d 100644
--- a/basicvalues.cpp
+++ b/basicvalues.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "basic_values.hpp"
 
diff --git a/calendar_date.cpp b/calendar_date.cpp
index 4bfac29..7b037ca 100644
--- a/calendar_date.cpp
+++ b/calendar_date.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "calendar_date.hpp"
 
diff --git a/calendar_date_test.cpp b/calendar_date_test.cpp
index 8b0c44e..94c3819 100644
--- a/calendar_date_test.cpp
+++ b/calendar_date_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "calendar_date.hpp"
 
diff --git a/callback_test.cpp b/callback_test.cpp
index ace3de9..c629f3a 100644
--- a/callback_test.cpp
+++ b/callback_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "callback.hpp"
 
diff --git a/ce_product_name.cpp b/ce_product_name.cpp
index f621920..e15b1c9 100644
--- a/ce_product_name.cpp
+++ b/ce_product_name.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile.hpp"
+
 #include "ce_product_name.hpp"
 
 #include "alert.hpp"
diff --git a/ce_skin_name.cpp b/ce_skin_name.cpp
index 8b26d8c..2d9a18e 100644
--- a/ce_skin_name.cpp
+++ b/ce_skin_name.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile.hpp"
+
 #include "ce_skin_name.hpp"
 
 #include "alert.hpp"
diff --git a/census_document.cpp b/census_document.cpp
index a8625c5..ca2ff20 100644
--- a/census_document.cpp
+++ b/census_document.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "census_document.hpp"
 #include "view_ex.tpp"
diff --git a/census_view.cpp b/census_view.cpp
index fa7db54..88c4c81 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "census_view.hpp"
 
diff --git a/comma_punct_test.cpp b/comma_punct_test.cpp
index e28120f..00cd94d 100644
--- a/comma_punct_test.cpp
+++ b/comma_punct_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "comma_punct.hpp"
 
diff --git a/commutation_functions.cpp b/commutation_functions.cpp
index 5567006..2d7d190 100644
--- a/commutation_functions.cpp
+++ b/commutation_functions.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "commutation_functions.hpp"
 
diff --git a/commutation_functions_test.cpp b/commutation_functions_test.cpp
index de30f4a..042d842 100644
--- a/commutation_functions_test.cpp
+++ b/commutation_functions_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "commutation_functions.hpp"
 
diff --git a/configurable_settings.cpp b/configurable_settings.cpp
index 2cde230..12a791d 100644
--- a/configurable_settings.cpp
+++ b/configurable_settings.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "configurable_settings.hpp"
 #include "xml_serializable.tpp"
diff --git a/configurable_settings_test.cpp b/configurable_settings_test.cpp
index ddf302e..7b63b31 100644
--- a/configurable_settings_test.cpp
+++ b/configurable_settings_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "configurable_settings.hpp"
 
diff --git a/contains_test.cpp b/contains_test.cpp
index c0f93a3..3a25710 100644
--- a/contains_test.cpp
+++ b/contains_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "contains.hpp"
 
diff --git a/cpp_main.cpp b/cpp_main.cpp
index 0e5f368..76f86b3 100644
--- a/cpp_main.cpp
+++ b/cpp_main.cpp
@@ -56,10 +56,7 @@
 // may elect to do so because header-only implementation requires no library
 // build support. (Suggested by Ed Brey)
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "catch_exceptions.hpp"
 #include "getopt.hpp"
diff --git a/crc32.cpp b/crc32.cpp
index df331a9..4fdc454 100644
--- a/crc32.cpp
+++ b/crc32.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "crc32.hpp"
 
diff --git a/crc32_test.cpp b/crc32_test.cpp
index da306f4..f042995 100644
--- a/crc32_test.cpp
+++ b/crc32_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "crc32.hpp"
 
diff --git a/custom_io_0.cpp b/custom_io_0.cpp
index 7b5fe99..8b63fd4 100644
--- a/custom_io_0.cpp
+++ b/custom_io_0.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "custom_io_0.hpp"
 
diff --git a/custom_io_1.cpp b/custom_io_1.cpp
index 6e6d408..89f7927 100644
--- a/custom_io_1.cpp
+++ b/custom_io_1.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "custom_io_1.hpp"
 
diff --git a/data_directory.cpp b/data_directory.cpp
index d8153e2..7e90090 100644
--- a/data_directory.cpp
+++ b/data_directory.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "data_directory.hpp"
 
diff --git a/database.cpp b/database.cpp
index a10963a..0760d5f 100644
--- a/database.cpp
+++ b/database.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "database.hpp"
 
diff --git a/database_document.cpp b/database_document.cpp
index c5b30f7..a569888 100644
--- a/database_document.cpp
+++ b/database_document.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile_wx.hpp"
+
 #include "database_document.hpp"
 
 #include "alert.hpp"
diff --git a/database_view.cpp b/database_view.cpp
index a4bb1f5..ac12650 100644
--- a/database_view.cpp
+++ b/database_view.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "database_view.hpp"
 
diff --git a/database_view_editor.cpp b/database_view_editor.cpp
index 7bddd82..db90340 100644
--- a/database_view_editor.cpp
+++ b/database_view_editor.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile_wx.hpp"
+
 #include "database_view_editor.hpp"
 
 #include "alert.hpp"
diff --git a/datum_base.cpp b/datum_base.cpp
index 7db3193..8782197 100644
--- a/datum_base.cpp
+++ b/datum_base.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "datum_base.hpp"
 
diff --git a/datum_boolean.cpp b/datum_boolean.cpp
index f661d60..f9f5fbd 100644
--- a/datum_boolean.cpp
+++ b/datum_boolean.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "datum_boolean.hpp"
 
diff --git a/datum_sequence.cpp b/datum_sequence.cpp
index 456dc0f..21ff477 100644
--- a/datum_sequence.cpp
+++ b/datum_sequence.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "datum_sequence.hpp"
 
diff --git a/datum_string.cpp b/datum_string.cpp
index f63dd53..1cbfadf 100644
--- a/datum_string.cpp
+++ b/datum_string.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "datum_string.hpp"
 
diff --git a/dbdict.cpp b/dbdict.cpp
index 98fa259..c2311fe 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "dbdict.hpp"
 #include "xml_serializable.tpp"
diff --git a/dbnames.cpp b/dbnames.cpp
index 4a83690..831ae08 100644
--- a/dbnames.cpp
+++ b/dbnames.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "dbnames.hpp"
 #include "dbnames.xpp"
diff --git a/dbvalue.cpp b/dbvalue.cpp
index 48168e8..8f6d8e1 100644
--- a/dbvalue.cpp
+++ b/dbvalue.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "dbvalue.hpp"
 
diff --git a/death_benefits.cpp b/death_benefits.cpp
index 4fc74ef..2d4b935 100644
--- a/death_benefits.cpp
+++ b/death_benefits.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "death_benefits.hpp"
 
diff --git a/default_view.cpp b/default_view.cpp
index 0c4ece4..f9e6527 100644
--- a/default_view.cpp
+++ b/default_view.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "default_view.hpp"
 
diff --git a/docmanager_ex.cpp b/docmanager_ex.cpp
index cee0221..372b500 100644
--- a/docmanager_ex.cpp
+++ b/docmanager_ex.cpp
@@ -32,10 +32,7 @@
 // and in the later years given in the copyright notice above as
 // detailed in ChangeLog.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "docmanager_ex.hpp"
 
diff --git a/emit_ledger.cpp b/emit_ledger.cpp
index ca87ce1..8894b8c 100644
--- a/emit_ledger.cpp
+++ b/emit_ledger.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "emit_ledger.hpp"
 
diff --git a/expression_template_0_test.cpp b/expression_template_0_test.cpp
index f09f9dd..799931d 100644
--- a/expression_template_0_test.cpp
+++ b/expression_template_0_test.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile.hpp"
+
 #if !defined __BORLANDC__
 #   define USE_UBLAS
 #endif // !defined __BORLANDC__
@@ -37,11 +39,6 @@
 #   define NDEBUG 1
 #endif // defined USE_UBLAS
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
-
 #include "et_vector.hpp"
 #include "materially_equal.hpp"
 #include "test_tools.hpp"
diff --git a/facets.cpp b/facets.cpp
index f7d81d0..087376b 100644
--- a/facets.cpp
+++ b/facets.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "facets.hpp"
 
diff --git a/fenv_guard.cpp b/fenv_guard.cpp
index b18879d..f41dd14 100644
--- a/fenv_guard.cpp
+++ b/fenv_guard.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "fenv_guard.hpp"
 
diff --git a/fenv_lmi.cpp b/fenv_lmi.cpp
index 8783183..60b995c 100644
--- a/fenv_lmi.cpp
+++ b/fenv_lmi.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "fenv_lmi.hpp"
 
diff --git a/fenv_lmi_test.cpp b/fenv_lmi_test.cpp
index 2ea3f98..b5ad944 100644
--- a/fenv_lmi_test.cpp
+++ b/fenv_lmi_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 // Include this first, in order to get the prototype for nonstandard
 // _control87() before any other header can include <float.h>.
diff --git a/file_command.cpp b/file_command.cpp
index 4dd5157..3f70c91 100644
--- a/file_command.cpp
+++ b/file_command.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "file_command.hpp"
 
diff --git a/file_command_cgi.cpp b/file_command_cgi.cpp
index afd481d..07dc38a 100644
--- a/file_command_cgi.cpp
+++ b/file_command_cgi.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "file_command.hpp"
 
diff --git a/file_command_cli.cpp b/file_command_cli.cpp
index 9eba01c..0d5d6df 100644
--- a/file_command_cli.cpp
+++ b/file_command_cli.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "file_command.hpp"
 
diff --git a/file_command_test.cpp b/file_command_test.cpp
index f3189dc..9118b93 100644
--- a/file_command_test.cpp
+++ b/file_command_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "file_command.hpp"
 
diff --git a/file_command_wx.cpp b/file_command_wx.cpp
index 2b36eb2..e66047c 100644
--- a/file_command_wx.cpp
+++ b/file_command_wx.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "file_command.hpp"
 
diff --git a/financial_test.cpp b/financial_test.cpp
index f18085e..2dca1b1 100644
--- a/financial_test.cpp
+++ b/financial_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "financial.hpp"
 
diff --git a/fund_data.cpp b/fund_data.cpp
index 795580b..244ed4d 100644
--- a/fund_data.cpp
+++ b/fund_data.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "fund_data.hpp"
 
diff --git a/generate_passkey.cpp b/generate_passkey.cpp
index 84340c3..2e039ea 100644
--- a/generate_passkey.cpp
+++ b/generate_passkey.cpp
@@ -19,11 +19,6 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
-
 #include "authenticity.hpp"             // md5_hex_string()
 #include "main_common.hpp"
 #include "md5.hpp"
diff --git a/generate_product_files.cpp b/generate_product_files.cpp
index f2f6b91..854d32c 100644
--- a/generate_product_files.cpp
+++ b/generate_product_files.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "dbdict.hpp"
 #include "fund_data.hpp"
diff --git a/getopt.cpp b/getopt.cpp
index 6467f94..29f7d77 100644
--- a/getopt.cpp
+++ b/getopt.cpp
@@ -82,10 +82,7 @@
 // evidence here to support banning alloca() from this project.
 
 // GWC added this to conform to LMI standards.
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 // GWC changed filename to conform to LMI standard: lowercase, .hpp .
 // #include <GetOpt.h>
diff --git a/getopt_test.cpp b/getopt_test.cpp
index 70478ae..08fd258 100644
--- a/getopt_test.cpp
+++ b/getopt_test.cpp
@@ -37,10 +37,7 @@
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
 // GWC added this to conform to LMI standards.
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 // GWC changed filename to conform to LMI standard: lowercase, .hpp .
 // #include <GetOpt.h>
diff --git a/global_settings.cpp b/global_settings.cpp
index 6ed52ae..e63f961 100644
--- a/global_settings.cpp
+++ b/global_settings.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "global_settings.hpp"
 
diff --git a/global_settings_test.cpp b/global_settings_test.cpp
index 6ad9689..e2abcf5 100644
--- a/global_settings_test.cpp
+++ b/global_settings_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "global_settings.hpp"
 
diff --git a/gpt_commutation_functions.cpp b/gpt_commutation_functions.cpp
index a02ee71..80f3413 100644
--- a/gpt_commutation_functions.cpp
+++ b/gpt_commutation_functions.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "gpt_commutation_functions.hpp"
 
diff --git a/gpt_document.cpp b/gpt_document.cpp
index 3f0b154..ff285f4 100644
--- a/gpt_document.cpp
+++ b/gpt_document.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "gpt_document.hpp"
 #include "view_ex.tpp"
diff --git a/gpt_input.cpp b/gpt_input.cpp
index 84c23a4..f2a68ff 100644
--- a/gpt_input.cpp
+++ b/gpt_input.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "gpt_input.hpp"
 #include "xml_serializable.tpp"
diff --git a/gpt_server.cpp b/gpt_server.cpp
index ab9697f..4b19c14 100644
--- a/gpt_server.cpp
+++ b/gpt_server.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "gpt_server.hpp"
 
diff --git a/gpt_specamt.cpp b/gpt_specamt.cpp
index 33a89c8..2b74ac7 100644
--- a/gpt_specamt.cpp
+++ b/gpt_specamt.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "gpt_specamt.hpp"
 
diff --git a/gpt_state.cpp b/gpt_state.cpp
index a924fa8..f2b8417 100644
--- a/gpt_state.cpp
+++ b/gpt_state.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "gpt_state.hpp"
 #include "xml_serializable.tpp"
diff --git a/gpt_test.cpp b/gpt_test.cpp
index 6e950c6..392466e 100644
--- a/gpt_test.cpp
+++ b/gpt_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "gpt_commutation_functions.hpp"
 #include "ihs_irc7702.hpp"
diff --git a/gpt_view.cpp b/gpt_view.cpp
index a4e8760..6e178e1 100644
--- a/gpt_view.cpp
+++ b/gpt_view.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "gpt_view.hpp"
 
diff --git a/gpt_xml_document.cpp b/gpt_xml_document.cpp
index e96023f..19eaf11 100644
--- a/gpt_xml_document.cpp
+++ b/gpt_xml_document.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "gpt_xml_document.hpp"
 
diff --git a/group_quote_pdf_gen.cpp b/group_quote_pdf_gen.cpp
index 3ab46b0..e719f1d 100644
--- a/group_quote_pdf_gen.cpp
+++ b/group_quote_pdf_gen.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "group_quote_pdf_gen.hpp"
 
diff --git a/group_quote_pdf_gen_wx.cpp b/group_quote_pdf_gen_wx.cpp
index 79d6772..35a9403 100644
--- a/group_quote_pdf_gen_wx.cpp
+++ b/group_quote_pdf_gen_wx.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "group_quote_pdf_gen.hpp"
 
diff --git a/group_values.cpp b/group_values.cpp
index 5f03f79..4478006 100644
--- a/group_values.cpp
+++ b/group_values.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "group_values.hpp"
 
diff --git a/handle_exceptions_test.cpp b/handle_exceptions_test.cpp
index 1c2e0ec..ad3f0e0 100644
--- a/handle_exceptions_test.cpp
+++ b/handle_exceptions_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "handle_exceptions.hpp"
 
diff --git a/icon_monger.cpp b/icon_monger.cpp
index a2281a2..6c75e40 100644
--- a/icon_monger.cpp
+++ b/icon_monger.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "icon_monger.hpp"
 
diff --git a/ieee754_test.cpp b/ieee754_test.cpp
index 6acd90b..f69140f 100644
--- a/ieee754_test.cpp
+++ b/ieee754_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ieee754.hpp"
 
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 1added8..f46b579 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "account_value.hpp"
 
diff --git a/ihs_avdebug.cpp b/ihs_avdebug.cpp
index 5b0c512..9a80f74 100644
--- a/ihs_avdebug.cpp
+++ b/ihs_avdebug.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "account_value.hpp"
 
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index ae168c8..60d2626 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "account_value.hpp"
 
diff --git a/ihs_avsolve.cpp b/ihs_avsolve.cpp
index 8840086..a1ae241 100644
--- a/ihs_avsolve.cpp
+++ b/ihs_avsolve.cpp
@@ -26,10 +26,7 @@
 // is as good as any algorithm's, and its worst-case performance
 // is better than any algorithm's except Bolzano's.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "account_value.hpp"
 
diff --git a/ihs_avstrtgy.cpp b/ihs_avstrtgy.cpp
index b7b0bed..2a1ee22 100644
--- a/ihs_avstrtgy.cpp
+++ b/ihs_avstrtgy.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "account_value.hpp"
 
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index b1ad92e..b631470 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "basic_values.hpp"
 
diff --git a/ihs_irc7702.cpp b/ihs_irc7702.cpp
index 7cf2e8e..5fbb834 100644
--- a/ihs_irc7702.cpp
+++ b/ihs_irc7702.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ihs_irc7702.hpp"
 
diff --git a/ihs_irc7702a.cpp b/ihs_irc7702a.cpp
index d08e423..e21724a 100644
--- a/ihs_irc7702a.cpp
+++ b/ihs_irc7702a.cpp
@@ -25,10 +25,7 @@
 
 // TODO ?? TAXATION !! Treat ROP increases as material changes exactly where 
needed.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ihs_irc7702a.hpp"
 
diff --git a/ihs_mortal.cpp b/ihs_mortal.cpp
index 69c67fe..4ea2892 100644
--- a/ihs_mortal.cpp
+++ b/ihs_mortal.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mortality_rates.hpp"
 
diff --git a/ihs_server7702.cpp b/ihs_server7702.cpp
index 7f0eee4..8256379 100644
--- a/ihs_server7702.cpp
+++ b/ihs_server7702.cpp
@@ -22,10 +22,7 @@
 // Known defects:
 // grep for "NEED DECISION"
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ihs_server7702.hpp"
 
diff --git a/illustration_document.cpp b/illustration_document.cpp
index 5468f0f..c77307d 100644
--- a/illustration_document.cpp
+++ b/illustration_document.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "illustration_document.hpp"
 #include "view_ex.tpp"
diff --git a/illustration_view.cpp b/illustration_view.cpp
index d6da50a..171a9d5 100644
--- a/illustration_view.cpp
+++ b/illustration_view.cpp
@@ -29,10 +29,7 @@
 // view class customized for illustration documents, and in the later
 // years given in the copyright notice above.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "illustration_view.hpp"
 
diff --git a/illustrator.cpp b/illustrator.cpp
index f8677c2..20608f5 100644
--- a/illustrator.cpp
+++ b/illustrator.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "illustrator.hpp"
 
diff --git a/input.cpp b/input.cpp
index 751bc1a..38a9e59 100644
--- a/input.cpp
+++ b/input.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "input.hpp"
 
diff --git a/input_harmonization.cpp b/input_harmonization.cpp
index d8f821d..2c8a48c 100644
--- a/input_harmonization.cpp
+++ b/input_harmonization.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "input.hpp"
 
diff --git a/input_realization.cpp b/input_realization.cpp
index b8d074d..a5a951e 100644
--- a/input_realization.cpp
+++ b/input_realization.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "input.hpp"
 
diff --git a/input_seq_helpers.cpp b/input_seq_helpers.cpp
index f411ed7..c842873 100644
--- a/input_seq_helpers.cpp
+++ b/input_seq_helpers.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "input_seq_helpers.hpp"
 
diff --git a/input_seq_test.cpp b/input_seq_test.cpp
index 198c8d0..89b0df0 100644
--- a/input_seq_test.cpp
+++ b/input_seq_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "input_sequence.hpp"
 
diff --git a/input_sequence.cpp b/input_sequence.cpp
index 4ea7d91..7a0b794 100644
--- a/input_sequence.cpp
+++ b/input_sequence.cpp
@@ -20,10 +20,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "input_sequence.hpp"
 
diff --git a/input_sequence_entry.cpp b/input_sequence_entry.cpp
index 8eb5cf5..91c11df 100644
--- a/input_sequence_entry.cpp
+++ b/input_sequence_entry.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "input_sequence_entry.hpp"
 
diff --git a/input_test.cpp b/input_test.cpp
index 4519150..7cf939a 100644
--- a/input_test.cpp
+++ b/input_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 // Facilities offered by all of these headers are tested here.
 // Class product_database might appear not to belong, but it's
diff --git a/input_xml_io.cpp b/input_xml_io.cpp
index 555c0df..58010d7 100644
--- a/input_xml_io.cpp
+++ b/input_xml_io.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "input.hpp"
 #include "xml_serializable.tpp"
diff --git a/interest_rates.cpp b/interest_rates.cpp
index 2a5130f..1708840 100644
--- a/interest_rates.cpp
+++ b/interest_rates.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "interest_rates.hpp"
 
diff --git a/irc7702a_test.cpp b/irc7702a_test.cpp
index af43b47..f6b9930 100644
--- a/irc7702a_test.cpp
+++ b/irc7702a_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ihs_irc7702a.hpp"
 
diff --git a/istream_to_string_test.cpp b/istream_to_string_test.cpp
index 879c5af..8eed661 100644
--- a/istream_to_string_test.cpp
+++ b/istream_to_string_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "istream_to_string.hpp"
 
diff --git a/ledger.cpp b/ledger.cpp
index 632ce97..a4e2109 100644
--- a/ledger.cpp
+++ b/ledger.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ledger.hpp"
 
diff --git a/ledger_base.cpp b/ledger_base.cpp
index e766c7c..b06cdb4 100644
--- a/ledger_base.cpp
+++ b/ledger_base.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ledger_base.hpp"
 
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index 93f5f39..5481c9e 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ledger_invariant.hpp"
 
diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index 35d5f7b..b8a4556 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ledger_text_formats.hpp"
 
diff --git a/ledger_variant.cpp b/ledger_variant.cpp
index 3623212..2d1b964 100644
--- a/ledger_variant.cpp
+++ b/ledger_variant.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ledger_variant.hpp"
 
diff --git a/ledger_xml_io.cpp b/ledger_xml_io.cpp
index 92fbd9c..7c79e9c 100644
--- a/ledger_xml_io.cpp
+++ b/ledger_xml_io.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile.hpp"
+
 #include "ledger.hpp"
 
 #include "alert.hpp"
diff --git a/ledger_xsl.cpp b/ledger_xsl.cpp
index 7cc1855..372bad6 100644
--- a/ledger_xsl.cpp
+++ b/ledger_xsl.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ledger_xsl.hpp"
 
diff --git a/ledgervalues.cpp b/ledgervalues.cpp
index c13e2f9..9e2334b 100644
--- a/ledgervalues.cpp
+++ b/ledgervalues.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ledgervalues.hpp"
 
diff --git a/license.cpp b/license.cpp
index 4105085..af6d2dc 100644
--- a/license.cpp
+++ b/license.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "license.hpp"
 
diff --git a/lmi.cpp b/lmi.cpp
index 3b2e3fa..4d9e0d4 100644
--- a/lmi.cpp
+++ b/lmi.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "lmi.hpp"
 
diff --git a/loads.cpp b/loads.cpp
index 9acc6a8..fa3ca43 100644
--- a/loads.cpp
+++ b/loads.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "loads.hpp"
 #include "loads_impl.hpp"
diff --git a/loads_test.cpp b/loads_test.cpp
index 6aa037c..c5c5da5 100644
--- a/loads_test.cpp
+++ b/loads_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "loads.hpp"
 #include "loads_impl.hpp"
diff --git a/main_cgi.cpp b/main_cgi.cpp
index c7dd4cd..160c337 100644
--- a/main_cgi.cpp
+++ b/main_cgi.cpp
@@ -31,10 +31,7 @@
 // other reasons evident in the repository or explained in 'ChangeLog'.
 // Any defect should not reflect on Stephen F. Booth's reputation.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "alert.hpp"
 #include "configurable_settings.hpp"
diff --git a/main_cli.cpp b/main_cli.cpp
index e0ce2ee..951a785 100644
--- a/main_cli.cpp
+++ b/main_cli.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "alert.hpp"
 #include "assert_lmi.hpp"
diff --git a/main_common.cpp b/main_common.cpp
index f5f43f2..f2dc986 100644
--- a/main_common.cpp
+++ b/main_common.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "main_common.hpp"
 
diff --git a/main_common_non_wx.cpp b/main_common_non_wx.cpp
index fb284eb..10f2532 100644
--- a/main_common_non_wx.cpp
+++ b/main_common_non_wx.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "main_common.hpp"
 
diff --git a/main_wx.cpp b/main_wx.cpp
index daf1783..8fa105b 100644
--- a/main_wx.cpp
+++ b/main_wx.cpp
@@ -29,10 +29,7 @@
 // implementation, modifying it in 2002 and the later years given in
 // the copyright notice above.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "alert.hpp"                    // safely_show_message()
 #include "fenv_lmi.hpp"
diff --git a/main_wx_test.cpp b/main_wx_test.cpp
index 076242a..7d2add4 100644
--- a/main_wx_test.cpp
+++ b/main_wx_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "alert.hpp"
 #include "assert_lmi.hpp"
diff --git a/map_lookup_test.cpp b/map_lookup_test.cpp
index b8037b0..2560adb 100644
--- a/map_lookup_test.cpp
+++ b/map_lookup_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "map_lookup.hpp"
 
diff --git a/materially_equal_test.cpp b/materially_equal_test.cpp
index 4f1ab28..1b230ab 100644
--- a/materially_equal_test.cpp
+++ b/materially_equal_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "materially_equal.hpp"
 
diff --git a/math_functors_test.cpp b/math_functors_test.cpp
index 6fd7d40..7dcb217 100644
--- a/math_functors_test.cpp
+++ b/math_functors_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "math_functors.hpp"
 
diff --git a/mc_enum.cpp b/mc_enum.cpp
index be49740..ce1e60f 100644
--- a/mc_enum.cpp
+++ b/mc_enum.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mc_enum.hpp"
 
diff --git a/mc_enum_test.cpp b/mc_enum_test.cpp
index 264cf91..76dcefb 100644
--- a/mc_enum_test.cpp
+++ b/mc_enum_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ce_product_name.hpp"
 #include "mc_enum.hpp"
diff --git a/mc_enum_test_aux.cpp b/mc_enum_test_aux.cpp
index 24caa14..67c34b9 100644
--- a/mc_enum_test_aux.cpp
+++ b/mc_enum_test_aux.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mc_enum.tpp"
 #include "mc_enum_test_aux.hpp"
diff --git a/mc_enum_types.cpp b/mc_enum_types.cpp
index cd864b5..d9080f6 100644
--- a/mc_enum_types.cpp
+++ b/mc_enum_types.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mc_enum.tpp"
 #include "mc_enum_types.hpp"
diff --git a/mc_enum_types_aux.cpp b/mc_enum_types_aux.cpp
index b2edea7..7155367 100644
--- a/mc_enum_types_aux.cpp
+++ b/mc_enum_types_aux.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mc_enum_types_aux.hpp"
 
diff --git a/md5.cpp b/md5.cpp
index 6d10779..13274fb 100644
--- a/md5.cpp
+++ b/md5.cpp
@@ -40,6 +40,8 @@
  * For subsequent GWC modifications, see 'ChangeLog'.
  */
 
+#include "pchfile.hpp"
+
 // Suppress this because we wouldn't have glibc's 'config.h'.
 //#ifdef HAVE_CONFIG_H
 //# include <config.h>
diff --git a/mec_document.cpp b/mec_document.cpp
index 99d10b2..743603f 100644
--- a/mec_document.cpp
+++ b/mec_document.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "mec_document.hpp"
 #include "view_ex.tpp"
diff --git a/mec_input.cpp b/mec_input.cpp
index 7be3646..378a9c2 100644
--- a/mec_input.cpp
+++ b/mec_input.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mec_input.hpp"
 #include "xml_serializable.tpp"
diff --git a/mec_server.cpp b/mec_server.cpp
index 47c71ea..433d9b3 100644
--- a/mec_server.cpp
+++ b/mec_server.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mec_server.hpp"
 
diff --git a/mec_state.cpp b/mec_state.cpp
index 6053ee7..b5f3b0e 100644
--- a/mec_state.cpp
+++ b/mec_state.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mec_state.hpp"
 #include "xml_serializable.tpp"
diff --git a/mec_view.cpp b/mec_view.cpp
index 827a4b2..4f6f984 100644
--- a/mec_view.cpp
+++ b/mec_view.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "mec_view.hpp"
 
diff --git a/mec_xml_document.cpp b/mec_xml_document.cpp
index a351aec..a599d0e 100644
--- a/mec_xml_document.cpp
+++ b/mec_xml_document.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mec_xml_document.hpp"
 
diff --git a/miscellany.cpp b/miscellany.cpp
index 571a507..93f7da7 100644
--- a/miscellany.cpp
+++ b/miscellany.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "miscellany.hpp"
 
diff --git a/miscellany_test.cpp b/miscellany_test.cpp
index 6c6589f..6755861 100644
--- a/miscellany_test.cpp
+++ b/miscellany_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "miscellany.hpp"
 
diff --git a/mortality_rates.cpp b/mortality_rates.cpp
index 2ce2b92..c2818e1 100644
--- a/mortality_rates.cpp
+++ b/mortality_rates.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mortality_rates.hpp"
 
diff --git a/mortality_rates_fetch.cpp b/mortality_rates_fetch.cpp
index dc6dbb5..1070ced 100644
--- a/mortality_rates_fetch.cpp
+++ b/mortality_rates_fetch.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mortality_rates.hpp"
 
diff --git a/mortality_rates_test.cpp b/mortality_rates_test.cpp
index 7b45e99..03a40e3 100644
--- a/mortality_rates_test.cpp
+++ b/mortality_rates_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mortality_rates.hpp"
 
diff --git a/msw_workarounds.cpp b/msw_workarounds.cpp
index 311791e..d30875e 100644
--- a/msw_workarounds.cpp
+++ b/msw_workarounds.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "msw_workarounds.hpp"
 
diff --git a/multidimgrid_any.cpp b/multidimgrid_any.cpp
index 96cf184..230b1df 100644
--- a/multidimgrid_any.cpp
+++ b/multidimgrid_any.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "multidimgrid_any.hpp"
 
diff --git a/multidimgrid_tools.cpp b/multidimgrid_tools.cpp
index da135bf..0583509 100644
--- a/multidimgrid_tools.cpp
+++ b/multidimgrid_tools.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile_wx.hpp"
+
 #include "multidimgrid_tools.hpp"
 
 #include <wx/wupdlock.h>
diff --git a/multiple_cell_document.cpp b/multiple_cell_document.cpp
index adba6cf..a00063c 100644
--- a/multiple_cell_document.cpp
+++ b/multiple_cell_document.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "multiple_cell_document.hpp"
 
diff --git a/mvc_controller.cpp b/mvc_controller.cpp
index 96c2eb0..6824ef7 100644
--- a/mvc_controller.cpp
+++ b/mvc_controller.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "mvc_controller.hpp"
 #include "mvc_controller.tpp"
diff --git a/mvc_model.cpp b/mvc_model.cpp
index 5a6e3b0..6c5bc06 100644
--- a/mvc_model.cpp
+++ b/mvc_model.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mvc_model.hpp"
 
diff --git a/mvc_view.cpp b/mvc_view.cpp
index 8380cdf..6d7c02a 100644
--- a/mvc_view.cpp
+++ b/mvc_view.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "mvc_view.hpp"
 
diff --git a/my_db.cpp b/my_db.cpp
index d3a4163..7e21080 100644
--- a/my_db.cpp
+++ b/my_db.cpp
@@ -32,10 +32,7 @@
 // Those files are all you need: distributing the program itself isn't
 // necessary anyway.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "dbdict.hpp"
 
diff --git a/my_fund.cpp b/my_fund.cpp
index 79f8176..dd674fa 100644
--- a/my_fund.cpp
+++ b/my_fund.cpp
@@ -32,10 +32,7 @@
 // Those files are all you need: distributing the program itself isn't
 // necessary anyway.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "fund_data.hpp"
 
diff --git a/my_prod.cpp b/my_prod.cpp
index 8af90c9..0be018d 100644
--- a/my_prod.cpp
+++ b/my_prod.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "product_data.hpp"
 
diff --git a/my_proem.cpp b/my_proem.cpp
index c857551..820d5d5 100644
--- a/my_proem.cpp
+++ b/my_proem.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "my_proem.hpp"
 
diff --git a/my_rnd.cpp b/my_rnd.cpp
index 9b134b2..5b4d0fb 100644
--- a/my_rnd.cpp
+++ b/my_rnd.cpp
@@ -32,10 +32,7 @@
 // Those files are all you need: distributing the program itself isn't
 // necessary anyway.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "rounding_rules.hpp"
 
diff --git a/my_test_coding_rules.cpp b/my_test_coding_rules.cpp
index 6eaee19..bc6f4c6 100644
--- a/my_test_coding_rules.cpp
+++ b/my_test_coding_rules.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include <map>
 #include <string>
diff --git a/my_tier.cpp b/my_tier.cpp
index b1605ab..860eb25 100644
--- a/my_tier.cpp
+++ b/my_tier.cpp
@@ -32,10 +32,7 @@
 // Those files are all you need: distributing the program itself isn't
 // necessary anyway.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "stratified_charges.hpp"
 
diff --git a/name_value_pairs.cpp b/name_value_pairs.cpp
index 9c414c0..7990a76 100644
--- a/name_value_pairs.cpp
+++ b/name_value_pairs.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "name_value_pairs.hpp"
 
diff --git a/name_value_pairs_test.cpp b/name_value_pairs_test.cpp
index a9a63cb..0db663f 100644
--- a/name_value_pairs_test.cpp
+++ b/name_value_pairs_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "name_value_pairs.hpp"
 
diff --git a/ncnnnpnn_test.cpp b/ncnnnpnn_test.cpp
index 7935f04..2fc67b9 100644
--- a/ncnnnpnn_test.cpp
+++ b/ncnnnpnn_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "ncnnnpnn.hpp"
 
diff --git a/null_stream.cpp b/null_stream.cpp
index fa73379..83e70f1 100644
--- a/null_stream.cpp
+++ b/null_stream.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "null_stream.hpp"
 #include "uncopyable_lmi.hpp"
diff --git a/numeric_io_test.cpp b/numeric_io_test.cpp
index 1af2ae5..11704e5 100644
--- a/numeric_io_test.cpp
+++ b/numeric_io_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "numeric_io_cast.hpp"
 
diff --git a/obstruct_slicing_test.cpp b/obstruct_slicing_test.cpp
index d975abf..9f4567b 100644
--- a/obstruct_slicing_test.cpp
+++ b/obstruct_slicing_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "obstruct_slicing.hpp"
 
diff --git a/outlay.cpp b/outlay.cpp
index 99e62f6..5678798 100644
--- a/outlay.cpp
+++ b/outlay.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "outlay.hpp"
 
diff --git a/path_utility.cpp b/path_utility.cpp
index ed4060f..5695837 100644
--- a/path_utility.cpp
+++ b/path_utility.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "path_utility.hpp"
 
diff --git a/path_utility_test.cpp b/path_utility_test.cpp
index f5f308f..3a06b57 100644
--- a/path_utility_test.cpp
+++ b/path_utility_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "path_utility.hpp"
 
diff --git a/pchfile.hpp b/pchfile.hpp
index c6d055b..a7ab15e 100644
--- a/pchfile.hpp
+++ b/pchfile.hpp
@@ -1,4 +1,4 @@
-// Precompiled header file.
+// Precompiled header file for general use.
 //
 // Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 
2014, 2015, 2016 Gregory W. Chicares.
 //
@@ -19,22 +19,25 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-// Always include this header first in every '.cpp' file, before
-// anything else except comments and whitespace. Never include it in
-// any header file. Include any headers to be precompiled here.
+// In every '.cpp' file that is expected to benefit from precompiled
+// headers, include exactly one of these PCH headers:
+//   pchfile.hpp
+//   pchfile_wx.hpp
+// Include it before anything else except comments and whitespace.
+// Never include any PCH header in any other file.
+
+// Rationale for reverse include guards: see 'config*.hpp'.
 
 #ifndef pchfile_hpp
 #define pchfile_hpp
 
-#include "config.hpp"
-
 #if defined LMI_COMPILER_USES_PCH && !defined LMI_IGNORE_PCH
-// This is merely a casual guess, not supported by any measurement of
-// its effect on performance. The optimal set of headers to precompile
-// probably varies by compiler. Including wx headers might impair
-// performance for non-wx targets.
-#   include <wx/wxprec.h>
-#endif
+
+#   define LMI_OKAY_TO_INCLUDE_PCHLIST_HPP
+#   include "pchlist.hpp"
+#   undef  LMI_OKAY_TO_INCLUDE_PCHLIST_HPP
+
+#endif // defined LMI_COMPILER_USES_PCH && !defined LMI_IGNORE_PCH
 
 #endif // pchfile_hpp
 
diff --git a/default_view.cpp b/pchfile_wx.hpp
similarity index 52%
copy from default_view.cpp
copy to pchfile_wx.hpp
index 0c4ece4..4e918e3 100644
--- a/default_view.cpp
+++ b/pchfile_wx.hpp
@@ -1,4 +1,4 @@
-// Default MVC View for life-insurance illustrations.
+// Precompiled header file for use with wx.
 //
 // Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 
2016 Gregory W. Chicares.
 //
@@ -19,35 +19,29 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+// In every '.cpp' file that is expected to benefit from precompiled
+// headers, include exactly one of these PCH headers:
+//   pchfile.hpp
+//   pchfile_wx.hpp
+// Include it before anything else except comments and whitespace.
+// Never include any PCH header in any other file.
 
-#include "default_view.hpp"
+// Rationale for reverse include guards: see 'config*.hpp'.
 
-#include "configurable_settings.hpp"
+#ifndef pchfile_wx_hpp
+#define pchfile_wx_hpp
 
-DefaultView::DefaultView()
-{
-}
+#if defined LMI_COMPILER_USES_PCH && !defined LMI_IGNORE_PCH
 
-DefaultView::~DefaultView()
-{
-}
+#   define LMI_OKAY_TO_INCLUDE_PCHLIST_HPP
+#   include "pchlist.hpp"
+#   undef  LMI_OKAY_TO_INCLUDE_PCHLIST_HPP
 
-char const* DefaultView::DoBookControlName() const
-{
-    return "input_notebook";
-}
+#   define LMI_OKAY_TO_INCLUDE_PCHLIST_WX_HPP
+#   include "pchlist_wx.hpp"
+#   undef  LMI_OKAY_TO_INCLUDE_PCHLIST_WX_HPP
 
-char const* DefaultView::DoMainDialogName() const
-{
-    return "dialog_containing_notebook";
-}
+#endif // defined LMI_COMPILER_USES_PCH && !defined LMI_IGNORE_PCH
 
-char const* DefaultView::DoResourceFileName() const
-{
-    return configurable_settings::instance().skin_filename().c_str();
-}
+#endif // pchfile_wx_hpp
 
diff --git a/pchlist.hpp b/pchlist.hpp
new file mode 100644
index 0000000..baab8df
--- /dev/null
+++ b/pchlist.hpp
@@ -0,0 +1,125 @@
+// List of headers to precompile for general use.
+//
+// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 
2014, 2015, 2016 Gregory W. Chicares.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//
+// http://savannah.nongnu.org/projects/lmi
+// email: <address@hidden>
+// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+#ifndef pchlist_hpp
+#define pchlist_hpp
+
+#if !defined LMI_OKAY_TO_INCLUDE_PCHLIST_HPP
+#   error This file is not intended for separate inclusion.
+#endif // !defined LMI_OKAY_TO_INCLUDE_PCHLIST_HPP
+
+#if defined LMI_COMPILER_USES_PCH && !defined LMI_IGNORE_PCH
+
+// This list includes the most frequently used standard and boost
+// headers and a list of frequently included lmi headers, both based
+// on gcc's dependencies output.
+
+#   include "config.hpp"
+
+#   include "account_value.hpp"
+#   include "alert.hpp"
+#   include "any_entity.hpp"
+#   include "any_member.hpp"
+#   include "assert_lmi.hpp"
+#   include "authenticity.hpp"
+#   include "basic_values.hpp"
+#   include "calendar_date.hpp"
+#   include "ce_product_name.hpp"
+#   include "config.hpp"
+#   include "configurable_settings.hpp"
+#   include "data_directory.hpp"
+#   include "database.hpp"
+#   include "datum_base.hpp"
+#   include "datum_boolean.hpp"
+#   include "datum_string.hpp"
+#   include "dbindex.hpp"
+#   include "dbnames.hpp"
+#   include "death_benefits.hpp"
+#   include "facets.hpp"
+#   include "fenv_lmi.hpp"
+#   include "global_settings.hpp"
+#   include "handle_exceptions.hpp"
+#   include "illustrator.hpp"
+#   include "input.hpp"
+#   include "input_sequence.hpp"
+#   include "interest_rates.hpp"
+#   include "ledger.hpp"
+#   include "ledger_base.hpp"
+#   include "ledger_invariant.hpp"
+#   include "ledger_variant.hpp"
+#   include "main_common.hpp"
+#   include "max_stream_precision.hpp"
+#   include "mc_enum.hpp"
+#   include "mc_enum_type_enums.hpp"
+#   include "mc_enum_types.hpp"
+#   include "mc_enum_types.xpp"
+#   include "mc_enum_types_aux.hpp"
+#   include "miscellany.hpp"
+#   include "mvc_model.hpp"
+#   include "null_stream.hpp"
+#   include "numeric_io_cast.hpp"
+#   include "numeric_io_traits.hpp"
+#   include "obstruct_slicing.hpp"
+#   include "oecumenic_enumerations.hpp"
+#   include "outlay.hpp"
+#   include "path_utility.hpp"
+#   include "platform_dependent.hpp"
+#   include "round_to.hpp"
+#   include "rounding_rules.hpp"
+#   include "rtti_lmi.hpp"
+#   include "safely_dereference_as.hpp"
+#   include "so_attributes.hpp"
+#   include "stratified_charges.hpp"
+#   include "stream_cast.hpp"
+#   include "system_command.hpp"
+#   include "timer.hpp"
+#   include "tn_range.hpp"
+#   include "tn_range_type_trammels.hpp"
+#   include "tn_range_types.hpp"
+#   include "xml_serializable.hpp"
+#   include "value_cast.hpp"
+#   include "yare_input.hpp"
+#   include "zero.hpp"
+
+#   include <boost/config.hpp>
+#   include <boost/filesystem/convenience.hpp>
+#   include <boost/filesystem/operations.hpp>
+#   include <boost/filesystem/path.hpp>
+#   include <boost/iterator.hpp>
+#   include <boost/preprocessor.hpp>
+#   include <boost/shared_ptr.hpp>
+#   include <boost/type_traits.hpp>
+#   include <boost/utility.hpp>
+
+#   include <cstddef>
+#   include <cstdlib>
+#   include <exception>
+#   include <istream>
+#   include <iterator>
+#   include <stdexcept>
+#   include <string>
+#   include <utility>
+#   include <vector>
+
+#endif // defined LMI_COMPILER_USES_PCH && !defined LMI_IGNORE_PCH
+
+#endif // pchlist_hpp
+
diff --git a/default_view.cpp b/pchlist_wx.hpp
similarity index 56%
copy from default_view.cpp
copy to pchlist_wx.hpp
index 0c4ece4..cbf516e 100644
--- a/default_view.cpp
+++ b/pchlist_wx.hpp
@@ -1,4 +1,4 @@
-// Default MVC View for life-insurance illustrations.
+// List of headers to precompile for use with wx.
 //
 // Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 
2016 Gregory W. Chicares.
 //
@@ -19,35 +19,29 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#ifndef pchlist_wx_hpp
+#define pchlist_wx_hpp
 
-#include "default_view.hpp"
+#if !defined LMI_OKAY_TO_INCLUDE_PCHLIST_WX_HPP
+#   error This file is not intended for separate inclusion.
+#endif // !defined LMI_OKAY_TO_INCLUDE_PCHLIST_WX_HPP
 
-#include "configurable_settings.hpp"
+#if defined LMI_COMPILER_USES_PCH && !defined LMI_IGNORE_PCH
 
-DefaultView::DefaultView()
-{
-}
+// This list includes the most frequently used wx headers, based
+// on gcc's dependencies output.
 
-DefaultView::~DefaultView()
-{
-}
+#   include "config.hpp"
 
-char const* DefaultView::DoBookControlName() const
-{
-    return "input_notebook";
-}
+#   include "product_editor.hpp"
+#   include "view_ex.hpp"
+#   include "wx_new.hpp"
+#   include "wx_utility.hpp"
+#   include "wx_workarounds.hpp"
 
-char const* DefaultView::DoMainDialogName() const
-{
-    return "dialog_containing_notebook";
-}
+#   include <wx/wx.h>
 
-char const* DefaultView::DoResourceFileName() const
-{
-    return configurable_settings::instance().skin_filename().c_str();
-}
+#endif // defined LMI_COMPILER_USES_PCH && !defined LMI_IGNORE_PCH
+
+#endif // pchlist_wx_hpp
 
diff --git a/policy_document.cpp b/policy_document.cpp
index ee524a4..991e7f1 100644
--- a/policy_document.cpp
+++ b/policy_document.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "policy_document.hpp"
 
diff --git a/policy_view.cpp b/policy_view.cpp
index ee756c4..e4346c9 100644
--- a/policy_view.cpp
+++ b/policy_view.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "policy_view.hpp"
 
diff --git a/preferences_model.cpp b/preferences_model.cpp
index 00c52c8..e0e29e6 100644
--- a/preferences_model.cpp
+++ b/preferences_model.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "preferences_model.hpp"
 
diff --git a/preferences_view.cpp b/preferences_view.cpp
index 3f246ea..6ae8d93 100644
--- a/preferences_view.cpp
+++ b/preferences_view.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "preferences_view.hpp"
 
diff --git a/premium_tax.cpp b/premium_tax.cpp
index 03ee276..20b7216 100644
--- a/premium_tax.cpp
+++ b/premium_tax.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "premium_tax.hpp"
 
diff --git a/premium_tax_test.cpp b/premium_tax_test.cpp
index a2107e2..5329bb2 100644
--- a/premium_tax_test.cpp
+++ b/premium_tax_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "premium_tax.hpp"
 
diff --git a/previewframe_ex.cpp b/previewframe_ex.cpp
index d1ca656..d15c726 100644
--- a/previewframe_ex.cpp
+++ b/previewframe_ex.cpp
@@ -27,10 +27,7 @@
 //   while preview is active, application hidden as well as disabled
 // and in the later years given in the copyright notice above.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "previewframe_ex.hpp"
 
diff --git a/print_matrix_test.cpp b/print_matrix_test.cpp
index e28df3f..5162d26 100644
--- a/print_matrix_test.cpp
+++ b/print_matrix_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "print_matrix.hpp"
 
diff --git a/product_data.cpp b/product_data.cpp
index 0f92bf2..c761e9a 100644
--- a/product_data.cpp
+++ b/product_data.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "product_data.hpp"
 #include "xml_serializable.tpp"
diff --git a/product_editor.cpp b/product_editor.cpp
index 66aa0bc..b59a5f1 100644
--- a/product_editor.cpp
+++ b/product_editor.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile_wx.hpp"
+
 #include "product_editor.hpp"
 
 #include "multidimgrid_any.hpp"
diff --git a/product_file_test.cpp b/product_file_test.cpp
index 70e771a..1efb60c 100644
--- a/product_file_test.cpp
+++ b/product_file_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "dbdict.hpp"
 #include "fund_data.hpp"
diff --git a/progress_meter.cpp b/progress_meter.cpp
index b6e0df1..4fb18fb 100644
--- a/progress_meter.cpp
+++ b/progress_meter.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "progress_meter.hpp"
 
diff --git a/progress_meter_cgi.cpp b/progress_meter_cgi.cpp
index 3d900bb..1bb9d99 100644
--- a/progress_meter_cgi.cpp
+++ b/progress_meter_cgi.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "progress_meter.hpp"
 
diff --git a/progress_meter_cli.cpp b/progress_meter_cli.cpp
index d6e92c4..246ff68 100644
--- a/progress_meter_cli.cpp
+++ b/progress_meter_cli.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "progress_meter.hpp"
 
diff --git a/progress_meter_test.cpp b/progress_meter_test.cpp
index 681f6ab..53291de 100644
--- a/progress_meter_test.cpp
+++ b/progress_meter_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "progress_meter.hpp"
 
diff --git a/progress_meter_wx.cpp b/progress_meter_wx.cpp
index f5878e6..6c63f09 100644
--- a/progress_meter_wx.cpp
+++ b/progress_meter_wx.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "progress_meter.hpp"
 
diff --git a/rate_table.cpp b/rate_table.cpp
index 60da837..ee36e0a 100644
--- a/rate_table.cpp
+++ b/rate_table.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "rate_table.hpp"
 
diff --git a/rate_table_test.cpp b/rate_table_test.cpp
index 9b8b337..a55bffe 100644
--- a/rate_table_test.cpp
+++ b/rate_table_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "rate_table.hpp"
 
diff --git a/rate_table_tool.cpp b/rate_table_tool.cpp
index 761b642..7573c14 100644
--- a/rate_table_tool.cpp
+++ b/rate_table_tool.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "alert.hpp"
 #include "getopt.hpp"
diff --git a/regex_test.cpp b/regex_test.cpp
index 7ba4fdc..8e0bf92 100644
--- a/regex_test.cpp
+++ b/regex_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "contains.hpp"
 #include "test_tools.hpp"
diff --git a/round_test.cpp b/round_test.cpp
index 3c309e3..aeb8165 100644
--- a/round_test.cpp
+++ b/round_test.cpp
@@ -30,10 +30,7 @@
 // Functions [ll,l]round[f,,l]() are not explicitly tested, though
 // they ideally ought to be.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "round_to.hpp"
 
diff --git a/round_to_test.cpp b/round_to_test.cpp
index 1c1bf8e..206f94c 100644
--- a/round_to_test.cpp
+++ b/round_to_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "round_to.hpp"
 
diff --git a/rounding_document.cpp b/rounding_document.cpp
index 32c8855..666a44d 100644
--- a/rounding_document.cpp
+++ b/rounding_document.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile_wx.hpp"
+
 #include "rounding_document.hpp"
 
 // EVGENIY !! Doesn't it seem strange that class RoundingButtons,
diff --git a/rounding_rules.cpp b/rounding_rules.cpp
index ae5ccb8..9ca8dd6 100644
--- a/rounding_rules.cpp
+++ b/rounding_rules.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "rounding_rules.hpp"
 #include "xml_serializable.tpp"
diff --git a/rounding_view.cpp b/rounding_view.cpp
index c7477f7..dfaeef9 100644
--- a/rounding_view.cpp
+++ b/rounding_view.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "rounding_view.hpp"
 
diff --git a/rounding_view_editor.cpp b/rounding_view_editor.cpp
index 44a94da..2bba64b 100644
--- a/rounding_view_editor.cpp
+++ b/rounding_view_editor.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile_wx.hpp"
+
 #include "rounding_view_editor.hpp"
 
 #include "alert.hpp"
diff --git a/rtti_lmi_test.cpp b/rtti_lmi_test.cpp
index 5c7c2b8..2bf9cb3 100644
--- a/rtti_lmi_test.cpp
+++ b/rtti_lmi_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "rtti_lmi.hpp"
 
diff --git a/safely_dereference_as_test.cpp b/safely_dereference_as_test.cpp
index a7a5f70..a43328a 100644
--- a/safely_dereference_as_test.cpp
+++ b/safely_dereference_as_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "safely_dereference_as.hpp"
 
diff --git a/sandbox_test.cpp b/sandbox_test.cpp
index 10defca..a146d0e 100644
--- a/sandbox_test.cpp
+++ b/sandbox_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "test_tools.hpp"
 
diff --git a/sigfpe.cpp b/sigfpe.cpp
index 50ae46a..4293fb7 100644
--- a/sigfpe.cpp
+++ b/sigfpe.cpp
@@ -29,10 +29,7 @@
 // to work. This file is retained because it might be useful on other
 // platforms (on which it hasn't been tested).
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "sigfpe.hpp"
 
diff --git a/single_cell_document.cpp b/single_cell_document.cpp
index 32627a7..758381b 100644
--- a/single_cell_document.cpp
+++ b/single_cell_document.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "single_cell_document.hpp"
 
diff --git a/single_choice_popup_menu.cpp b/single_choice_popup_menu.cpp
index 1debb7c..d731e99 100644
--- a/single_choice_popup_menu.cpp
+++ b/single_choice_popup_menu.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "single_choice_popup_menu.hpp"
 
diff --git a/skeleton.cpp b/skeleton.cpp
index 95fc78b..80b40d9 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -29,10 +29,7 @@
 // implementation, modifying it in 2002 and the later years given in
 // the copyright notice above.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "skeleton.hpp"
 
diff --git a/snprintf_test.cpp b/snprintf_test.cpp
index 85105b6..48cfa06 100644
--- a/snprintf_test.cpp
+++ b/snprintf_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "test_tools.hpp"
 
diff --git a/soa2xml.cpp b/soa2xml.cpp
index eff5646..ec18d54 100644
--- a/soa2xml.cpp
+++ b/soa2xml.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "actuarial_table.hpp"
 #include "soa_helpers.hpp"
diff --git a/soa_stress_test.cpp b/soa_stress_test.cpp
index ea4950d..cd14218 100644
--- a/soa_stress_test.cpp
+++ b/soa_stress_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "actuarial_table.hpp"
 #include "assert_lmi.hpp"
diff --git a/solve.cpp b/solve.cpp
index 7d6984c..432e771 100644
--- a/solve.cpp
+++ b/solve.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "account_value.hpp"
 
diff --git a/stratified_algorithms.cpp b/stratified_algorithms.cpp
index f3b867f..0a78c6d 100644
--- a/stratified_algorithms.cpp
+++ b/stratified_algorithms.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "stratified_algorithms.hpp"
 
diff --git a/stratified_algorithms_test.cpp b/stratified_algorithms_test.cpp
index 2be27c5..307d033 100644
--- a/stratified_algorithms_test.cpp
+++ b/stratified_algorithms_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "stratified_algorithms.hpp"
 
diff --git a/stratified_charges.cpp b/stratified_charges.cpp
index 87fcdf3..96fee85 100644
--- a/stratified_charges.cpp
+++ b/stratified_charges.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "stratified_charges.hpp"
 #include "xml_serializable.tpp"
diff --git a/stream_cast_test.cpp b/stream_cast_test.cpp
index ab01602..bfce83f 100644
--- a/stream_cast_test.cpp
+++ b/stream_cast_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "stream_cast.hpp"
 
diff --git a/surrchg_rates.cpp b/surrchg_rates.cpp
index 8ac50d4..ada040a 100644
--- a/surrchg_rates.cpp
+++ b/surrchg_rates.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "surrchg_rates.hpp"
 
diff --git a/system_command.cpp b/system_command.cpp
index 66ecc26..1907ea2 100644
--- a/system_command.cpp
+++ b/system_command.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "system_command.hpp"
 
diff --git a/system_command_non_wx.cpp b/system_command_non_wx.cpp
index 2da3192..bd72710 100644
--- a/system_command_non_wx.cpp
+++ b/system_command_non_wx.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "system_command.hpp"
 
diff --git a/system_command_test.cpp b/system_command_test.cpp
index 7aa4068..c3ca41a 100644
--- a/system_command_test.cpp
+++ b/system_command_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "system_command.hpp"
 
diff --git a/system_command_wx.cpp b/system_command_wx.cpp
index 873ebbb..d622762 100644
--- a/system_command_wx.cpp
+++ b/system_command_wx.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "system_command.hpp"
 
diff --git a/test_coding_rules.cpp b/test_coding_rules.cpp
index bea2680..f406398 100644
--- a/test_coding_rules.cpp
+++ b/test_coding_rules.cpp
@@ -19,11 +19,6 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
-
 #include "assert_lmi.hpp"
 #include "contains.hpp"
 #include "handle_exceptions.hpp"
@@ -405,22 +400,38 @@ void assay_whitespace(file const& f)
 ///
 /// Exceptions are necessarily made for
 ///  - this program's test script;
-///  - 'GNUmakefile' and log files; and
-///  - 'config.hpp' and its related 'config_*.hpp' headers.
+///  - 'GNUmakefile' and log files;
+///  - 'config.hpp' and its related 'config_*.hpp' headers;
+///  - 'pchfile*.hpp', which exclude 'config.hpp'; and
+///  - 'pchlist*.hpp', which include 'config.hpp', indented.
 
 void check_config_hpp(file const& f)
 {
-    static std::string const loose ("# *include *[<\"]config.hpp[>\"]");
-    static std::string const strict("\\n(#include \"config.hpp\")\\n");
+    static std::string const loose  ("# *include *[<\"]config.hpp[>\"]");
+    static std::string const strict ("\\n(#include \"config.hpp\")\\n");
+    static std::string const indent ("\\n(#   include \"config.hpp\")\\n");
 
     if
         (   f.is_of_phylum(e_log)
         ||  f.phyloanalyze("^test_coding_rules_test.sh$")
         ||  f.phyloanalyze("^GNUmakefile$")
+        ||  f.phyloanalyze("^pchfile(_.*)?\\.hpp$")
         )
         {
         return;
         }
+    else if(f.is_of_phylum(e_header) && 
f.phyloanalyze("^pchlist(_.*)?\\.hpp$"))
+        {
+        require(f, loose , "must include 'config.hpp'.");
+        require(f, indent, "lacks line '#   include \"config.hpp\"'.");
+        boost::smatch match;
+        static boost::regex const first_include("(# *include[^\\n]*)");
+        boost::regex_search(f.data(), match, first_include);
+        if("#   include \"config.hpp\"" != match[1])
+            {
+            complain(f, "must include 'config.hpp' first.");
+            }
+        }
     else if(f.is_of_phylum(e_header) && 
!f.phyloanalyze("^config(_.*)?\\.hpp$"))
         {
         require(f, loose , "must include 'config.hpp'.");
diff --git a/test_main.cpp b/test_main.cpp
index 50c2174..c37d9cb 100644
--- a/test_main.cpp
+++ b/test_main.cpp
@@ -56,10 +56,7 @@
 // may elect to do so because header-only implementation requires no library
 // build support. (Suggested by Ed Brey)
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "exit_codes.hpp"
 #include "fenv_lmi.hpp"
diff --git a/test_tools_test.cpp b/test_tools_test.cpp
index bb5f6de..62f5c26 100644
--- a/test_tools_test.cpp
+++ b/test_tools_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "test_tools.hpp"
 
diff --git a/text_doc.cpp b/text_doc.cpp
index 1c3f24b..2dd8e7c 100644
--- a/text_doc.cpp
+++ b/text_doc.cpp
@@ -27,10 +27,7 @@
 // class out of a larger file, and in the later years given in the
 // copyright notice above.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "text_doc.hpp"
 #include "view_ex.tpp"
diff --git a/text_view.cpp b/text_view.cpp
index 2bfd4ec..4c6dca1 100644
--- a/text_view.cpp
+++ b/text_view.cpp
@@ -27,10 +27,7 @@
 // class out of a larger file, and in the later years given in the
 // copyright notice above.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "text_view.hpp"
 
diff --git a/tier_document.cpp b/tier_document.cpp
index a1ae33b..038c4f1 100644
--- a/tier_document.cpp
+++ b/tier_document.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "tier_document.hpp"
 
diff --git a/tier_view.cpp b/tier_view.cpp
index 5d72e68..f3fccd8 100644
--- a/tier_view.cpp
+++ b/tier_view.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "tier_view.hpp"
 
diff --git a/tier_view_editor.cpp b/tier_view_editor.cpp
index 00d44ac..5c0235e 100644
--- a/tier_view_editor.cpp
+++ b/tier_view_editor.cpp
@@ -19,6 +19,8 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
+#include "pchfile_wx.hpp"
+
 #include "tier_view_editor.hpp"
 
 #include "assert_lmi.hpp"
diff --git a/timer.cpp b/timer.cpp
index 434fee8..9f3ae45 100644
--- a/timer.cpp
+++ b/timer.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "timer.hpp"
 
diff --git a/timer_test.cpp b/timer_test.cpp
index 9c86034..675179d 100644
--- a/timer_test.cpp
+++ b/timer_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "timer.hpp"
 
diff --git a/tn_range_test.cpp b/tn_range_test.cpp
index ae3aaab..f314b5d 100644
--- a/tn_range_test.cpp
+++ b/tn_range_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "tn_range.hpp"
 #include "tn_range.tpp"                 // Class template implementation.
diff --git a/tn_range_test_aux.cpp b/tn_range_test_aux.cpp
index eaa90a1..4140c9f 100644
--- a/tn_range_test_aux.cpp
+++ b/tn_range_test_aux.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "tn_range.tpp"                 // Template class implementation.
 #include "tn_range_test_aux.hpp"        // Trammel class.
diff --git a/tn_range_types.cpp b/tn_range_types.cpp
index 5bf489b..c1feaa4 100644
--- a/tn_range_types.cpp
+++ b/tn_range_types.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "tn_range.tpp"                 // Template class implementation.
 #include "tn_range_type_trammels.hpp"   // Trammels for specific tn_range 
types.
diff --git a/transferor.cpp b/transferor.cpp
index 0c99f44..b68c48d 100644
--- a/transferor.cpp
+++ b/transferor.cpp
@@ -27,10 +27,7 @@
 // but is implemented differently and has different goals, so any
 // problems introduced here don't reflect on Kevin Smith's reputation.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "transferor.hpp"
 
diff --git a/value_cast_test.cpp b/value_cast_test.cpp
index b15aaa4..190af45 100644
--- a/value_cast_test.cpp
+++ b/value_cast_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "value_cast.hpp"
 
diff --git a/vector_test.cpp b/vector_test.cpp
index bd8e927..a56fdc9 100644
--- a/vector_test.cpp
+++ b/vector_test.cpp
@@ -22,10 +22,7 @@
 // This file is of historical interest only. It shows various attempts
 // to reinvent work that others have done better.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "assert_lmi.hpp"
 #include "materially_equal.hpp"
diff --git a/view_ex.cpp b/view_ex.cpp
index 0e0240b..c4e88c6 100644
--- a/view_ex.cpp
+++ b/view_ex.cpp
@@ -27,10 +27,7 @@
 // enhanced view class, and in the later years given in the copyright
 // notice above.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "view_ex.hpp"
 
diff --git a/workhorse.make b/workhorse.make
index 655432b..d932d3a 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -338,15 +338,17 @@ vpath quoted_gpl_html $(src_dir)
 # Only files in the source directory are tested. Files that reside
 # elsewhere (e.g., headers accompanying libraries) are not tested.
 
-# Exclude headers named 'config_*.hpp': they are designed to signal
-# errors if they are used separately.
+# Exclude headers named 'config_*.hpp' and 'pchlist*': they are
+# designed to signal errors if they are used separately.
 
 physical_closure_files := \
   $(addsuffix .physical_closure,\
     $(filter-out config_%.hpp,\
-      $(notdir \
-        $(wildcard \
-          $(addprefix $(src_dir)/,*.h *.hpp *.tpp *.xpp \
+      $(filter-out pchlist%.hpp,\
+        $(notdir \
+          $(wildcard \
+            $(addprefix $(src_dir)/,*.h *.hpp *.tpp *.xpp \
+            ) \
           ) \
         ) \
       ) \
@@ -357,10 +359,8 @@ physical_closure_files := \
 
 # Files that depend on wx, which can't use the strictest gcc warnings.
 
-# Files are deemed to depend on wx iff they contain 'include *<wx/'.
-# This heuristic isn't foolproof because wx headers might be included
-# indirectly. Include an innocuous header like <wx/version.h> in files
-# for which it fails.
+# '.cpp' files are deemed to depend on wx iff they include lmi's
+# wx-specific PCH file.
 
 wx_dependent_objects := \
   $(addsuffix .o,\
@@ -368,19 +368,24 @@ wx_dependent_objects := \
       $(notdir \
         $(shell $(GREP) \
           --files-with-matches \
-          'include *<wx/' \
-          $(src_dir)/*.?pp \
+          '\#include "pchfile_wx.hpp"' \
+          $(src_dir)/*.cpp \
         ) \
       ) \
     ) \
   )
 
+# Other files are deemed to depend on wx iff they obviously include a
+# wx header. This heuristic isn't foolproof because wx headers might
+# be included indirectly. An innocuous header like <wx/version.h> can
+# be included in files for which it fails.
+
 wx_dependent_physical_closure_files := \
   $(addsuffix .physical_closure,\
     $(notdir \
       $(shell $(GREP) \
         --files-with-matches \
-        'include *<wx/' \
+        '\#include *<wx/' \
         $(wildcard \
           $(addprefix $(src_dir)/,*.h *.hpp *.tpp *.xpp \
           ) \
diff --git a/wx_checks.cpp b/wx_checks.cpp
index 4dbe2b0..b3208eb 100644
--- a/wx_checks.cpp
+++ b/wx_checks.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "wx_checks.hpp"
 
diff --git a/wx_new.cpp b/wx_new.cpp
index d520b81..5e8cefb 100644
--- a/wx_new.cpp
+++ b/wx_new.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "wx_new.hpp"
 
diff --git a/wx_new_test.cpp b/wx_new_test.cpp
index 1511dae..2ed310d 100644
--- a/wx_new_test.cpp
+++ b/wx_new_test.cpp
@@ -23,10 +23,7 @@
 // suite ensures that it'll be compiled with stronger warning options
 // than wx would permit.
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 // The '.cpp' file is deliberately included here instead of the header
 // because it was probably already compiled for inclusion in a dll,
diff --git a/wx_table_generator.cpp b/wx_table_generator.cpp
index 338be2c..e36e338 100644
--- a/wx_table_generator.cpp
+++ b/wx_table_generator.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "wx_table_generator.hpp"
 
diff --git a/wx_test_about_version.cpp b/wx_test_about_version.cpp
index 26c3c9e..bca5055 100644
--- a/wx_test_about_version.cpp
+++ b/wx_test_about_version.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "calendar_date.hpp"
diff --git a/wx_test_benchmark_census.cpp b/wx_test_benchmark_census.cpp
index 1c69fb7..95d20c5 100644
--- a/wx_test_benchmark_census.cpp
+++ b/wx_test_benchmark_census.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "wx_test_case.hpp"
diff --git a/wx_test_calculation_summary.cpp b/wx_test_calculation_summary.cpp
index 1e1c7da..2c4b8c4 100644
--- a/wx_test_calculation_summary.cpp
+++ b/wx_test_calculation_summary.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "configurable_settings.hpp"
diff --git a/wx_test_config_settings.cpp b/wx_test_config_settings.cpp
index fe701bd..3872583 100644
--- a/wx_test_config_settings.cpp
+++ b/wx_test_config_settings.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "configurable_settings.hpp"
diff --git a/wx_test_create_open.cpp b/wx_test_create_open.cpp
index eb3bb90..5e293a0 100644
--- a/wx_test_create_open.cpp
+++ b/wx_test_create_open.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "mvc_controller.hpp"
diff --git a/wx_test_default_input.cpp b/wx_test_default_input.cpp
index 3654e51..646069b 100644
--- a/wx_test_default_input.cpp
+++ b/wx_test_default_input.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "calendar_date.hpp"
diff --git a/wx_test_default_update.cpp b/wx_test_default_update.cpp
index 1047e0a..a28edbb 100644
--- a/wx_test_default_update.cpp
+++ b/wx_test_default_update.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "configurable_settings.hpp"
diff --git a/wx_test_expiry_dates.cpp b/wx_test_expiry_dates.cpp
index 2db0637..27bddb3 100644
--- a/wx_test_expiry_dates.cpp
+++ b/wx_test_expiry_dates.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "calendar_date.hpp"
diff --git a/wx_test_input_sequences.cpp b/wx_test_input_sequences.cpp
index 4651c7c..c960865 100644
--- a/wx_test_input_sequences.cpp
+++ b/wx_test_input_sequences.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "input.hpp"
diff --git a/wx_test_input_validation.cpp b/wx_test_input_validation.cpp
index 44a9859..4c3ddb7 100644
--- a/wx_test_input_validation.cpp
+++ b/wx_test_input_validation.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "global_settings.hpp"
diff --git a/wx_test_log_errors.cpp b/wx_test_log_errors.cpp
index 04b2a37..bc61157 100644
--- a/wx_test_log_errors.cpp
+++ b/wx_test_log_errors.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "wx_test_case.hpp"
diff --git a/wx_test_paste_census.cpp b/wx_test_paste_census.cpp
index 33fbb50..5b9ef32 100644
--- a/wx_test_paste_census.cpp
+++ b/wx_test_paste_census.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "data_directory.hpp"
diff --git a/wx_test_pdf_create.cpp b/wx_test_pdf_create.cpp
index d1b4fe7..033263e 100644
--- a/wx_test_pdf_create.cpp
+++ b/wx_test_pdf_create.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "wx_test_case.hpp"
diff --git a/wx_test_validate_output.cpp b/wx_test_validate_output.cpp
index 5e3c7f1..71730ea 100644
--- a/wx_test_validate_output.cpp
+++ b/wx_test_validate_output.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "assert_lmi.hpp"
 #include "configurable_settings.hpp"
diff --git a/wx_utility.cpp b/wx_utility.cpp
index 2f32f8a..5222c48 100644
--- a/wx_utility.cpp
+++ b/wx_utility.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile_wx.hpp"
 
 #include "wx_utility.hpp"
 
diff --git a/xml_lmi.cpp b/xml_lmi.cpp
index a5cf133..24c1114 100644
--- a/xml_lmi.cpp
+++ b/xml_lmi.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "xml_lmi.hpp"
 
diff --git a/xml_serializable.tpp b/xml_serializable.tpp
index f94ab3d..ebbaed6 100644
--- a/xml_serializable.tpp
+++ b/xml_serializable.tpp
@@ -19,11 +19,6 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
-
 #include "xml_serializable.hpp"
 
 #include "alert.hpp"
diff --git a/xml_serialize_test.cpp b/xml_serialize_test.cpp
index c321ab1..7909dc8 100644
--- a/xml_serialize_test.cpp
+++ b/xml_serialize_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "xml_serialize.hpp"
 
diff --git a/xml_xslt_wrapp.cpp b/xml_xslt_wrapp.cpp
index 27859af..25fd89b 100644
--- a/xml_xslt_wrapp.cpp
+++ b/xml_xslt_wrapp.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #define HAVE_BOOST_POOL_SINGLETON_POOL_HPP
 
diff --git a/yare_input.cpp b/yare_input.cpp
index 6d125ed..2424f2e 100644
--- a/yare_input.cpp
+++ b/yare_input.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "yare_input.hpp"
 
diff --git a/zero_test.cpp b/zero_test.cpp
index 07a5856..3113ef9 100644
--- a/zero_test.cpp
+++ b/zero_test.cpp
@@ -19,10 +19,7 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#if defined __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // defined __BORLANDC__
+#include "pchfile.hpp"
 
 #include "zero.hpp"
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]