diff --git a/Aircraft/aircraft.h b/Aircraft/aircraft.h
index 8d758d18f..07a4dbf14 100644
--- a/Aircraft/aircraft.h
+++ b/Aircraft/aircraft.h
@@ -47,13 +47,16 @@ extern struct aircraft_params current_aircraft;
 void aircraft_debug(int type);
 
 
-#endif AIRCRAFT_H
+#endif /* AIRCRAFT_H */
 
 
 /* $Log$
-/* Revision 1.3  1997/06/21 17:12:42  curt
-/* Capitalized subdirectory names.
+/* Revision 1.4  1997/07/23 21:52:17  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.3  1997/06/21 17:12:42  curt
+ * Capitalized subdirectory names.
+ *
  * Revision 1.2  1997/05/23 15:40:30  curt
  * Added GNU copyright headers.
  *
diff --git a/Controls/controls.h b/Controls/controls.h
index d43751e76..2425235c7 100644
--- a/Controls/controls.h
+++ b/Controls/controls.h
@@ -77,13 +77,16 @@ void fgThrottleSet(int engine, double pos);
 
 
 
-#endif CONTROLS_H
+#endif /* CONTROLS_H */
 
 
 /* $Log$
-/* Revision 1.3  1997/05/31 19:16:27  curt
-/* Elevator trim added.
+/* Revision 1.4  1997/07/23 21:52:18  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.3  1997/05/31 19:16:27  curt
+ * Elevator trim added.
+ *
  * Revision 1.2  1997/05/23 15:40:33  curt
  * Added GNU copyright headers.
  *
diff --git a/FDM/flight.h b/FDM/flight.h
index dcad05c23..4b682d110 100644
--- a/FDM/flight.h
+++ b/FDM/flight.h
@@ -32,7 +32,7 @@
 #include "LaRCsim/ls_interface.h"
 
 
-/* Define the various supported flight models (not all implemented) */
+/* Define the various supported flight models (most not yet implemented) */
 #define FG_LARCSIM     0
 #define FG_ACM         1
 #define FG_HELICOPTER  2
@@ -41,6 +41,7 @@
 #define FG_PARACHUTE   5
 #define FG_SLEW        6
 #define FG_EXTERN_GPS  7
+#define FG_EXTERN_NET  8
 
 
 /* Define a structure containing the shared flight model parameters */
@@ -405,14 +406,17 @@ int fgFlightModelInit(int model, struct flight_params *f, double dt);
 int fgFlightModelUpdate(int model, struct flight_params *f, int multiloop);
 
 
