diff --git a/Airports/genapt.cxx b/Airports/genapt.cxx
index 4ef94cf70..ba5a7ccf1 100644
--- a/Airports/genapt.cxx
+++ b/Airports/genapt.cxx
@@ -31,6 +31,11 @@
 using namespace std;
 #endif
 
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include <Debug/logstream.hxx>
 // #include <Include/fg_types.h>
 #include <Math/fg_geodesy.hxx>
@@ -285,6 +290,9 @@ fgAptGenerate(const string& path, fgTILE *tile)
 
 
 // $Log$
+// Revision 1.11  1998/11/23 21:48:09  curt
+// Borland portability tweaks.
+//
 // Revision 1.10  1998/11/07 19:07:06  curt
 // Enable release builds using the --without-logging option to the configure
 // script.  Also a couple log message cleanups, plus some C to C++ comment
diff --git a/Airports/genapt.hxx b/Airports/genapt.hxx
index 68a629115..964722f94 100644
--- a/Airports/genapt.hxx
+++ b/Airports/genapt.hxx
@@ -40,6 +40,10 @@
 using namespace std;
 #endif
 
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+
 #include <Scenery/tile.hxx>
 
 
@@ -61,6 +65,9 @@ fgAptGenerate(const string& path, fgTILE *tile);
 
 
 // $Log$
+// Revision 1.2  1998/11/23 21:48:10  curt
+// Borland portability tweaks.
+//
 // Revision 1.1  1998/09/14 02:14:01  curt
 // Initial revision of genapt.[ch]xx for generating airport scenery.
 //
