diff --git a/slsDetectorServers/gotthardDetectorServer/AD9252.h b/slsDetectorServers/gotthardDetectorServer/AD9252.h
deleted file mode 120000
index 2ab1ed191..000000000
--- a/slsDetectorServers/gotthardDetectorServer/AD9252.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/AD9252.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/AD9257.h b/slsDetectorServers/gotthardDetectorServer/AD9257.h
deleted file mode 120000
index 87b70e097..000000000
--- a/slsDetectorServers/gotthardDetectorServer/AD9257.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/AD9257.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/LTC2620.h b/slsDetectorServers/gotthardDetectorServer/LTC2620.h
deleted file mode 120000
index 13157cb8b..000000000
--- a/slsDetectorServers/gotthardDetectorServer/LTC2620.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/LTC2620.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/Makefile b/slsDetectorServers/gotthardDetectorServer/Makefile
index 9d606f0c6..81f23deb3 100755
--- a/slsDetectorServers/gotthardDetectorServer/Makefile
+++ b/slsDetectorServers/gotthardDetectorServer/Makefile
@@ -1,14 +1,17 @@
-CROSS  		= 	bfin-uclinux-
-CC    		= 	$(CROSS)gcc
-CFLAGS 		+=	-Wall  -DGOTTHARDD  -DSTOP_SERVER  # -DVERBOSE 
-LDLIBS		+= 	-lm  -lstdc++ 
+current_dir = $(shell pwd)
+main_server = ../slsDetectorServer/
+support_lib = ../../slsSupportLib/include/
 
+CROSS  		= bfin-uclinux-
+CC    		= $(CROSS)gcc
+CFLAGS		+=  -Wall -DGOTTHARDD  -DSTOP_SERVER -I$(main_server) -I$(support_lib) -I$(current_dir)#-DVERBOSEI #-DVERBOSE 
+LDLIBS		+= 	-lm  
 PROGS		= 	gotthardDetectorServer 
 DESTDIR		?= 	bin
 INSTMODE	= 	0777
 
-SRCS 		= 	communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c  slsDetectorFunctionList.c 
-OBJS 		= 	$(SRCS:%.c=%.o)
+SRCS 		= 	$(main_server)communication_funcs.c $(main_server)slsDetectorServer.c $(main_server)slsDetectorServer_funcs.c  slsDetectorFunctionList.c 
+OBJS 		= 	$(SRCS:.c=.o) 
 
 
 all: clean versioning $(PROGS) 
@@ -29,7 +32,7 @@ $(PROGS): $(OBJS)
 	rm *.gdb
 
 clean:
-	rm -rf $(DESTDIR)/$(PROGS) *.o *.gdb
+	rm -rf $(DESTDIR)/$(PROGS) *.o *.gdb $(main_server)*.o
 
 
 
diff --git a/slsDetectorServers/gotthardDetectorServer/ansi.h b/slsDetectorServers/gotthardDetectorServer/ansi.h
deleted file mode 120000
index 4a82d0575..000000000
--- a/slsDetectorServers/gotthardDetectorServer/ansi.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsSupportLib/include/ansi.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
index 42cfebe09..70f74637b 100755
Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ
diff --git a/slsDetectorServers/gotthardDetectorServer/blackfin.h b/slsDetectorServers/gotthardDetectorServer/blackfin.h
deleted file mode 120000
index 2873c7dc6..000000000
--- a/slsDetectorServers/gotthardDetectorServer/blackfin.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/blackfin.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/common.h b/slsDetectorServers/gotthardDetectorServer/common.h
deleted file mode 120000
index 6776eb607..000000000
--- a/slsDetectorServers/gotthardDetectorServer/common.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/common.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h b/slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h
deleted file mode 120000
index 33bdd8d53..000000000
--- a/slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/commonServerFunctions.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/communication_funcs.c b/slsDetectorServers/gotthardDetectorServer/communication_funcs.c
deleted file mode 120000
index 30435fdc4..000000000
--- a/slsDetectorServers/gotthardDetectorServer/communication_funcs.c
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/communication_funcs.c
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/communication_funcs.h b/slsDetectorServers/gotthardDetectorServer/communication_funcs.h
deleted file mode 120000
index c0c144994..000000000
--- a/slsDetectorServers/gotthardDetectorServer/communication_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/communication_funcs.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/logger.h b/slsDetectorServers/gotthardDetectorServer/logger.h
deleted file mode 120000
index ff1930ce3..000000000
--- a/slsDetectorServers/gotthardDetectorServer/logger.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/logger.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.h
deleted file mode 120000
index 345b8c029..000000000
--- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorFunctionList.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer.c
deleted file mode 120000
index a7eb59acb..000000000
--- a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer.c
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorServer.c
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_funcs.c
deleted file mode 120000
index a7532ccd4..000000000
--- a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_funcs.c
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorServer_funcs.c
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_funcs.h
deleted file mode 120000
index 7569daf47..000000000
--- a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorServer_funcs.h
\ No newline at end of file
diff --git a/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h b/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h
deleted file mode 120000
index 2af30d73a..000000000
--- a/slsDetectorServers/gotthardDetectorServer/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/gotthardDetectorServer/sls_detector_funcs.h b/slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h
deleted file mode 120000
index 3f48959a9..000000000
--- a/slsDetectorServers/gotthardDetectorServer/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/gotthardDetectorServer/versionAPI.h b/slsDetectorServers/gotthardDetectorServer/versionAPI.h
deleted file mode 120000
index 5e580d8bb..000000000
--- a/slsDetectorServers/gotthardDetectorServer/versionAPI.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsSupportLib/include/versionAPI.h
\ No newline at end of file
diff --git a/slsDetectorServers/jungfrauDetectorServer/Makefile b/slsDetectorServers/jungfrauDetectorServer/Makefile
index e9f4db5c4..c2b2ad18e 100755
--- a/slsDetectorServers/jungfrauDetectorServer/Makefile
+++ b/slsDetectorServers/jungfrauDetectorServer/Makefile
@@ -10,8 +10,8 @@ PROGS		= 	jungfrauDetectorServer
 DESTDIR		?= 	bin
 INSTMODE	= 	0777
 
-SRC_CLNT	=	$(main_server)communication_funcs.c $(main_server)slsDetectorServer.c $(main_server)slsDetectorServer_funcs.c  slsDetectorFunctionList.c 
-OBJS 		= 	$(SRC_CLNT:.c=.o) 
+SRCS	=	$(main_server)communication_funcs.c $(main_server)slsDetectorServer.c $(main_server)slsDetectorServer_funcs.c  slsDetectorFunctionList.c 
+OBJS 	= 	$(SRCS:.c=.o) 
  
 all: clean versioning $(PROGS)
 
@@ -31,7 +31,7 @@ $(PROGS): $(OBJS)
 	rm *.gdb
 
 clean:
-	rm -rf $(DESTDIR)/$(PROGS)  *.o *.gdb
+	rm -rf $(DESTDIR)/$(PROGS)  *.o *.gdb $(main_server)*.o
 	
 
 	
\ No newline at end of file
diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index 9cbf3a8b0..3f3b9d796 100755
Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index fb289063e..20bff5287 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -4,7 +4,7 @@
 #define APILIB 0x190723
 #define APIRECEIVER 0x190722
 #define APIGUI 0x190723
-#define APIGOTTHARD 0x190816
 #define APIMOENCH 0x190816
 #define APIEIGER 0x190816
 #define APIJUNGFRAU 0x190819
+#define APIGOTTHARD 0x190819