diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
index 098ff6d38..1c7de5a2c 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
@@ -30,7 +30,7 @@ using namespace std;
 
 
 slsReceiverFunctionList::slsReceiverFunctionList(detectorType det):
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 					eigerRxr(NULL),
 #endif
 					myDetectorType(det),
@@ -101,7 +101,7 @@ slsReceiverFunctionList::slsReceiverFunctionList(detectorType det):
 		packetIndexMask = MOENCH_PACKET_INDEX_MASK;
 	}
 	else if(myDetectorType == EIGER){
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 		eigerRxr = new eigerReceiver();
 #endif
 	}
@@ -219,7 +219,7 @@ uint32_t slsReceiverFunctionList::getAcquisitionIndex(){
 
 
 
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 
 int32_t slsReceiverFunctionList::setNumberOfFrames(int32_t fnum){
 	if(fnum >= 0)
@@ -244,13 +244,13 @@ int32_t slsReceiverFunctionList::setDynamicRange(int32_t dr){
 
 char* slsReceiverFunctionList::setFileName(char c[]){
 	if(strlen(c)){
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 		eigerRxr->setFileName(c);
 #else
 		strcpy(fileName,c);
 #endif
 	}
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 		return  eigerRxr->getFileName();
 #else
 	return getFileName();
@@ -264,7 +264,7 @@ char* slsReceiverFunctionList::setFilePath(char c[]){
 		//check if filepath exists
 		struct stat st;
 		if(stat(c,&st) == 0){
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 			eigerRxr->setFileName(c);
 #else
 			strcpy(filePath,c);
@@ -274,7 +274,7 @@ char* slsReceiverFunctionList::setFilePath(char c[]){
 			cout<<"FilePath does not exist:"<<filePath<<endl;
 		}
 	}
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 		return  eigerRxr->getFilePath();
 #else
 	return getFilePath();
@@ -293,13 +293,13 @@ int slsReceiverFunctionList::setFileIndex(int i){
 
 int slsReceiverFunctionList::setEnableFileWrite(int i){
 	if(i!=-1){
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 		eigerRxr->setEnableFileWrite(i);
 #else
 		enableFileWrite=i;
 #endif
 	}
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 		return  eigerRxr->getEnableFileWrite();
 #else
 	return enableFileWrite;
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h
index 0bfa645b6..ae6957134 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h
+++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h
@@ -57,7 +57,7 @@ public:
 	 */
 	void setEthernetInterface(char* c);
 
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 	/** set frame number if a positive number
 	 */
 	int32_t setNumberOfFrames(int32_t fnum);
@@ -326,7 +326,7 @@ private:
 
 
 
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 	eigerReceiver eigerRxr;
 #endif
 
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp b/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
index 383b5b14a..eade92aaf 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
@@ -1452,7 +1452,7 @@ cout<<"index[0]"<<index[0]<<" index[1]:"<<index[1]<<endl;
 		else{
 			if(index[0] == slsDetectorDefs::FRAME_PERIOD)
 				retval=slsReceiverList->setAcquisitionPeriod(index[1]);
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 			else
 				retval=slsReceiverList->setNumberOfFrames(index[1]);
 #endif
@@ -1462,7 +1462,7 @@ cout<<"index[0]"<<index[0]<<" index[1]:"<<index[1]<<endl;
 	if(ret!=FAIL){
 		if(index[0] == slsDetectorDefs::FRAME_PERIOD)
 			cout << "acquisition period:" << retval << endl;
-#ifdef EIGER_RECEIVER
+#ifdef EIGER_RECEIVER_H
 			cout << "frame number:" << retval << endl;
 #endif
 	}else