diff --git a/test_suite/unit_tests/AI/test_submodels.cxx b/test_suite/unit_tests/AI/test_submodels.cxx
index 5b350ee5e..a25e03546 100644
--- a/test_suite/unit_tests/AI/test_submodels.cxx
+++ b/test_suite/unit_tests/AI/test_submodels.cxx
@@ -17,6 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include "test_submodels.hxx"
 
 #include "test_suite/FGTestApi/NavDataCache.hxx"
diff --git a/test_suite/unit_tests/Autopilot/testInputValue.cxx b/test_suite/unit_tests/Autopilot/testInputValue.cxx
index d62369dc3..990924918 100644
--- a/test_suite/unit_tests/Autopilot/testInputValue.cxx
+++ b/test_suite/unit_tests/Autopilot/testInputValue.cxx
@@ -11,9 +11,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 
 #include <Autopilot/autopilot.hxx>
-#include <Autopilot/inputvalue.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
+#include <simgear/misc/inputvalue.hxx>
 
 
 #include <simgear/math/sg_random.hxx>
@@ -59,7 +59,7 @@ void InputValueTests::testPropertyPath()
     fgSetString("/test/altitude-ft-node-path", "/test/a");
     fgSetDouble("/test/a", 0.5);
 
-    InputValue_ptr valueA = new InputValue(*globals->get_props(), *config);
+    simgear::Value_ptr valueA = new simgear::Value(*globals->get_props(), *config);
 
     CPPUNIT_ASSERT(valueA->is_enabled());
     // check value is not written back
@@ -90,7 +90,7 @@ void InputValueTests::testPropertyPath()
                                 </PropertyList>
                                 )");
 
-    InputValue_ptr valueB = new InputValue(*globals->get_props(), *config2);
+    simgear::Value_ptr valueB = new simgear::Value(*globals->get_props(), *config2);
     CPPUNIT_ASSERT(!valueB->is_enabled());
     CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, valueB->get_value(), 0.001);