-#endif FLIGHT_H
+#endif /* FLIGHT_H */
 
 
 /* $Log$
-/* Revision 1.6  1997/06/21 17:52:22  curt
-/* Continue directory shuffling ... everything should be compilable/runnable
-/* again.
+/* Revision 1.7  1997/07/23 21:52:19  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.6  1997/06/21 17:52:22  curt
+ * Continue directory shuffling ... everything should be compilable/runnable
+ * again.
+ *
  * Revision 1.5  1997/06/21 17:12:49  curt
  * Capitalized subdirectory names.
  *
diff --git a/LaRCsim/ls_interface.h b/LaRCsim/ls_interface.h
index 2cc3773e8..93dc064bb 100644
--- a/LaRCsim/ls_interface.h
+++ b/LaRCsim/ls_interface.h
@@ -38,13 +38,16 @@ int fgLaRCsimInit(double dt);
 int fgLaRCsimUpdate(int multiloop);
 
 
-#endif LS_INTERFACE_H
+#endif /* LS_INTERFACE_H */
 
 
 /* $Log$
-/* Revision 1.2  1997/05/29 22:39:59  curt
-/* Working on incorporating the LaRCsim flight model.
+/* Revision 1.3  1997/07/23 21:52:20  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.2  1997/05/29 22:39:59  curt
+ * Working on incorporating the LaRCsim flight model.
+ *
  * Revision 1.1  1997/05/29 00:09:58  curt
  * Initial Flight Gear revision.
  *
diff --git a/Main/GLTKkey.h b/Main/GLTKkey.h
index ea43eda2e..a92cb9f94 100644
--- a/Main/GLTKkey.h
+++ b/Main/GLTKkey.h
@@ -35,14 +35,17 @@
 GLenum GLTKkey(int k, GLenum mask);
 
 
-#endif GLTKKEY_H
+#endif /* GLTKKEY_H */
 
 
 /* $Log$
-/* Revision 1.2  1997/05/23 15:40:24  curt
-/* Added GNU copyright headers.
-/* Fog now works!
+/* Revision 1.3  1997/07/23 21:52:22  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.2  1997/05/23 15:40:24  curt
+ * Added GNU copyright headers.
+ * Fog now works!
+ *
  * Revision 1.1  1997/05/21 15:57:49  curt
  * Renamed due to added GLUT support.
  *
diff --git a/Main/GLUTkey.h b/Main/GLUTkey.h
index e11eafb51..3b867ae0c 100644
--- a/Main/GLUTkey.h
+++ b/Main/GLUTkey.h
@@ -40,13 +40,16 @@ void GLUTkey(unsigned char k, int x, int y);
 void GLUTspecialkey(int k, int x, int y);
 
 
-#endif GLUTKEY_H
+#endif /* GLUTKEY_H */
 
 
 /* $Log$
-/* Revision 1.4  1997/06/02 03:40:06  curt
-/* A tiny bit more view tweaking.
+/* Revision 1.5  1997/07/23 21:52:23  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.4  1997/06/02 03:40:06  curt
+ * A tiny bit more view tweaking.
+ *
  * Revision 1.3  1997/05/31 04:13:52  curt
  * WE CAN NOW FLY!!!
  *
diff --git a/Scenery/Makefile b/Scenery/Makefile
index 491a59212..1a7ee56f9 100644
--- a/Scenery/Makefile
+++ b/Scenery/Makefile
@@ -26,7 +26,7 @@
 
 TARGET = libScenery.a
 
-CFILES = common.c mesh.c scenery.c scanner.c parser.c geometry.c
+CFILES = chunkmgr.c common.c mesh.c scenery.c scanner.c parser.c geometry.c
 HFILES = 
 OFILES = $(CFILES:.c=.o)
 
@@ -75,6 +75,9 @@ scanner.o: scanner.c
 parser.o: parser.c
 	$(CC) $(CFLAGS) -c parser.c -o $@
 
+chunkmgr.o:
+	$(CC) $(CFLAGS) -c chunkmgr.c -o $@
+
 common.o:
 	$(CC) $(CFLAGS) -c common.c -o $@
 
@@ -89,6 +92,9 @@ geometry.o:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.17  1997/07/23 21:52:23  curt
+# Put comments around the text after an #endif for increased portability.
+#
 # Revision 1.16  1997/07/20 02:19:11  curt
 # First stab at a system to generate os2 makefiles automatically.
 #
diff --git a/Scenery/common.h b/Scenery/common.h
index f00945ef2..0273d214d 100644
--- a/Scenery/common.h
+++ b/Scenery/common.h
@@ -36,13 +36,16 @@
 char *strip_quotes(char *s);
 
 
-#endif COMMON_H
+#endif /* COMMON_H */
 
 
 /* $Log$
-/* Revision 1.2  1997/05/23 15:40:41  curt
-/* Added GNU copyright headers.
+/* Revision 1.3  1997/07/23 21:52:24  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.2  1997/05/23 15:40:41  curt
+ * Added GNU copyright headers.
+ *
  * Revision 1.1  1997/05/16 16:07:04  curt
  * Initial revision.
  *
diff --git a/Scenery/depend b/Scenery/depend
index 463f07901..cb355c4fa 100644
--- a/Scenery/depend
+++ b/Scenery/depend
@@ -1,3 +1,4 @@
+chunkmgr.o: chunkmgr.c chunkmgr.h mesh.h
 common.o: common.c common.h
 geometry.o: geometry.c geometry.h mesh.h
 mesh.o: mesh.c ../constants.h scenery.h mesh.h common.h
diff --git a/Scenery/geometry.h b/Scenery/geometry.h
index 456160b7c..8b48c1d0e 100644
--- a/Scenery/geometry.h
+++ b/Scenery/geometry.h
@@ -52,13 +52,16 @@ void vrmlHandleGeometry();
 int vrmlFreeGeometry();
 
 
-#endif GEOMETRY_H
+#endif /* GEOMETRY_H */
 
 
 /* $Log$
-/* Revision 1.1  1997/06/29 21:16:48  curt
-/* More twiddling with the Scenery Management system.
+/* Revision 1.2  1997/07/23 21:52:25  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.1  1997/06/29 21:16:48  curt
+ * More twiddling with the Scenery Management system.
+ *
  * Revision 1.1  1997/06/22 21:42:35  curt
  * Initial revision of VRML (subset) parser.
  *
diff --git a/Scenery/mesh.h b/Scenery/mesh.h
index 75a144852..4c34831bf 100644
--- a/Scenery/mesh.h
+++ b/Scenery/mesh.h
@@ -72,13 +72,16 @@ void mesh_do_it(struct mesh *m);
 double mesh_altitude(double lon, double lat);
 
 
-#endif MESH_H
+#endif /* MESH_H */
 
 
 /* $Log$
-/* Revision 1.4  1997/07/08 18:20:14  curt
-/* Working on establishing a hard ground.
+/* Revision 1.5  1997/07/23 21:52:25  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.4  1997/07/08 18:20:14  curt
+ * Working on establishing a hard ground.
+ *
  * Revision 1.3  1997/06/22 21:44:41  curt
  * Working on intergrating the VRML (subset) parser.
  *
diff --git a/Scenery/parsevrml.h b/Scenery/parsevrml.h
index e23222503..836b1ad5c 100644
--- a/Scenery/parsevrml.h
+++ b/Scenery/parsevrml.h
@@ -31,13 +31,17 @@
 /* parse a VRML scenery file */
 int fgParseVRML(char *file);
 
