diff --git a/slsReceiverSoftware/Makefile b/slsReceiverSoftware/Makefile
index 4bc760e82..b245a634f 100644
--- a/slsReceiverSoftware/Makefile
+++ b/slsReceiverSoftware/Makefile
@@ -15,9 +15,16 @@ CFLAGS= -g -DC_ONLY -fPIC
 
 DFLAGS= -g -DDACS_INT  -DSLS_RECEIVER_UDP_FUNCTIONS 
 
-INCLUDES?= -Iinclude -I../slsDetectorCalibration -I$(ASM) 
+INCLUDES?= $(INCLUDESRXR) -I include/ -I ../slsDetectorCalibration
+
+#-Iinclude -I../slsDetectorCalibration -I$(ASM) 
 
 SRC_CLNT = MySocketTCP.cpp UDPInterface.cpp  UDPBaseImplementation.cpp UDPStandardImplementation.cpp slsReceiverTCPIPInterface.cpp slsReceiver.cpp slsReceiverUsers.cpp utilities.cpp 
+
+ifeq ($(REST), yes)
+	SRC_CLNT += UDPRESTImplementation.cpp
+endif
+
 MAIN_SRC = main.cpp
 
 OBJS=$(SRC_CLNT:%.cpp=$(BUILDDIR)/%.o) 
diff --git a/slsReceiverSoftware/src/UDPInterface.cpp b/slsReceiverSoftware/src/UDPInterface.cpp
index a0d771687..0d7d0503c 100644
--- a/slsReceiverSoftware/src/UDPInterface.cpp
+++ b/slsReceiverSoftware/src/UDPInterface.cpp
@@ -23,6 +23,7 @@ using namespace std;
 #include "UDPInterface.h"
 #include "UDPBaseImplementation.h"
 #include "UDPStandardImplementation.h"
+#include "UDPRESTImplementation.h"
 
 
 
@@ -35,10 +36,11 @@ UDPInterface * UDPInterface::create(string receiver_type){
 		return new UDPStandardImplementation();
 	}
 
-#ifdef REST
-	else if (receiver_type == "REST")
+	//#ifdef REST
+	else if (receiver_type == "REST"){
 		return new UDPRESTImplementation();
-#endif
+	}
+	//#endif
 	else{
 		FILE_LOG(logWARNING) << "[ERROR] UDP interface not supported, using standard implementation";
 		return new UDPBaseImplementation();