diff --git a/src/main/c/Linux/LinuxHelperFunctions.c b/src/main/c/Linux/LinuxHelperFunctions.c
index 30b49ed..d4a80a9 100644
--- a/src/main/c/Linux/LinuxHelperFunctions.c
+++ b/src/main/c/Linux/LinuxHelperFunctions.c
@@ -2,7 +2,7 @@
  * LinuxHelperFunctions.c
  *
  *       Created on:  Mar 10, 2015
- *  Last Updated on:  Aug 02, 2018
+ *  Last Updated on:  Aug 10, 2018
  *           Author:  Will Hedgecock
  *
  * Copyright (C) 2012-2018 Fazecast, Inc.
@@ -36,16 +36,8 @@
 #include <unistd.h>
 #include "LinuxHelperFunctions.h"
 
-// Remove reliance on newer glibc features
-extern int ioctl(int __fd, unsigned long int __request, ...) __THROW;
-void __chk_fail (void) __attribute__((__noreturn__));
-long int __fdelt_warn(long int a)
-{
-        if (a >= FD_SETSIZE)
-                __chk_fail();
-        return a / __NFDBITS;
-}
-long int __fdelt_chk(long int) __attribute__((weak, alias("__fdelt_warn")));
+// Explicitly define the ioctl function signature
+extern int ioctl(int __fd, unsigned long int __request, ...);
 
 void push_back(struct charTupleVector* vector, const char* firstString, const char* secondString, const char* thirdString)
 {
diff --git a/src/main/c/Linux/Makefile b/src/main/c/Linux/Makefile
index 91d622f..fe091d3 100644
--- a/src/main/c/Linux/Makefile
+++ b/src/main/c/Linux/Makefile
@@ -7,7 +7,7 @@ LINK			:= gcc
 LINK_ARM32		:= arm32-unknown-linux-gnueabi-gcc
 LINK_ARM32HF	:= arm32hf-unknown-linux-gnueabi-gcc
 LINK_ARM64		:= aarch64-unknown-linux-gnueabi-gcc
-CFLAGS			:= -fPIC -static-libgcc -Os -flto -fuse-linker-plugin
+CFLAGS			:= -fPIC -static-libgcc -Os -flto -fuse-linker-plugin -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 LDFLAGS			:= -shared -static-libgcc -flto -fuse-linker-plugin -Os
 INCLUDES		:= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/linux"
 LIBRARIES		:=