diff --git a/makefile.mk b/makefile.mk
index 8fb3f70..f694fda 100644
--- a/makefile.mk
+++ b/makefile.mk
@@ -1,15 +1,19 @@
 CFLAGS += $(DEFINES) -v -w 
 OBJS = main.o gopher.o url.o connection.o readline2.o scheme.o ftype.o setftype.o \
-       s16debug.o common.o http.o dictionary.o
+       s16debug.o common.o http.o http.utils.o dictionary.o flags.o
 
 gopher: $(OBJS)
 	$(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
 
 utest: utest.o url.o scheme.o
-	$(CC) $(LDFLAGS) utest.o url.o scheme.o -o $@
+	$(CC) $(LDFLAGS) -o $@ $<
 
 dtest: dtest.o dictionary.o 
-	$(CC) $(LDFLAGS) dtest.o dictionary.o -o $@
+	$(CC) $(LDFLAGS) -o $@ $<
+
+
+htest: htest.o http.utils.o 
+	$(CC) $(LDFLAGS) -o $@ $<
 
 main.o: main.c url.h
 url.o: url.c url.h
@@ -17,8 +21,11 @@ connection.o: connection.c connection.h
 readline2.o: readline2.c readline2.h
 common.o: common.c
 
+flags.o: flags.c flags.h
+
 gopher.o: gopher.c url.h connection.h flags.h
 http.o: http.c url.h connection.h flags.h
+http.utils.o: http.utils.c
 
 data.o: data.c data.h
 dictionary.o: dictionary.c dictionary.h
@@ -32,6 +39,7 @@ s16debug.o: s16debug.c s16debug.h
 # tests
 utest.o: utest.c
 dtest.o: dtest.c
+htest.o: htest.c
 
 
 clean: