diff --git a/directory/c-sdk/ldap/clients/tools/Makefile.in b/directory/c-sdk/ldap/clients/tools/Makefile.in
index 5be4d38157a..20d161bf36c 100644
--- a/directory/c-sdk/ldap/clients/tools/Makefile.in
+++ b/directory/c-sdk/ldap/clients/tools/Makefile.in
@@ -204,7 +204,7 @@ PLATFORMLIBS = -ldld -lm -lpthread -lrt
 endif
 
 ifeq ($(OS_ARCH), AIX)
-PLATFORMLIBS=-ldl -brtl -lpthreads -lc_r -lm
+PLATFORMLIBS=-ldl -brtl -lpthreads -lc_r -lm -liconv
 endif
 
 ifeq ($(OS_ARCH), Darwin)
diff --git a/directory/c-sdk/ldap/libraries/libldap/Makefile.in b/directory/c-sdk/ldap/libraries/libldap/Makefile.in
index d617b800d7c..538f28f4f2f 100644
--- a/directory/c-sdk/ldap/libraries/libldap/Makefile.in
+++ b/directory/c-sdk/ldap/libraries/libldap/Makefile.in
@@ -203,19 +203,18 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) -lc
 endif
 
 ifeq ($(OS_ARCH), Linux)
-EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(SASL_LINK)
+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
 endif
 
 ifeq ($(OS_ARCH), WINNT)
 ifdef NS_USE_GCC
-EXTRA_DLL_LIBS=-L$(dist_libdir) -l$(LBER_LIBNAME) $(SASL_LINK)
+EXTRA_DLL_LIBS=-L$(dist_libdir) -l$(LBER_LIBNAME)
 else
 EXTRA_LIBS =wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib \
             comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
             rpcrt4.lib uuid.lib winmm.lib
 EXTRA_LIBS += $(dist_libdir)/$(LDIF_LIBNAME).lib
 EXTRA_LIBS += $(dist_libdir)/$(LBER_LIBNAME).lib
-EXTRA_LIBS += $(SASL_LINK)
 endif
 endif
 
@@ -268,6 +267,10 @@ ifeq ($(OS_ARCH), OpenBSD)
 EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
 endif
 
+ifeq ($(HAVE_SASL), 1)
+EXTRA_LIBS += $(SASL_LINK)
+endif
+
 ###########################################################################
 
 ifeq ($(USE_DLL_EXPORTS_FILE), 1)
diff --git a/directory/c-sdk/ldap/libraries/libldif/Makefile.in b/directory/c-sdk/ldap/libraries/libldif/Makefile.in
index ac7a25bd228..854a4421afc 100644
--- a/directory/c-sdk/ldap/libraries/libldif/Makefile.in
+++ b/directory/c-sdk/ldap/libraries/libldif/Makefile.in
@@ -70,6 +70,10 @@ PLATFORMLIBS	=
 THREADS		=
 THREADSLIB	=
 
+ifeq ($(OS_ARCH), AIX)
+PLATFORMLIBS	+= -ldl -brtl -lpthreads -lc_r -lm
+endif
+
 #
 # shared library symbol export definitions
 #
@@ -144,7 +148,7 @@ ifdef SO_FILES_TO_REMOVE
 	-$(RM) $(SO_FILES_TO_REMOVE)
 endif
 
-	$(LINK_DLL) $(LDIF_EXPORT_FLAGS) $(EXTRA_LIBS)
+	$(LINK_DLL) $(LDIF_EXPORT_FLAGS) $(PLATFORMLIBS) $(EXTRA_LIBS)
 
 
 veryclean:: clean