diff --git a/src/FDM/LaRCsim/LaRCsim.cxx b/src/FDM/LaRCsim/LaRCsim.cxx
index 7ee0d3c6a..b1c764e05 100644
--- a/src/FDM/LaRCsim/LaRCsim.cxx
+++ b/src/FDM/LaRCsim/LaRCsim.cxx
@@ -20,9 +20,7 @@
 //
 // $Id$
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #include <cmath>
 #include <cfloat>
@@ -931,26 +929,24 @@ void FGLaRCsim::set_Velocities_Local_Airmass (double wnorth,
 }
 */
 
-void FGLaRCsim::set_Static_pressure(double p) { 
-    SG_LOG( SG_FLIGHT, SG_INFO, 
-            "FGLaRCsim::set_Static_pressure: " << p  );
-    SG_LOG( SG_FLIGHT, SG_INFO, 
-            "LaRCsim does not support externally supplied atmospheric data" );
+void FGLaRCsim::set_Static_pressure(double p) {
+    SG_LOG(SG_FLIGHT, SG_BULK,
+           "FGLaRCsim::set_Static_pressure: " << p);
+    SG_LOG(SG_FLIGHT, SG_BULK,
+           "LaRCsim does not support externally supplied atmospheric data");
 }
 
-void FGLaRCsim::set_Static_temperature(double T) { 
-    SG_LOG( SG_FLIGHT, SG_INFO, 
-            "FGLaRCsim::set_Static_temperature: " << T  );
-    SG_LOG( SG_FLIGHT, SG_INFO, 
-            "LaRCsim does not support externally supplied atmospheric data" );
-
+void FGLaRCsim::set_Static_temperature(double T) {
+    SG_LOG(SG_FLIGHT, SG_BULK,
+           "FGLaRCsim::set_Static_temperature: " << T);
+    SG_LOG(SG_FLIGHT, SG_BULK,
+           "LaRCsim does not support externally supplied atmospheric data");
 }
 
 void FGLaRCsim::set_Density(double rho) {
-    SG_LOG( SG_FLIGHT, SG_INFO, "FGLaRCsim::set_Density: " << rho  );
-    SG_LOG( SG_FLIGHT, SG_INFO, 
-            "LaRCsim does not support externally supplied atmospheric data" );
-
+    SG_LOG(SG_FLIGHT, SG_BULK, "FGLaRCsim::set_Density: " << rho);
+    SG_LOG(SG_FLIGHT, SG_BULK,
+           "LaRCsim does not support externally supplied atmospheric data");
 }
 
 
diff --git a/src/FDM/LaRCsim/ls_model.c b/src/FDM/LaRCsim/ls_model.c
index a511a6888..e9a56aaa5 100644
--- a/src/FDM/LaRCsim/ls_model.c
+++ b/src/FDM/LaRCsim/ls_model.c
@@ -159,6 +159,9 @@ Initial Flight Gear revision.
         OUTPUTS:
 
 --------------------------------------------------------------------------*/
+
+#include "config.h"
+
 #include <stdio.h>
 
 #include "ls_types.h"
@@ -209,7 +212,10 @@ void ls_model( SCALAR dt, int Initialize ) {
       subsystems( dt, Initialize );
       // During initialization period, re-initialize velocities
       // and euler angles
-      if (Initialize !=0) uiuc_init_2_wrapper();
+      if (Initialize != 0) {
+          uiuc_init_2_wrapper();
+      }
+
       uiuc_network_recv_2_wrapper();
       uiuc_engine_2_wrapper( dt, Initialize );
       uiuc_wind_2_wrapper( dt, Initialize );
diff --git a/src/FDM/LaRCsim/ls_step.c b/src/FDM/LaRCsim/ls_step.c
index ff00b9cfe..48b4694a2 100644
--- a/src/FDM/LaRCsim/ls_step.c
+++ b/src/FDM/LaRCsim/ls_step.c
@@ -297,6 +297,8 @@ Initial Flight Gear revision.
 
 --------------------------------------------------------------------------*/
 
+#include "config.h"
+
 #include "ls_types.h"
 #include "ls_constants.h"
 #include "ls_generic.h"
diff --git a/src/FDM/LaRCsim/uiuc_aero.c b/src/FDM/LaRCsim/uiuc_aero.c
index 2a8504e82..e6ea5a534 100644
--- a/src/FDM/LaRCsim/uiuc_aero.c
+++ b/src/FDM/LaRCsim/uiuc_aero.c
@@ -53,6 +53,8 @@
 
 --------------------------------------------------------------------------*/
 
+#include "config.h"
+
 #ifdef ENABLE_UIUC_MODEL
 
 #include <math.h>