--- a/application/bc.mak	Tue Sep 23 17:02:53 2014 +0100
+++ b/application/bc.mak	Fri Sep 26 09:41:15 2014 +0100
@@ -76,11 +76,11 @@
  libstx_libview.dll \
  libstx_libui.dll \
  libstx_libview2.dll \
- libstx_goodies_sunit.dll \
  libstx_libwidg.dll \
- libjv_libgdbs.dll \
+ libstx_goodies_magritte.dll \
  libstx_libhtml.dll \
  libstx_libwidg2.dll \
+ libjv_libgdbs.dll \
  libstx_libwidg3.dll \
  libstx_libtool.dll \
  libstx_libtool2.dll \
@@ -319,23 +319,17 @@
 ..\..\..\stx\libview2\$(OBJDIR)\libstx_libview2.dll: $(FORCE)
 	pushd ..\..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_goodies_sunit.dll: ..\..\..\stx\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll
-	copy ..\..\..\stx\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll *.*
-
-..\..\..\stx\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll: $(FORCE)
-	pushd ..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
 libstx_libwidg.dll: ..\..\..\stx\libwidg\$(OBJDIR)\libstx_libwidg.dll
 	copy ..\..\..\stx\libwidg\$(OBJDIR)\libstx_libwidg.dll *.*
 
 ..\..\..\stx\libwidg\$(OBJDIR)\libstx_libwidg.dll: $(FORCE)
 	pushd ..\..\..\stx\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libjv_libgdbs.dll: ..\..\libgdbs\$(OBJDIR)\libjv_libgdbs.dll
-	copy ..\..\libgdbs\$(OBJDIR)\libjv_libgdbs.dll *.*
+libstx_goodies_magritte.dll: ..\..\..\stx\goodies\magritte\$(OBJDIR)\libstx_goodies_magritte.dll
+	copy ..\..\..\stx\goodies\magritte\$(OBJDIR)\libstx_goodies_magritte.dll *.*
 
-..\..\libgdbs\$(OBJDIR)\libjv_libgdbs.dll: $(FORCE)
-	pushd ..\..\libgdbs & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\..\stx\goodies\magritte\$(OBJDIR)\libstx_goodies_magritte.dll: $(FORCE)
+	pushd ..\..\..\stx\goodies\magritte & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 libstx_libhtml.dll: ..\..\..\stx\libhtml\$(OBJDIR)\libstx_libhtml.dll
 	copy ..\..\..\stx\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
@@ -349,6 +343,12 @@
 ..\..\..\stx\libwidg2\$(OBJDIR)\libstx_libwidg2.dll: $(FORCE)
 	pushd ..\..\..\stx\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
+libjv_libgdbs.dll: ..\..\libgdbs\$(OBJDIR)\libjv_libgdbs.dll
+	copy ..\..\libgdbs\$(OBJDIR)\libjv_libgdbs.dll *.*
+
+..\..\libgdbs\$(OBJDIR)\libjv_libgdbs.dll: $(FORCE)
+	pushd ..\..\libgdbs & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
 libstx_libwidg3.dll: ..\..\..\stx\libwidg3\$(OBJDIR)\libstx_libwidg3.dll
 	copy ..\..\..\stx\libwidg3\$(OBJDIR)\libstx_libwidg3.dll *.*