diff --git a/ground/openpilotgcs/openpilotgcs.pro b/ground/openpilotgcs/openpilotgcs.pro
index 22a893f52..df6b0cf86 100644
--- a/ground/openpilotgcs/openpilotgcs.pro
+++ b/ground/openpilotgcs/openpilotgcs.pro
@@ -9,6 +9,8 @@ include(openpilotgcs.pri)
 TEMPLATE  = subdirs
 CONFIG   += ordered
 
+DEFINES += USE_PATHPLANNER
+
 SUBDIRS = src share copydata
 unix:!macx:!isEmpty(copydata):SUBDIRS += bin
 
diff --git a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
index e947bab7c..ef6099917 100644
--- a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
@@ -54,7 +54,7 @@
 #define sign(x) ((x < 0) ? -1 : 1)
 
 // Uncomment this to enable 6 point calibration on the accels
-//#define SIX_POINT_CAL_ACCEL
+#define SIX_POINT_CAL_ACCEL
 
 const double ConfigRevoWidget::maxVarValue = 0.1;
 
diff --git a/ground/openpilotgcs/src/plugins/opmap/opmap.pro b/ground/openpilotgcs/src/plugins/opmap/opmap.pro
index 6b30dfe97..ca4e01c47 100644
--- a/ground/openpilotgcs/src/plugins/opmap/opmap.pro
+++ b/ground/openpilotgcs/src/plugins/opmap/opmap.pro
@@ -1,5 +1,9 @@
 QT += xml
 TEMPLATE = lib
+PATHPLANNER {
+    DEFINES += USE_PATHPLANNER
+}
+
 TARGET = OPMapGadget
 include(../../openpilotgcsplugin.pri)
 include(../../plugins/coreplugin/coreplugin.pri)