diff --git a/nfq2/Makefile b/nfq2/Makefile
index 96382de..b10be38 100644
--- a/nfq2/Makefile
+++ b/nfq2/Makefile
@@ -1,7 +1,7 @@
 CC ?= cc
 PKG_CONFIG ?= pkg-config
 OPTIMIZE ?= -Os
-CFLAGS += -std=gnu99 $(OPTIMIZE) -flto=auto
+CFLAGS += -std=gnu99 $(OPTIMIZE) -flto=auto -Wl,--gc-sections
 CFLAGS_LINUX = -Wno-alloc-size-larger-than
 CFLAGS_SYSTEMD = -DUSE_SYSTEMD
 CFLAGS_BSD = -Wno-address-of-packed-member
diff --git a/nfq2/crypto/hmac.c b/nfq2/crypto/hmac.c
index f6f218b..6995da4 100644
--- a/nfq2/crypto/hmac.c
+++ b/nfq2/crypto/hmac.c
@@ -102,9 +102,8 @@ int hmacReset(HMACContext *context, enum SHAversion whichSha,
 	 */
 	if (key_len > blocksize) {
 		USHAContext tcontext;
-		if (ret=USHAReset(&tcontext, whichSha)) return ret;
-		if (ret=USHAInput(&tcontext, key, key_len)) return ret;
-		if (ret=USHAResult(&tcontext, tempkey)) return ret;
+		if ((ret=USHAReset(&tcontext, whichSha)) || (ret=USHAInput(&tcontext, key, key_len)) || (ret=USHAResult(&tcontext, tempkey)))
+			return ret;
 
 		key = tempkey;
 		key_len = hashsize;
diff --git a/nfq2/sec.c b/nfq2/sec.c
index bd2df92..d3cfee9 100644
--- a/nfq2/sec.c
+++ b/nfq2/sec.c
@@ -6,6 +6,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <grp.h>
+#include <errno.h>
 
 #include "params.h"
 
@@ -18,7 +19,6 @@
 // __X32_SYSCALL_BIT defined in linux/unistd.h
 #include <linux/unistd.h>
 #include <syscall.h>
-#include <errno.h>
 
 /************ SECCOMP ************/