diff --git a/src/Autopilot/newauto.cxx b/src/Autopilot/newauto.cxx
index 8fd0014ef..c52f2f3ca 100644
--- a/src/Autopilot/newauto.cxx
+++ b/src/Autopilot/newauto.cxx
@@ -44,8 +44,6 @@
 #include "newauto.hxx"
 
 
-#define DEFAULT_AP_HEADING_LOCK FGAutopilot::FG_DG_HEADING_LOCK
-
 FGAutopilot *current_autopilot;
 
 
diff --git a/src/Autopilot/newauto.hxx b/src/Autopilot/newauto.hxx
index 67ceb2b03..87b6d7545 100644
--- a/src/Autopilot/newauto.hxx
+++ b/src/Autopilot/newauto.hxx
@@ -211,5 +211,7 @@ public:
 
 extern FGAutopilot *current_autopilot;
 
+#define DEFAULT_AP_HEADING_LOCK FGAutopilot::FG_DG_HEADING_LOCK
+// #define DEFAULT_AP_HEADING_LOCK FGAutopilot::FG_TRUE_HEADING_LOCK
 
 #endif // _NEWAUTO_HXX
diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 2a92e5982..3000f27fa 100644
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -44,8 +44,6 @@ SG_USING_STD(istream);
 SG_USING_STD(ostream);
 #endif
 
-#define DEFAULT_AP_HEADING_LOCK FGAutopilot::FG_DG_HEADING_LOCK
-
 static double getWindNorth ();
 static double getWindEast ();
 static double getWindDown ();