diff --git a/src/FDM/UIUCModel/Makefile.am b/src/FDM/UIUCModel/Makefile.am
index f5714293f..c545856cc 100644
--- a/src/FDM/UIUCModel/Makefile.am
+++ b/src/FDM/UIUCModel/Makefile.am
@@ -47,4 +47,4 @@ libUIUCModel_a_SOURCES = \
                         uiuc_warnings_errors.cpp uiuc_warnings_errors.h \
                         uiuc_wrapper.cpp uiuc_wrapper.h
 
-INCLUDES += -I$(top_srcdir) 
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
diff --git a/src/FDM/UIUCModel/uiuc_aerodeflections.h b/src/FDM/UIUCModel/uiuc_aerodeflections.h
index ec93ff89f..3ca4cf65e 100644
--- a/src/FDM/UIUCModel/uiuc_aerodeflections.h
+++ b/src/FDM/UIUCModel/uiuc_aerodeflections.h
@@ -2,8 +2,8 @@
 #define _AERODEFLECTIONS_H_
 
 #include "uiuc_aircraft.h"                 /* aileron, elevator, rudder               */
-#include "../LaRCsim/ls_cockpit.h"     /* Long_control, Lat_control, Rudder_pedal */
-#include "../LaRCsim/ls_constants.h"   /* RAD_TO_DEG, DEG_TO_RAD                  */
+#include <FDM/LaRCsim/ls_cockpit.h>     /* Long_control, Lat_control, Rudder_pedal */
+#include <FDM/LaRCsim/ls_constants.h>   /* RAD_TO_DEG, DEG_TO_RAD                  */
 
 
 void uiuc_aerodeflections( double dt );
diff --git a/src/FDM/UIUCModel/uiuc_betaprobe.h b/src/FDM/UIUCModel/uiuc_betaprobe.h
index fddc8d66f..ec2d77620 100644
--- a/src/FDM/UIUCModel/uiuc_betaprobe.h
+++ b/src/FDM/UIUCModel/uiuc_betaprobe.h
@@ -1,11 +1,13 @@
 #ifndef _BETAPROBE_H_
 #define _BETAPROBE_H_
 
-#include "uiuc_aircraft.h"
-#include "../FDM/LaRCsim/ls_constants.h"
-#include "../FDM/LaRCsim/ls_generic.h"
 #include <math.h>
 
+#include <FDM/LaRCsim/ls_constants.h>
+#include <FDM/LaRCsim/ls_generic.h>
+
+#include "uiuc_aircraft.h"
+
 void uiuc_betaprobe();
 
 #endif  // _BETAPROBE_H_
diff --git a/src/FDM/UIUCModel/uiuc_coef_drag.h b/src/FDM/UIUCModel/uiuc_coef_drag.h
index c87f30b58..235347f75 100644
--- a/src/FDM/UIUCModel/uiuc_coef_drag.h
+++ b/src/FDM/UIUCModel/uiuc_coef_drag.h
@@ -1,12 +1,13 @@
 #ifndef _COEF_DRAG_H_
 #define _COEF_DRAG_H_
 
+#include <FDM/LaRCsim/ls_generic.h>
+
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
 
 
 void uiuc_coef_drag();
diff --git a/src/FDM/UIUCModel/uiuc_coef_lift.h b/src/FDM/UIUCModel/uiuc_coef_lift.h
index 8790bdd6b..2edfa8e31 100644
--- a/src/FDM/UIUCModel/uiuc_coef_lift.h
+++ b/src/FDM/UIUCModel/uiuc_coef_lift.h
@@ -1,12 +1,13 @@
 #ifndef _COEF_LIFT_H_
 #define _COEF_LIFT_H_
 
+#include <FDM/LaRCsim/ls_generic.h>
+
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
 
 
 void uiuc_coef_lift();
diff --git a/src/FDM/UIUCModel/uiuc_coef_pitch.h b/src/FDM/UIUCModel/uiuc_coef_pitch.h
index 91475ad07..8b010e1f3 100644
--- a/src/FDM/UIUCModel/uiuc_coef_pitch.h
+++ b/src/FDM/UIUCModel/uiuc_coef_pitch.h
@@ -6,7 +6,7 @@
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 
 void uiuc_coef_pitch();
diff --git a/src/FDM/UIUCModel/uiuc_coef_roll.h b/src/FDM/UIUCModel/uiuc_coef_roll.h
index 42f7f2ae0..a2cf5e41f 100644
--- a/src/FDM/UIUCModel/uiuc_coef_roll.h
+++ b/src/FDM/UIUCModel/uiuc_coef_roll.h
@@ -6,7 +6,7 @@
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 
 void uiuc_coef_roll();
diff --git a/src/FDM/UIUCModel/uiuc_coef_sideforce.h b/src/FDM/UIUCModel/uiuc_coef_sideforce.h
index 2cef57f02..772dad562 100644
--- a/src/FDM/UIUCModel/uiuc_coef_sideforce.h
+++ b/src/FDM/UIUCModel/uiuc_coef_sideforce.h
@@ -6,7 +6,7 @@
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 
 void uiuc_coef_sideforce();
