diff --git a/src/conio/Common.gmake b/src/conio/Common.gmake
index 46d1c93c309300af889ec891e30c68900ce634b8..37912634e78b675ea9bca88f9058449bb64e01d2 100644
--- a/src/conio/Common.gmake
+++ b/src/conio/Common.gmake
@@ -1,5 +1,5 @@
-CIOLIB-MT_LIBS		+=	-lncurses
+CIOLIB-MT_LIBS		+=	$(UL_PRE)ncurses$(UL_SUF)
 #ifndef NO_X
- CIOLIB-MT_LIBS		+=  -lX11
+ CIOLIB-MT_LIBS		+=  $(UL_PRE)X11$(UL_SUF)
  CIOLIB-MT_LDFLAGS	+=	-L/usr/X11R6/lib
 #endif
diff --git a/src/conio/Common.make b/src/conio/Common.make
index 488b3621da26169686562e7ff8f7f26add29daeb..9ce1653e2f728f2c044ac4f62b8becca80953a21 100644
--- a/src/conio/Common.make
+++ b/src/conio/Common.make
@@ -2,4 +2,4 @@ CIOLIB-MT	=	$(CIOLIB_SRC)$(DIRSEP)$(LIBODIR)$(DIRSEP)$(LIBPREFIX)ciolib_mt$(LIBF
 
 CIOLIB-MT_CFLAGS	=	-I$(CIOLIB_SRC)
 CIOLIB-MT_LDFLAGS	=	-L$(CIOLIB_SRC)$(DIRSEP)$(LIBODIR)
-CIOLIB-MT_LIBS		=	-lciolib_mt
+CIOLIB-MT_LIBS		=	$(UL_PRE)ciolib_mt$(UL_SUF)
diff --git a/src/smblib/Common.make b/src/smblib/Common.make
index 3543ecec6b0e2dfdf2c50c818260373cddcbbbbd..55c46eb277e81da98d61bf6d16918cd8947a6949 100644
--- a/src/smblib/Common.make
+++ b/src/smblib/Common.make
@@ -2,4 +2,4 @@ SMBLIB	=	$(SMBLIB_SRC)$(DIRSEP)$(LIBODIR)$(DIRSEP)$(LIBPREFIX)smb$(LIBFILE)
 
 SMBLIB_CFLAGS	=	-I$(SMBLIB_SRC)
 SMBLIB_LDFLAGS	=	-L$(SMBLIB_SRC)$(DIRSEP)$(LIBODIR)
-SMBLIB_LIBS	=	-lsmb
+SMBLIB_LIBS	=	$(UL_PRE)smb$(UL_SUF)
diff --git a/src/uifc/Common.make b/src/uifc/Common.make
index 99905718cbe035945a5b46c1e1c2cdaa37f9f932..e99eacc28643b6e9ce6cf972216b1c03976e376f 100644
--- a/src/uifc/Common.make
+++ b/src/uifc/Common.make
@@ -5,5 +5,5 @@ UIFC_CFLAGS   =       -I$(UIFC_SRC)
 UIFC_LDFLAGS  =       -L$(UIFC_SRC)$(DIRSEP)$(LIBODIR)
 UIFC-MT_CFLAGS   =       -I$(UIFC_SRC)
 UIFC-MT_LDFLAGS  =       -L$(UIFC_SRC)$(DIRSEP)$(LIBODIR)
-UIFC_LIBS	=	-luifc
-UIFC-MT_LIBS	=	-luifc_mt
+UIFC_LIBS	=	$(UL_PRE)uifc$(UL_SUF)
+UIFC-MT_LIBS	=	$(UL_PRE)uifc_mt$(UL_SUF)