-#endif PARSEVRML_H
+
+#endif /* PARSEVRML_H */
 
 
 /* $Log$
-/* Revision 1.1  1997/06/29 21:16:49  curt
-/* More twiddling with the Scenery Management system.
+/* Revision 1.2  1997/07/23 21:52:26  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.1  1997/06/29 21:16:49  curt
+ * More twiddling with the Scenery Management system.
+ *
  * Revision 1.1  1997/06/27 02:25:13  curt
  * Initial revision.
  *
diff --git a/Scenery/scenery.h b/Scenery/scenery.h
index d9dbae346..a3687dd6d 100644
--- a/Scenery/scenery.h
+++ b/Scenery/scenery.h
@@ -39,21 +39,26 @@ extern struct scenery_params cur_scenery_params;
 /* Initialize the Scenery Management system */
 void fgSceneryInit();
 
+
 /* Tell the scenery manager where we are so it can load the proper data, and
  * build the proper structures. */
 void fgSceneryUpdate(double lon, double lat, double elev);
 
+
 /* Render out the current scene */
 void fgSceneryRender();
 
 
-#endif SCENERY_H
+#endif /* SCENERY_H */
 
 
 /* $Log$
-/* Revision 1.6  1997/07/11 01:30:03  curt
-/* More tweaking of terrian floor.
+/* Revision 1.7  1997/07/23 21:52:27  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.6  1997/07/11 01:30:03  curt
+ * More tweaking of terrian floor.
+ *
  * Revision 1.5  1997/06/26 22:14:57  curt
  * Beginning work on a scenery management system.
  *
diff --git a/Simulator/constants.h b/Simulator/constants.h
index 33590d586..edc521580 100644
--- a/Simulator/constants.h
+++ b/Simulator/constants.h
@@ -75,13 +75,16 @@
 #define EPSILON 0.000001
 
 
-#endif CONSTANTS_H
+#endif /* CONSTANTS_H */
 
 
 /* $Log$
-/* Revision 1.6  1997/07/21 14:45:01  curt
-/* Minor tweaks.
+/* Revision 1.7  1997/07/23 21:52:10  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.6  1997/07/21 14:45:01  curt
+ * Minor tweaks.
+ *
  * Revision 1.5  1997/07/19 23:04:46  curt
  * Added an initial weather section.
  *
diff --git a/Simulator/limits.h b/Simulator/limits.h
index 06b401513..4567ce5cb 100644
--- a/Simulator/limits.h
+++ b/Simulator/limits.h
@@ -32,13 +32,16 @@
 #define FG_MAX_ENGINES 10
 
 
-#endif LIMITS_H
+#endif /* LIMITS_H */
 
 
 /* $Log$
-/* Revision 1.3  1997/05/31 19:16:24  curt
-/* Elevator trim added.
+/* Revision 1.4  1997/07/23 21:52:11  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.3  1997/05/31 19:16:24  curt
+ * Elevator trim added.
+ *
  * Revision 1.2  1997/05/27 17:48:10  curt
  * Added GNU copyright.
  *
diff --git a/Simulator/types.h b/Simulator/types.h
index 7e2f2cc65..b237cf13b 100644
--- a/Simulator/types.h
+++ b/Simulator/types.h
@@ -40,11 +40,14 @@ struct fgGeodeticPoint {
 };
 
 
-#endif TYPES_H
+#endif /* TYPES_H */
 
 
 /* $Log$
-/* Revision 1.1  1997/07/07 21:03:30  curt
-/* Initial revision.
+/* Revision 1.2  1997/07/23 21:52:12  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.1  1997/07/07 21:03:30  curt
+ * Initial revision.
+ *
  */
