--- Setup/Unix/Makefile.display.in.link	2011-09-20 16:13:21.000000000 +0200
+++ Setup/Unix/Makefile.display.in	2011-09-20 16:14:24.000000000 +0200
@@ -114,7 +114,7 @@
 
 # $(OBJF_DISP_X11) $(OBJF_DISP_FBDEV)
 
-LINK_DISP = -L Libs -lclanCore @x_libraries@ -lHermes @directfb_libs@
+LINK_DISP = -L Libs -lclanCore -lclanApp @x_libraries@ -lHermes @directfb_libs@
 
 Libs/libclanDisplay.so: Libs/libclanCore.so $(OBJF_DISP_ALL)
 	@echo "Building Libs/libclanDisplay.so"
--- Setup/Unix/Makefile.gl.in.link	2011-09-20 16:14:42.000000000 +0200
+++ Setup/Unix/Makefile.gl.in	2011-09-20 16:15:20.000000000 +0200
@@ -25,7 +25,7 @@
 
 Libs/libclanGL.so: Libs/libclanCore.so $(OBJF_LIB_GL)
 	@echo "Building Libs/libclanGL.so"
-	@$(LINK_COMMAND) -Wl,-soname=libclanGL.so.$(D_VERSION_MAJOR) -o Libs/libclanGL.so.$(D_VERSION_MINOR) $(OBJF_LIB_GL) -L Libs -lclanDisplay -lGL -lGLU @x_libraries@  
+	@$(LINK_COMMAND) -Wl,-soname=libclanGL.so.$(D_VERSION_MAJOR) -o Libs/libclanGL.so.$(D_VERSION_MINOR) $(OBJF_LIB_GL) -L Libs -lclanDisplay -lclanApp -lclanCore -lHermes -lGL -lGLU @x_libraries@  
 	@ln -s -f libclanGL.so.$(D_VERSION_MINOR) Libs/libclanGL.so.$(D_VERSION_MAJOR)
 	@ln -s -f libclanGL.so.$(D_VERSION_MAJOR) Libs/libclanGL.so
 
--- Setup/Unix/Makefile.gui.in.link	2011-09-20 16:27:11.000000000 +0200
+++ Setup/Unix/Makefile.gui.in	2011-09-20 16:28:36.000000000 +0200
@@ -84,7 +84,7 @@
 
 Libs/libclanGUI.so: Libs/libclanCore.so $(OBJF_LIB_GUI)
 	@echo "Building Libs/libclanGUI.so"
-	@$(LINK_COMMAND) -Wl,-soname=libclanGUI.so.$(D_VERSION_MAJOR) -o Libs/libclanGUI.so.$(D_VERSION_MINOR) $(OBJF_LIB_GUI) -L Libs -lclanCore
+	@$(LINK_COMMAND) -Wl,-soname=libclanGUI.so.$(D_VERSION_MAJOR) -o Libs/libclanGUI.so.$(D_VERSION_MINOR) $(OBJF_LIB_GUI) -L Libs -lclanCore -lclanDisplay
 	@ln -s -f libclanGUI.so.$(D_VERSION_MINOR) Libs/libclanGUI.so.$(D_VERSION_MAJOR)
 	@ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) Libs/libclanGUI.so	
 
--- Setup/Unix/Makefile.jpeg.in.link	2011-09-20 16:27:37.000000000 +0200
+++ Setup/Unix/Makefile.jpeg.in	2011-09-20 16:29:31.000000000 +0200
@@ -21,7 +21,7 @@
 
 Libs/libclanJPEG.so: Libs/libclanCore.so $(OBJF_LIB_JPEG)
 	@echo "Building Libs/libclanJPEG.so"
-	@$(LINK_COMMAND) -Wl,-soname=libclanJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_JPEG) -L Libs -lclanCore -ljpeg
+	@$(LINK_COMMAND) -Wl,-soname=libclanJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_JPEG) -L Libs -lclanCore -lclanDisplay -ljpeg
 	@ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) Libs/libclanJPEG.so.$(D_VERSION_MAJOR)
 	@ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) Libs/libclanJPEG.so
 