diff --git a/Astro/celestialBody.cxx b/Astro/celestialBody.cxx
index baa0646c9..72bb6359a 100644
--- a/Astro/celestialBody.cxx
+++ b/Astro/celestialBody.cxx
@@ -27,6 +27,11 @@
 #include "star.hxx"
 #include <Debug/logstream.hxx>
 
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 /**************************************************************************
  * void CelestialBody::updatePosition(fgTIME *t, Star *ourSun)
  *
diff --git a/Astro/celestialBody.hxx b/Astro/celestialBody.hxx
index 864e090ad..a61a25d39 100644
--- a/Astro/celestialBody.hxx
+++ b/Astro/celestialBody.hxx
@@ -32,9 +32,6 @@
 #endif                                   
 
 
-#include <stdio.h>
-#include <math.h>
-
 #include <Time/fg_time.hxx>
 #include <Include/fg_constants.h>
 
diff --git a/Astro/jupiter.cxx b/Astro/jupiter.cxx
index cde5521c0..caa0e5075 100644
--- a/Astro/jupiter.cxx
+++ b/Astro/jupiter.cxx
@@ -23,6 +23,12 @@
  * (Log is kept at end of this file)
  **************************************************************************/
 
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "jupiter.hxx"
 
 /*************************************************************************
diff --git a/Astro/mars.cxx b/Astro/mars.cxx
index ccfc59970..5f430c870 100644
--- a/Astro/mars.cxx
+++ b/Astro/mars.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "mars.hxx"
 
 /*************************************************************************
diff --git a/Astro/mercury.cxx b/Astro/mercury.cxx
index 104a9daec..f8c3d6726 100644
--- a/Astro/mercury.cxx
+++ b/Astro/mercury.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "mercury.hxx"
 
 /*************************************************************************
diff --git a/Astro/moon.cxx b/Astro/moon.cxx
index 445774cd6..5ec50f4b5 100644
--- a/Astro/moon.cxx
+++ b/Astro/moon.cxx
@@ -29,6 +29,12 @@
 #include <Debug/logstream.hxx>
 #include <Objects/texload.h>
 
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 static GLuint moon_texid;
 static GLubyte *moon_texbuf;
 
diff --git a/Astro/neptune.cxx b/Astro/neptune.cxx
index cbcbcae96..dce719000 100644
--- a/Astro/neptune.cxx
+++ b/Astro/neptune.cxx
@@ -23,6 +23,11 @@
  * (Log is kept at end of this file)
  **************************************************************************/
 
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "neptune.hxx"
 
 /*************************************************************************
diff --git a/Astro/saturn.cxx b/Astro/saturn.cxx
index c58f3836e..5f643dc14 100644
--- a/Astro/saturn.cxx
+++ b/Astro/saturn.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "saturn.hxx"
 
 /*************************************************************************
diff --git a/Astro/solarsystem.cxx b/Astro/solarsystem.cxx
index c3995f48e..3aa13fbf7 100644
--- a/Astro/solarsystem.cxx
+++ b/Astro/solarsystem.cxx
@@ -31,6 +31,12 @@
 #  include <windows.h>
 #endif
 
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 #include <Debug/logstream.hxx>
diff --git a/Astro/star.cxx b/Astro/star.cxx
index f43eeba33..f8ce2d3a1 100644
--- a/Astro/star.cxx
+++ b/Astro/star.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "star.hxx"
 
 /*************************************************************************
diff --git a/Astro/stars.cxx b/Astro/stars.cxx
index ac20f6120..af910f77d 100644
--- a/Astro/stars.cxx
+++ b/Astro/stars.cxx
@@ -31,6 +31,7 @@
 #  include <windows.h>
 #endif
 
+
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
@@ -255,6 +256,9 @@ void fgStarsRender( void ) {
 
 
 // $Log$
+// Revision 1.23  1998/11/23 21:48:28  curt
+// Borland portability tweaks.
+//
 // Revision 1.22  1998/11/07 19:07:07  curt
 // Enable release builds using the --without-logging option to the configure
 // script.  Also a couple log message cleanups, plus some C to C++ comment
diff --git a/Astro/uranus.cxx b/Astro/uranus.cxx
index e21b06a6b..c20a91807 100644
--- a/Astro/uranus.cxx
+++ b/Astro/uranus.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "uranus.hxx"
 
 /*************************************************************************
diff --git a/Astro/venus.cxx b/Astro/venus.cxx
index 3e07e7997..81088ffd1 100644
--- a/Astro/venus.cxx
+++ b/Astro/venus.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "venus.hxx"
 
 /*************************************************************************
diff --git a/Cockpit/hud.cxx b/Cockpit/hud.cxx
index a234f5c64..7f0815be7 100644
--- a/Cockpit/hud.cxx
+++ b/Cockpit/hud.cxx
@@ -30,6 +30,11 @@
 #  include <windows.h>
 #endif
 
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include <GL/glut.h>
 #include <stdlib.h>
 #include <string.h>
@@ -835,6 +840,9 @@ void fgUpdateHUD( void ) {
 }
 
 // $Log$
+// Revision 1.28  1998/11/23 21:48:59  curt
+// Borland portability tweaks.
+//
 // Revision 1.27  1998/11/06 21:17:47  curt
 // Converted to new logstream debugging facility.  This allows release
 // builds with no messages at all (and no performance impact) by using
diff --git a/Main/options.cxx b/Main/options.cxx
index 69ffbc14e..fe589792a 100644
--- a/Main/options.cxx
+++ b/Main/options.cxx
@@ -36,16 +36,11 @@
 #include <Debug/logstream.hxx>
 #include <Flight/flight.hxx>
 #include <Include/fg_constants.h>
+#include <Main/options.hxx>
 #include <Misc/fgstream.hxx>
 
 #include "fg_serial.hxx"
 
-#include "options.hxx"
-
-
-const int fgOPTIONS::FG_RADIUS_MIN;
-const int fgOPTIONS::FG_RADIUS_MAX;
-
 
 inline double
 atof( const string& str )
@@ -623,7 +618,7 @@ void fgOPTIONS::usage ( void ) {
     printf("\t--enable-textures:  enable textures\n");
     printf("\t--disable-wireframe:  disable wireframe drawing mode\n");
     printf("\t--enable-wireframe:  enable wireframe drawing mode\n");
-    printf("\t--geomtry=WWWxHHH:  specify window geometry: 640x480, 800x600\n");
+    printf("\t--geometry=WWWxHHH:  window geometry: 640x480, 800x600, etc.\n");
     printf("\n");
 
     printf("Scenery Options:\n");
@@ -647,6 +642,9 @@ fgOPTIONS::~fgOPTIONS( void ) {
 
 
 // $Log$
+// Revision 1.31  1998/11/23 21:49:04  curt
+// Borland portability tweaks.
+//
 // Revision 1.30  1998/11/16 14:00:02  curt
 // Added pow() macro bug work around.
 // Added support for starting FGFS at various resolutions.
diff --git a/Main/options.hxx b/Main/options.hxx
index fbfa4c971..491f3a7b6 100644
--- a/Main/options.hxx
+++ b/Main/options.hxx
@@ -42,10 +42,8 @@
 #include <XGL/xgl.h>
 
 #include <string>
-
-#ifdef NEEDNAMESPACESTD
-using namespace std;
-#endif
+#include <Include/compiler.h>
+FG_USING_STD(string);
 
 #include "fg_serial.hxx"
 
@@ -74,8 +72,11 @@ public:
 	FG_FOG_NICEST   = 2
     };
 
-    static const int FG_RADIUS_MIN = 1;
-    static const int FG_RADIUS_MAX = 4;
+    enum
+    {
+	FG_RADIUS_MIN = 1,
+	FG_RADIUS_MAX = 4
+    };
 
 private:
 
@@ -243,6 +244,9 @@ extern fgOPTIONS current_options;
 
 
 // $Log$
+// Revision 1.23  1998/11/23 21:49:05  curt
+// Borland portability tweaks.
+//
 // Revision 1.22  1998/11/20 01:02:38  curt
 // Try to detect Mesa/Glide/Voodoo and chose the appropriate resolution.
 //
diff --git a/Time/event.cxx b/Time/event.cxx
index 63ffbea66..57117678f 100644
--- a/Time/event.cxx
+++ b/Time/event.cxx
@@ -39,6 +39,10 @@
                          // contains milliseconds
 #endif
 
+#if defined( linux ) || defined( __FreeBSD__ )
+#  define _G_NO_EXTERN_TEMPLATES
+#endif
+
 #include "Include/fg_stl_config.h"
 #include STL_ALGORITHM
 #include STL_FUNCTIONAL
@@ -261,6 +265,9 @@ fgEVENT_MGR::~fgEVENT_MGR( void ) {
 
 
 // $Log$
+// Revision 1.12  1998/11/23 21:49:07  curt
+// Borland portability tweaks.
+//
 // Revision 1.11  1998/11/09 23:41:51  curt
 // Log message clean ups.
 //
diff --git a/Time/light.cxx b/Time/light.cxx
index b8a4a5599..71e5207b6 100644
--- a/Time/light.cxx
+++ b/Time/light.cxx
@@ -33,6 +33,11 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include <string.h>
 
 #include <Aircraft/aircraft.hxx>
@@ -212,6 +217,9 @@ fgLIGHT::~fgLIGHT( void ) {
 
 
 // $Log$
+// Revision 1.21  1998/11/23 21:49:09  curt
+// Borland portability tweaks.
+//
 // Revision 1.20  1998/11/06 21:18:27  curt
 // Converted to new logstream debugging facility.  This allows release
 // builds with no messages at all (and no performance impact) by using
diff --git a/Weather/weather.cxx b/Weather/weather.cxx
index 39f9b5707..7d838c183 100644
--- a/Weather/weather.cxx
+++ b/Weather/weather.cxx
@@ -35,11 +35,10 @@
 
 #include <math.h>
 
-#include "weather.hxx"
-
 #include <Aircraft/aircraft.hxx>
 #include <Debug/logstream.hxx>
 #include <Math/fg_random.h>
+#include <Weather/weather.hxx>
 
 
 // This is a record containing current weather info
@@ -105,6 +104,9 @@ void fgWeatherSetVisibility( float visibility ) {
 
 
 // $Log$
+// Revision 1.3  1998/11/23 21:49:11  curt
+// Borland portability tweaks.
+//
 // Revision 1.2  1998/11/06 21:18:29  curt
 // Converted to new logstream debugging facility.  This allows release
 // builds with no messages at all (and no performance impact) by using