diff --git a/Slew/slew.h b/Slew/slew.h
index ffc76d315..a6d8b746b 100644
--- a/Slew/slew.h
+++ b/Slew/slew.h
@@ -35,13 +35,16 @@ void fgSlewInit(double pos_x, double pos_y, double pos_z, double heading);
 void fgSlewUpdate();
 
 
-#endif SLEW_H
+#endif /* SLEW_H */
 
 
 /* $Log$
-/* Revision 1.1  1997/05/29 02:29:43  curt
-/* Moved to their own directory.
+/* Revision 1.2  1997/07/23 21:52:20  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.1  1997/05/29 02:29:43  curt
+ * Moved to their own directory.
+ *
  * Revision 1.2  1997/05/23 15:40:38  curt
  * Added GNU copyright headers.
  *
diff --git a/Time/fg_timer.h b/Time/fg_timer.h
index ae585cd5c..7205690ae 100644
--- a/Time/fg_timer.h
+++ b/Time/fg_timer.h
@@ -40,11 +40,14 @@ void fgTimerInit(float dt, void (*f)());
 int fgGetTimeInterval();
 
 
-#endif FG_TIMER_H
+#endif /* FG_TIMER_H */
 
 
 /* $Log$
-/* Revision 1.1  1997/06/16 19:24:20  curt
-/* Initial revision.
+/* Revision 1.2  1997/07/23 21:52:27  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.1  1997/06/16 19:24:20  curt
+ * Initial revision.
+ *
  */
diff --git a/Weather/weather.h b/Weather/weather.h
index 42bf5140e..d92b909ab 100644
--- a/Weather/weather.h
+++ b/Weather/weather.h
@@ -35,11 +35,14 @@ void fgWeatherInit(void);
 void fgWeatherUpdate(double lon, double lat, double alt);
 
 
-#endif WEATHER_H
+#endif /* WEATHER_H */
 
 
 /* $Log$
-/* Revision 1.1  1997/07/19 23:03:58  curt
-/* Initial revision.
+/* Revision 1.2  1997/07/23 21:52:30  curt
+/* Put comments around the text after an #endif for increased portability.
 /*
+ * Revision 1.1  1997/07/19 23:03:58  curt
+ * Initial revision.
+ *
  */