--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -67,9 +67,7 @@ fwts_SOURCES = main.c \
 	uefi/csm/csm.c \
 	uefi/uefidump/uefidump.c
 
-fwts_LDFLAGS = -ljson -lm
-
-fwts_LDADD = \
+fwts_LDADD = -ljson -lm \
 	-Llib/src -lfwts \
 	-L$(top_srcdir)/src/acpica -lfwtsacpica
 
--- src/acpica/Makefile.am.orig
+++ src/acpica/Makefile.am
@@ -34,7 +34,8 @@ BUILT_SOURCES = osunixxf_munged.c dsopco
 CLEANFILES = osunixxf_munged.c
 
 lib_LTLIBRARIES = libfwtsacpica.la
-libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0
+libfwtsacpica_la_LDFLAGS = -no-undefined -version-info 1:0:0
+libfwtsacpica_la_LIBADD = -lpthread
 libfwtsacpica_la_SOURCES = \
 	fwts_acpica.c \
 	osunixxf_munged.c \
--- src/acpica/source/compiler/Makefile.am.orig
+++ src/acpica/source/compiler/Makefile.am
@@ -48,7 +48,9 @@ BUILT_SOURCES = aslcompilerparse.c aslco
 #
 # Just export fwts specific API so we don't clash with core ACPICA library
 #
-libfwtsiasl_la_LDFLAGS = -export-symbols-regex "fwts_.*" -lpthread -version-info 1:0:0
+libfwtsiasl_la_LDFLAGS = -no-undefined -export-symbols-regex "fwts_.*" -version-info 1:0:0
+
+libfwtsiasl_la_LIBADD = -lpthread
 
 CLEANFILES = y.output y.tab.c y.tab.h aslcompiler.y.h \
 	aslcompilerparse.c aslcompilerlex.c \
--- src/lib/src/Makefile.am.orig
+++ src/lib/src/Makefile.am
@@ -5,9 +5,10 @@ AM_CPPFLAGS = \
 	-Wall
 
 lib_LTLIBRARIES = libfwts.la
-libfwts_la_LDFLAGS = -lpcre -lpthread -ljson -version-info 1:0:0 \
+libfwts_la_LDFLAGS = -no-undefined -version-info 1:0:0 \
 	-L$(top_srcdir)/src/acpica/source/compiler -lfwtsiasl
 
+libfwts_la_LIBADD = -lpcre -lpthread -ljson -lfwtsiasl
 libfwts_la_SOURCES = \
 	fwts_acpi.c \
 	fwts_acpid.c \