diff --git a/slsDetectorServers/eigerDetectorServer/Makefile b/slsDetectorServers/eigerDetectorServer/Makefile
index 88ec734f7..f81cbd82e 100755
--- a/slsDetectorServers/eigerDetectorServer/Makefile
+++ b/slsDetectorServers/eigerDetectorServer/Makefile
@@ -1,16 +1,18 @@
-CC			=	powerpc-4xx-softfloat-gcc
-BLACKFIN_CC = 	bfin-uclinux-gcc
-CFLAGS		+=  -Wall   -DEIGERD   -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE -DPCCOMPILE -DMARTIN
-LDLIBS		+= 	-lm  -lstdc++ 
+current_dir = $(shell pwd)
+main_server = ../slsDetectorServer/
+support_lib = ../../slsSupportLib/include/
 
+CROSS  		= powerpc-4xx-softfloat-
+BLACKFIN_CC = bfin-uclinux-gcc
+CC    		= $(CROSS)gcc
+CFLAGS		+=  -Wall -DEIGERD  -DSTOP_SERVER -I$(main_server) -I$(support_lib) -I$(current_dir)#-DVERBOSEI #-DVERBOSE 
+LDLIBS		+= 	-lm 
 PROGS		= 	eigerDetectorServer 
 DESTDIR		?= 	bin
 INSTMODE	= 	0777
 
-
-SRC_CLNT	=	communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c  slsDetectorFunctionList.c  HardwareIO.c LocalLinkInterface.c  FebInterface.c FebControl.c Beb.c 
-OBJS 		= 	$(SRC_CLNT:.c=.o) 
- 
+SRCS 		= 	$(main_server)communication_funcs.c $(main_server)slsDetectorServer.c $(main_server)slsDetectorServer_funcs.c  slsDetectorFunctionList.c HardwareIO.c LocalLinkInterface.c  FebInterface.c FebControl.c Beb.c 
+OBJS 		= 	$(SRCS:.c=.o) 
 
 all: clean versioning $(PROGS) #hv9m_blackfin_server 
 
@@ -26,16 +28,16 @@ versioning:
 $(PROGS):  $(OBJS)
 #	echo $(OBJS) 
 	mkdir -p $(DESTDIR) 
-	$(CC)  	-o $@  $(SRC_CLNT) $(CFLAGS) $(LDLIBS) 
+	$(CC)  	-o $@  $^ $(CFLAGS) $(LDLIBS) 
 	mv $(PROGS) $(DESTDIR)
 	
 
 hv9m_blackfin_server:9mhvserial_bf.c
 	$(BLACKFIN_CC) -o hv9m_blackfin_server 9mhvserial_bf.c -Wall #-DVERBOSE
 	mv hv9m_blackfin_server $(DESTDIR)	
-	rm hv9m_blackfin_server.gdb
+	rm hv9m_blackfin_server.gdb  $(main_server)*.o
 
 clean:
-	rm -rf $(DESTDIR)/$(PROGS)  *.o $(DESTDIR)/hv9m_blackfin_server 
+	rm -rf $(DESTDIR)/$(PROGS)  *.o $(DESTDIR)/hv9m_blackfin_server  $(main_server)*.o
 	
 	
diff --git a/slsDetectorServers/eigerDetectorServer/ansi.h b/slsDetectorServers/eigerDetectorServer/ansi.h
deleted file mode 120000
index 4a82d0575..000000000
--- a/slsDetectorServers/eigerDetectorServer/ansi.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsSupportLib/include/ansi.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
index b7aa41052..802dbd841 100755
Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ
diff --git a/slsDetectorServers/eigerDetectorServer/common.h b/slsDetectorServers/eigerDetectorServer/common.h
deleted file mode 120000
index 6776eb607..000000000
--- a/slsDetectorServers/eigerDetectorServer/common.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/common.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/communication_funcs.c b/slsDetectorServers/eigerDetectorServer/communication_funcs.c
deleted file mode 120000
index 30435fdc4..000000000
--- a/slsDetectorServers/eigerDetectorServer/communication_funcs.c
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/communication_funcs.c
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/communication_funcs.h b/slsDetectorServers/eigerDetectorServer/communication_funcs.h
deleted file mode 120000
index c0c144994..000000000
--- a/slsDetectorServers/eigerDetectorServer/communication_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/communication_funcs.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/communication_funcs_UDP.h b/slsDetectorServers/eigerDetectorServer/communication_funcs_UDP.h
deleted file mode 120000
index 0d434a97d..000000000
--- a/slsDetectorServers/eigerDetectorServer/communication_funcs_UDP.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/communication_funcs_UDP.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/logger.h b/slsDetectorServers/eigerDetectorServer/logger.h
deleted file mode 120000
index ff1930ce3..000000000
--- a/slsDetectorServers/eigerDetectorServer/logger.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/logger.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h
deleted file mode 120000
index 345b8c029..000000000
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorFunctionList.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer.c b/slsDetectorServers/eigerDetectorServer/slsDetectorServer.c
deleted file mode 120000
index a7eb59acb..000000000
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer.c
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorServer.c
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.c
deleted file mode 120000
index a7532ccd4..000000000
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.c
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorServer_funcs.c
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.h
deleted file mode 120000
index 7569daf47..000000000
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorServer_funcs.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/sls_detector_defs.h b/slsDetectorServers/eigerDetectorServer/sls_detector_defs.h
deleted file mode 120000
index 2af30d73a..000000000
--- a/slsDetectorServers/eigerDetectorServer/sls_detector_defs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsSupportLib/include/sls_detector_defs.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h b/slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h
deleted file mode 120000
index 3f48959a9..000000000
--- a/slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsSupportLib/include/sls_detector_funcs.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/versionAPI.h b/slsDetectorServers/eigerDetectorServer/versionAPI.h
deleted file mode 120000
index 5e580d8bb..000000000
--- a/slsDetectorServers/eigerDetectorServer/versionAPI.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsSupportLib/include/versionAPI.h
\ No newline at end of file
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index b88b5af91..c1c9c91c8 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -3,8 +3,8 @@
 #define APILIB 0x190723
 #define APIRECEIVER 0x190722
 #define APIGUI 0x190723
-#define APIEIGER 0x190816
 #define APIJUNGFRAU 0x190819
 #define APIGOTTHARD 0x190819
 #define APICTB 0x190819
 #define APIMOENCH 0x190819
+#define APIEIGER 0x190819