--- api/avahi/src/Makefile.orig	2019-07-04 00:09:45.000000000 -0600
+++ api/avahi/src/Makefile	2019-11-20 13:24:09.075756935 -0700
@@ -47,11 +47,15 @@ CEFLAGS		=
 
 # Additional pthread lib for C
 ifeq "$(AVAHILIBS) " " "
-EXTRALIBS	= 
+EXTRALIBS	= $(PTHREADLIBS)
 else
-EXTRALIBS	= $(AVAHILIBS)
+EXTRALIBS	= $(AVAHILIBS) $(PTHREADLIBS)
 endif
 
+EXTRALIBS_S     = -lbigloopthread_s-$(RELEASE)
+EXTRALIBS_U     = -lbigloopthread_u-$(RELEASE)
+
+
 DISTRIB_FILES	= $(C_SRC_DIR)/bglavahi.h
 
 #*---------------------------------------------------------------------*/
--- api/mpg123/src/Makefile.orig	2019-07-04 00:09:45.000000000 -0600
+++ api/mpg123/src/Makefile	2019-11-20 13:22:17.084569700 -0700
@@ -52,11 +52,11 @@ EXTRALIBS	=
 else
 ifeq "$(ALSALIBS) " " "
 else
-EXTRALIBS	+= $(MPG123LIBS) $(ALSALIBS) -lbigloomultimedia_u-$(RELEASE) -lbiglooalsa_u-$(RELEASE)
+EXTRALIBS	+= -lbigloomultimedia_u-$(RELEASE) -lbiglooalsa_u-$(RELEASE) $(MPG123LIBS) $(ALSALIBS)
 endif
 ifeq "$(PULSEAUDIOLIBS) " " "
 else
-EXTRALIBS	+= $(MPG123LIBS) $(PULSEAUDIOLIBS) -lbigloomultimedia_u-$(RELEASE) -lbigloopulseaudio_u-$(RELEASE)
+EXTRALIBS	+= -lbigloomultimedia_u-$(RELEASE) -lbigloopulseaudio_u-$(RELEASE) $(MPG123LIBS) $(PULSEAUDIOLIBS)
 endif
 endif
 
--- api/pkglib/src/Makefile.orig	2019-07-04 00:09:45.000000000 -0600
+++ api/pkglib/src/Makefile	2019-11-20 13:20:12.573585115 -0700
@@ -45,8 +45,8 @@ SPIFLAGS	=
 BMISCFLAGS	= -I Llib
 
 # Extra libs
-EXTRALIBS_S	= -lbigloosqlite_s-$(RELEASE)
-EXTRALIBS_U	= -lbigloosqlite_u-$(RELEASE)
+EXTRALIBS_S	= -lbigloosqlite_s-$(RELEASE) $(SQLITELIBS)
+EXTRALIBS_U	= -lbigloosqlite_u-$(RELEASE) $(SQLITELIBS)
 
 #*---------------------------------------------------------------------*/
 #*    Scheme extended objects                                          */
--- api/pulseaudio/src/Makefile.orig	2019-07-04 00:09:45.000000000 -0600
+++ api/pulseaudio/src/Makefile	2019-11-20 13:26:14.914720023 -0700
@@ -53,6 +53,10 @@ else
 EXTRALIBS	= $(PULSEAUDIOLIBS)
 endif
 
+EXTRALIBS_S     = -lbigloomultimedia_s-$(RELEASE)
+EXTRALIBS_U     = -lbigloomultimedia_u-$(RELEASE)
+
+
 #*---------------------------------------------------------------------*/
 #*    Scheme extended objects                                          */
 #*---------------------------------------------------------------------*/
--- api/wav/src/Makefile.orig	2019-07-04 00:09:45.000000000 -0600
+++ api/wav/src/Makefile	2019-11-20 13:21:03.173766069 -0700
@@ -47,12 +47,12 @@ BHEAPFLAGS	= -unsafe -q -mkaddheap -mkad
 CEFLAGS		= $(WAVCFLAGS)
 
 # Additional libraries
-EXTRALIBS	= $(WAVLIBS) -lbigloomultimedia_u-$(RELEASE)
+EXTRALIBS	= -lbigloomultimedia_u-$(RELEASE) $(WAVLIBS)
 ifneq "$(ALSALIBS) " " "
-EXTRALIBS	+= $(ALSALIBS) -lbiglooalsa_u-$(RELEASE)
+EXTRALIBS	+= -lbiglooalsa_u-$(RELEASE) $(ALSALIBS)
 endif
 ifneq "$(PULSEAUDIOLIBS) " " "
-EXTRALIBS	+= $(PULSEAUDIOLIBS) -lbigloopulseaudio_u-$(RELEASE)
+EXTRALIBS	+= -lbigloopulseaudio_u-$(RELEASE) $(PULSEAUDIOLIBS)
 endif
 
 #*---------------------------------------------------------------------*/
--- Makefile.misc.orig	2019-07-04 00:09:45.000000000 -0600
+++ Makefile.misc	2019-11-20 11:59:44.139796140 -0700
@@ -89,8 +89,8 @@ shared-install-name:
                  $(OBJECTS) \
                  $(GCSTDOBJECTS) \
                  $(LDFLAGS) $(EXTRA_LD_OPT) \
-                 $(EXTRALIBS) $(CLOSELIBS) \
-                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) && \
+                 $(CLOSELIBS) \
+                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) $(EXTRALIBS) && \
          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
            mv $(notdir $(LIBDEST)) $(LIBDEST); \
          fi
@@ -102,8 +102,8 @@ MS-CARE-shared-install-name:
                  $(OBJECTS) \
                  $(GCSTDOBJECTS) \
                  $(LDFLAGS) $(EXTRA_LD_OPT) \
-                 $(EXTRALIBS) $(CLOSELIBS) \
-                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) && \
+                 $(CLOSELIBS) \
+                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) $(EXTRALIBS) && \
          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
            mv $(notdir $(LIBDEST)) $(LIBDEST); \
          fi
@@ -113,9 +113,9 @@ shared-sans-soname:
                  $(LDRPATH) \
                  $(OBJECTS) \
                  $(GCSTDOBJECTS) \
-                 $(LDFLAGS) \
-                 $(EXTRALIBS) $(CLOSELIBS) \
-                 $(LDLIBS) $(LDOPTS) $(EXTRA_LD_OPT) $(LDEXTRA) && \
+                 $(LDFLAGS) $(EXTRA_LD_OPT) \
+                 $(CLOSELIBS) \
+                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) $(EXTRALIBS) && \
          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
            mv $(notdir $(LIBDEST)) $(LIBDEST); \
          fi
@@ -127,8 +127,8 @@ shared-soname:
                  $(OBJECTS) \
                  $(GCSTDOBJECTS) \
                  $(LDOPTS) $(EXTRA_LD_OPT) \
-                 $(EXTRALIBS) $(CLOSELIBS) \
-                 $(LDLIBS) $(LDFLAGS) $(LDEXTRA) && \
+                 $(CLOSELIBS) \
+                 $(LDLIBS) $(LDFLAGS) $(LDEXTRA) $(EXTRALIBS) && \
          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
            mv $(notdir $(LIBDEST)) $(LIBDEST); \
          fi