diff --git a/flight/PiOS/Common/pios_rfm22b.c b/flight/PiOS/Common/pios_rfm22b.c
index b152741f2..0b361b25b 100644
--- a/flight/PiOS/Common/pios_rfm22b.c
+++ b/flight/PiOS/Common/pios_rfm22b.c
@@ -52,7 +52,7 @@
 
 #include <pios_spi_priv.h>
 #include <packet_handler.h>
-#if defined(PIOS_INCLUDE_RFM22B_GCSRECEIVER)
+#if defined(PIOS_INCLUDE_GCSRCVR)
 #include <gcsreceiver.h>
 #endif
 #include <pios_rfm22b_priv.h>
@@ -631,7 +631,7 @@ int32_t PIOS_RFM22B_Init(uint32_t *rfm22b_id, uint32_t spi_id, uint32_t slave_nu
 	rfm22b_dev->deviceID = crcs[0] | crcs[1] << 8 | crcs[2] << 16 | crcs[3] << 24;
 	DEBUG_PRINTF(2, "RF device ID: %x\n\r", rfm22b_dev->deviceID);
 
-#if defined(PIOS_INCLUDE_RFM22B_GCSRECEIVER)
+#if defined(PIOS_INCLUDE_GCSRCVR)
         // Initialize the GCSReceive object
 	GCSReceiverInitialize();
 #endif
@@ -1846,9 +1846,9 @@ static enum pios_rfm22b_event rfm22_rxData(struct pios_rfm22b_dev *rfm22b_dev)
 					break;
 				case PACKET_TYPE_PPM:
 				{
-#if defined(PIOS_INCLUDE_RFM22B_GCSRECEIVER) || (defined(PIOS_INCLUDE_PPM_OUT) && defined(PIOS_PPM_OUTPUT)) || defined(PIOS_INCLUDE_RFM22B_RCVR)
+#if defined(PIOS_INCLUDE_GCSRCVR) || (defined(PIOS_INCLUDE_PPM_OUT) && defined(PIOS_PPM_OUTPUT)) || defined(PIOS_INCLUDE_RFM22B_RCVR)
 					PHPpmPacketHandle ppmp = (PHPpmPacketHandle)&(rfm22b_dev->rx_packet);
-#if defined(PIOS_INCLUDE_RFM22B_GCSRECEIVER) || (defined(PIOS_INCLUDE_PPM_OUT) && defined(PIOS_PPM_OUTPUT))
+#if defined(PIOS_INCLUDE_GCSRCVR) || (defined(PIOS_INCLUDE_PPM_OUT) && defined(PIOS_PPM_OUTPUT))
 					bool ppm_output = false;
 #endif
 #endif
@@ -1865,7 +1865,7 @@ static enum pios_rfm22b_event rfm22_rxData(struct pios_rfm22b_dev *rfm22b_dev)
 						}
 					}
 #endif
-#if defined(PIOS_INCLUDE_RFM22B_GCSRECEIVER)
+#if defined(PIOS_INCLUDE_GCSRCVR)
 					if (!ppm_output) {
 						GCSReceiverData gcsRcvr;
 						for (uint8_t i = 0; (i < PIOS_RFM22B_RCVR_MAX_CHANNELS) && (i < GCSRECEIVER_CHANNEL_NUMELEM); ++i) {
diff --git a/flight/targets/PipXtreme/System/inc/pios_config.h b/flight/targets/PipXtreme/System/inc/pios_config.h
index b7e7551fa..1da5edbe0 100755
--- a/flight/targets/PipXtreme/System/inc/pios_config.h
+++ b/flight/targets/PipXtreme/System/inc/pios_config.h
@@ -90,7 +90,7 @@
 /* #define PIOS_INCLUDE_PPM_FLEXI */
 /* #define PIOS_INCLUDE_DSM */
 /* #define PIOS_INCLUDE_SBUS */
-/* #define PIOS_INCLUDE_GCSRCVR */
+#define PIOS_INCLUDE_GCSRCVR
 
 /* PIOS abstract receiver interface */
 #define PIOS_INCLUDE_RCVR
diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/lks94projection.h b/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/lks94projection.h
index d3e09b868..1956cb613 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/lks94projection.h
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/lks94projection.h
@@ -28,7 +28,7 @@
 #define LKS94PROJECTION_H
 #include <QVector>
 #include "cmath"
-#include "../pureprojection.h"
+#include <opmapcontrol/src/internals/pureprojection.h>
 
 
 namespace projections {