diff --git a/src/FDM/UIUCModel/uiuc_coef_yaw.h b/src/FDM/UIUCModel/uiuc_coef_yaw.h
index 7f02e9c43..8ab3055c2 100644
--- a/src/FDM/UIUCModel/uiuc_coef_yaw.h
+++ b/src/FDM/UIUCModel/uiuc_coef_yaw.h
@@ -6,7 +6,7 @@
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 
 void uiuc_coef_yaw();
diff --git a/src/FDM/UIUCModel/uiuc_coefficients.h b/src/FDM/UIUCModel/uiuc_coefficients.h
index 06c6f5022..1036aedca 100644
--- a/src/FDM/UIUCModel/uiuc_coefficients.h
+++ b/src/FDM/UIUCModel/uiuc_coefficients.h
@@ -9,7 +9,7 @@
 #include "uiuc_coef_sideforce.h"
 #include "uiuc_coef_roll.h"
 #include "uiuc_coef_yaw.h"
-#include "../LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 
 void uiuc_coefficients();
diff --git a/src/FDM/UIUCModel/uiuc_convert.h b/src/FDM/UIUCModel/uiuc_convert.h
index 4f988a53e..a1fb81543 100644
--- a/src/FDM/UIUCModel/uiuc_convert.h
+++ b/src/FDM/UIUCModel/uiuc_convert.h
@@ -1,7 +1,7 @@
 #ifndef _CONVERT_H_
 #define _CONVERT_H_
 
-#include "../LaRCsim/ls_constants.h"   /* uses RAD_TO_DEG, DEG_TO_RAD */
+#include <FDM/LaRCsim/ls_constants.h>   /* uses RAD_TO_DEG, DEG_TO_RAD */
 
 double uiuc_convert( int conversionType );
 
diff --git a/src/FDM/UIUCModel/uiuc_engine.h b/src/FDM/UIUCModel/uiuc_engine.h
index b408a0e0f..3485349be 100644
--- a/src/FDM/UIUCModel/uiuc_engine.h
+++ b/src/FDM/UIUCModel/uiuc_engine.h
@@ -2,8 +2,8 @@
 #define _ENGINE_H_
 
 #include "uiuc_aircraft.h"
-#include "../LaRCsim/ls_generic.h"
-#include "../LaRCsim/ls_cockpit.h"
+#include <FDM/LaRCsim/ls_generic.h>
+#include <FDM/LaRCsim/ls_cockpit.h>
 
 void uiuc_engine();
 #endif // _ENGINE_H_
diff --git a/src/FDM/UIUCModel/uiuc_menu.h b/src/FDM/UIUCModel/uiuc_menu.h
index ea22d31a3..1686e086b 100644
--- a/src/FDM/UIUCModel/uiuc_menu.h
+++ b/src/FDM/UIUCModel/uiuc_menu.h
@@ -9,9 +9,9 @@
 #include "uiuc_initializemaps.h"
 #include "uiuc_1DdataFileReader.h"
 #include "uiuc_2DdataFileReader.h"
-#include "../FDM/LaRCsim/ls_generic.h"
-#include "../FDM/LaRCsim/ls_cockpit.h"    /* Long_trim defined */
-#include "../FDM/LaRCsim/ls_constants.h"  /* INVG defined */
+#include <FDM/LaRCsim/ls_generic.h>
+#include <FDM/LaRCsim/ls_cockpit.h>    /* Long_trim defined */
+#include <FDM/LaRCsim/ls_constants.h>  /* INVG defined */
 
 bool check_float(string  &token); // To check whether the token is a float or not
 void uiuc_menu (string aircraft);
diff --git a/src/FDM/UIUCModel/uiuc_recorder.h b/src/FDM/UIUCModel/uiuc_recorder.h
index f3dfd3c6e..b532920a5 100644
--- a/src/FDM/UIUCModel/uiuc_recorder.h
+++ b/src/FDM/UIUCModel/uiuc_recorder.h
@@ -4,9 +4,9 @@
 
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
-#include "../FDM/LaRCsim/ls_generic.h"
-#include "../FDM/LaRCsim/ls_cockpit.h"
-#include "../FDM/LaRCsim/ls_constants.h"
+#include <FDM/LaRCsim/ls_generic.h>
+#include <FDM/LaRCsim/ls_cockpit.h>
+#include <FDM/LaRCsim/ls_constants.h>
 
 extern double Simtime;
 
diff --git a/src/FDM/UIUCModel/uiuc_wrapper.cpp b/src/FDM/UIUCModel/uiuc_wrapper.cpp
index b4f025913..5867826c4 100644
--- a/src/FDM/UIUCModel/uiuc_wrapper.cpp
+++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp
@@ -71,7 +71,7 @@
 #include "uiuc_recorder.h"
 #include "uiuc_menu.h"
 #include "uiuc_betaprobe.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 extern "C" void uiuc_init_aeromodel ();
 extern "C" void uiuc_force_moment(double dt);