diff --git a/src/Makefile.am b/src/Makefile.am
index c333558..5dc19a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CFLAGS += -I../include/ -std=c99 -DREENTRANT -lpthread
-AM_LDFLAGS += -lpthread
+AM_CFLAGS += -I../include/ -std=c99
+AM_LDFLAGS +=
 
 TRDATALIBS = cbuf/libcbuf.la \
 	     hash/libhash.la \
diff --git a/src/cbuf/Makefile.am b/src/cbuf/Makefile.am
index 6249a4b..2347c94 100644
--- a/src/cbuf/Makefile.am
+++ b/src/cbuf/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CFLAGS += -I../../include/ -std=c99 -DREENTRANT -lpthread
-AM_LDFLAGS += -lpthread
+AM_CFLAGS += -I../../include/ -std=c99
+AM_LDFLAGS +=
 
 CB = cbuf.c read.c \
      get_line.c set_data.c get_data.c \
diff --git a/src/dynarray/Makefile.am b/src/dynarray/Makefile.am
index 43e81d8..b4542da 100644
--- a/src/dynarray/Makefile.am
+++ b/src/dynarray/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CFLAGS += -I../../include/ -std=c99 -DREENTRANT -lpthread
-AM_LDFLAGS += -lpthread
+AM_CFLAGS += -I../../include/ -std=c99
+AM_LDFLAGS +=
 
 DYNARRAY = dynarray.c put.c find_first_free.c
 
diff --git a/src/hash/Makefile.am b/src/hash/Makefile.am
index 6bbc9c5..5575d16 100644
--- a/src/hash/Makefile.am
+++ b/src/hash/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CFLAGS += -I../../include/ -std=c99 -DREENTRANT -lpthread
-AM_LDFLAGS += -lpthread
+AM_CFLAGS += -I../../include/ -std=c99
+AM_LDFLAGS +=
 
 HASH = hash.c add.c get.c get_first.c delete.c each.c value.c \
        cleanup.c interface/hashable.c
diff --git a/src/heap/Makefile.am b/src/heap/Makefile.am
index c3b57c5..ffefbed 100644
--- a/src/heap/Makefile.am
+++ b/src/heap/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CFLAGS += -I../../include/ -std=c99 -DREENTRANT -lpthread
-AM_LDFLAGS += -lpthread
+AM_CFLAGS += -I../../include/ -std=c99
+AM_LDFLAGS +=
 
 HEAP = heap.c put.c get.c
 
diff --git a/src/queue/Makefile.am b/src/queue/Makefile.am
index 6d13c33..0bd8013 100644
--- a/src/queue/Makefile.am
+++ b/src/queue/Makefile.am
@@ -1,10 +1,17 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CFLAGS += -I../../include/ -std=c99 -DREENTRANT -lpthread
-AM_LDFLAGS += -lpthread
+AM_CFLAGS += -I../../include/ -std=c99
+AM_LDFLAGS +=
 
-QUEUE = queue.c get.c put.c put_first.c find.c find_parent.c delete.c destroy.c
+QUEUE = queue.c \
+	get.c \
+	put.c \
+	put_first.c \
+	find.c \
+	find_parent.c \
+	delete.c \
+	destroy.c
 
 noinst_LTLIBRARIES = libqueue.la
 
diff --git a/src/tree/Makefile.am b/src/tree/Makefile.am
index 83aad30..cfd616f 100644
--- a/src/tree/Makefile.am
+++ b/src/tree/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CFLAGS += -I../../include/ -std=c99 -DREENTRANT -lpthread
-AM_LDFLAGS += -lpthread
+AM_CFLAGS += -I../../include/ -std=c99
+AM_LDFLAGS +=
 
 TREE = tree.c \
        tree_node.c \