diff --git a/ediv/src/ediv/build.sh b/ediv/src/ediv/build.sh
index cd78ac8..27af227 100755
--- a/ediv/src/ediv/build.sh
+++ b/ediv/src/ediv/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-
-CCOPTS="-I. -I../shared"
+DEBUG="-g -ggdb3 -D_DEBUG -DDBG -DDEBUG"
+CCOPTS="-I. -I../shared ${DEBUG} -fPIC"
 
 FILES="
 edivcfg/dictionary
diff --git a/ediv/src/encrypt/build.sh b/ediv/src/encrypt/build.sh
index 8c7e857..240c4d8 100755
--- a/ediv/src/encrypt/build.sh
+++ b/ediv/src/encrypt/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-
-CCOPTS="-I. -I../shared -I/usr/local/include -DDBG"
+DEBUG="-g -ggdb3 -D_DEBUG -DDBG -DDEBUG"
+CCOPTS="-I. -I../shared -I/usr/local/include ${DEBUG} -fPIC"
 
 FILES="
 encrypt
diff --git a/ediv/src/stub/build.sh b/ediv/src/stub/build.sh
index cd9a287..835329b 100755
--- a/ediv/src/stub/build.sh
+++ b/ediv/src/stub/build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-CCOPTS="-I. -I../shared -I/usr/local/include -DDBG"
+DEBUG="-g -ggdb3 -D_DEBUG -DDBG -DDEBUG"
+CCOPTS="-I. -I../shared -I/usr/local/include ${DEBUG} -fPIC"
 
 FILES="
 dll
@@ -23,10 +24,6 @@ for FILE in $FILES; do
 	OBJECTS+="$FILE.o "
 done
 
-<<<<<<< HEAD
-gcc $OBJECTS -o ../../bin/stub -lz
-=======
 gcc $OBJECTS -o ../../bin/stub -lz -ldl
->>>>>>> 6f1419a31008aa9314171e0f90b309fe54da51b0
 
 rm $OBJECTS
diff --git a/ediv/src/stub/stub.c b/ediv/src/stub/stub.c
index 9bcfd96..80e12cb 100644
--- a/ediv/src/stub/stub.c
+++ b/ediv/src/stub/stub.c
@@ -20,11 +20,7 @@
 
 #include <assert.h>
 
-<<<<<<< HEAD
-#ifndef __APPLE__
-=======
 #ifdef _WIN32
->>>>>>> 6f1419a31008aa9314171e0f90b309fe54da51b0
 #include <io.h>
 #endif