--- Setup/Unix/Makefile.mikmod.in.link	2011-09-20 16:27:17.000000000 +0200
+++ Setup/Unix/Makefile.mikmod.in	2011-09-20 16:30:10.000000000 +0200
@@ -22,7 +22,7 @@
 
 Libs/libclanMikMod.so: Libs/libclanCore.so $(OBJF_LIB_MIKMOD)
 	@echo "Building Libs/libclanMikMod.so"
-	@$(LINK_COMMAND) -Wl,-soname=libclanMikMod.so.$(D_VERSION_MAJOR) -o Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(OBJF_LIB_MIKMOD) -L Libs -lclanCore -lmikmod
+	@$(LINK_COMMAND) -Wl,-soname=libclanMikMod.so.$(D_VERSION_MAJOR) -o Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(OBJF_LIB_MIKMOD) -L Libs -lclanSound -lclanCore -lmikmod
 	@ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) Libs/libclanMikMod.so.$(D_VERSION_MAJOR)
 	@ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) Libs/libclanMikMod.so
 
--- Setup/Unix/Makefile.png.in.link	2011-09-20 16:27:27.000000000 +0200
+++ Setup/Unix/Makefile.png.in	2011-09-20 16:29:00.000000000 +0200
@@ -20,7 +20,7 @@
 
 Libs/libclanPNG.so: Libs/libclanCore.so $(OBJF_LIB_PNG)
 	@echo "Building Libs/libclanPNG.so"
-	@$(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lpng
+	@$(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lclanDisplay -lpng
 	@ln -s -f libclanPNG.so.$(D_VERSION_MINOR) Libs/libclanPNG.so.$(D_VERSION_MAJOR)
 	@ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) Libs/libclanPNG.so
 
--- Setup/Unix/Makefile.ttf.in.link	2011-09-20 16:27:47.000000000 +0200
+++ Setup/Unix/Makefile.ttf.in	2011-09-20 16:28:11.000000000 +0200
@@ -22,7 +22,7 @@
 
 Libs/libclanTTF.so: Libs/libclanCore.so $(OBJF_LIB_TTF)
 	@echo "Building Libs/libclanTTF.so"
-	@$(LINK_COMMAND) -Wl,-soname=libclanTTF.so.$(D_VERSION_MAJOR) -o Libs/libclanTTF.so.$(D_VERSION_MINOR) $(OBJF_LIB_TTF) -L Libs -lclanCore -lfreetype
+	@$(LINK_COMMAND) -Wl,-soname=libclanTTF.so.$(D_VERSION_MAJOR) -o Libs/libclanTTF.so.$(D_VERSION_MINOR) $(OBJF_LIB_TTF) -L Libs -lclanCore -lclanDisplay -lfreetype
 	@ln -s -f libclanTTF.so.$(D_VERSION_MINOR) Libs/libclanTTF.so.$(D_VERSION_MAJOR)
 	@ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) Libs/libclanTTF.so
 
--- Setup/Unix/Makefile.vorbis.in.link	2011-09-20 16:54:39.000000000 +0200
+++ Setup/Unix/Makefile.vorbis.in	2011-09-20 16:54:55.000000000 +0200
@@ -20,7 +20,7 @@
 
 Libs/libclanVorbis.so: Libs/libclanCore.so $(OBJF_LIB_VORBIS)
 	@echo "Building Libs/libclanVorbis.so"
-	@$(LINK_COMMAND) -Wl,-soname=libclanVorbis.so.$(D_VERSION_MAJOR) -o Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(OBJF_LIB_VORBIS) -L Libs -lclanCore -lvorbis
+	@$(LINK_COMMAND) -Wl,-soname=libclanVorbis.so.$(D_VERSION_MAJOR) -o Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(OBJF_LIB_VORBIS) -L Libs -lclanCore -lvorbis -logg
 	@ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) Libs/libclanVorbis.so.$(D_VERSION_MAJOR)
 	@ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) Libs/libclanVorbis.so