diff --git a/afl_transforms/SConscript b/afl_transforms/SConscript
index 456e2ac41fe573773c30439fc8f1aca359ac4cc8..6d2b16becae3add613347f79ac97f9cee0b8eaa9 100644
--- a/afl_transforms/SConscript
+++ b/afl_transforms/SConscript
@@ -7,12 +7,10 @@ Import('env')
 (sysname, nodename, release, version, machine)=os.uname()
 
 env.Append(CXXFLAGS=" -Wall -Werror")
+env.Append(LINKFLAGS=" -Wall -Werror -Wl,-unresolved-symbols=ignore-in-shared-libs ")
 
-env['BASE_IRDB_LIBS']="IRDB-core", "pqxx", "pq", "EXEIO", "ElfDep"
+env['BASE_IRDB_LIBS']="irdb-core"
 
-if sysname != "SunOS":
-	# setup libraries needed for linking
-	env['BASE_IRDB_LIBS']="IRDB-core", "pqxx", "pq", "EXEIO", "pebliss", "ElfDep", "capstone"
 
 # pebliss requires iconv, which needs to be explicit on cygwin.
 if "CYGWIN" in sysname:
diff --git a/afl_transforms/tools/constant_decompose/SConscript b/afl_transforms/tools/constant_decompose/SConscript
index 59239d753e10d66fcfed2118063cd774384fc24e..326818e27c95dd559f06b4e801a457a7627631b2 100644
--- a/afl_transforms/tools/constant_decompose/SConscript
+++ b/afl_transforms/tools/constant_decompose/SConscript
@@ -22,7 +22,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
 pgm="constant_decompose.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("stars "+ env.subst('$BASE_IRDB_LIBS')+ "  IRDB-cfg IRDB-util transform MEDSannotation jsoncpp ") 
+LIBS=Split("stars "+ env.subst('$BASE_IRDB_LIBS')+ "  irdb-cfg irdb-util irdb-transform MEDSannotation jsoncpp ") 
 myenv=myenv.Clone(CPPPATH=Split(cpppath))
 myenv.Append(CXXFLAGS = " -std=c++11 -Wall -g ")
 pgm=myenv.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)