--- Makefile	2003-05-23 17:12:25.000000000 -0400
+++ Makefile	2004-01-21 22:28:52.000000000 -0500
@@ -36,7 +36,7 @@ crypt.lib: compile load trylib.c
 
-cvm-vmailmgr: load cvm-vmailmgr.o main.o lookup.o cvm/getpwnam.o crypt.lib
-	./load cvm-vmailmgr main.o lookup.o cvm/getpwnam.o `cat crypt.lib` -lcvm-module -lbg-crypto -lvmailmgr -lbg-net -lbg-cdb -lbg-dict -lbg-iobuf -lbg-path -lbg-str -lbg-misc
+cvm-vmailmgr: load cvm-vmailmgr.o main.o lookup.o crypt.lib
+	./load cvm-vmailmgr main.o lookup.o `cat crypt.lib` -lcvm-module -lbg-crypto -lvmailmgr -lbg-net -lbg-cdb -lbg-dict -lbg-iobuf -lbg-path -lbg-str -lbg-misc
 
-cvm-vmailmgr-local: load cvm-vmailmgr-local.o cvm-vmailmgr.o main.o lookup.o cvm/getpwnam.o crypt.lib
-	./load cvm-vmailmgr-local cvm-vmailmgr.o main.o lookup.o cvm/getpwnam.o `cat crypt.lib` -lcvm/local -lcrypto/md5 -lvmailmgr/vpwentry -lcdb/cdb -lcdb/str -ldict/load -ldict/dict -liobuf/str -liobuf/iobuf -lpath/path -lstr/str -lmisc/misc -lnet/socket
+cvm-vmailmgr-local: load cvm-vmailmgr-local.o cvm-vmailmgr.o main.o lookup.o crypt.lib
+	./load cvm-vmailmgr-local cvm-vmailmgr.o main.o lookup.o `cat crypt.lib` -lcvm-local -lcrypto/md5 -lvmailmgr/vpwentry -lcdb/cdb -lcdb/str -ldict/load -ldict/dict -liobuf/str -liobuf/iobuf -lpath/path -lstr/str -lmisc/misc -lnet/socket
 
@@ -45,4 +45,4 @@ cvm-vmailmgr-local.o: compile cvm-vmailm
 
-cvm-vmailmgr-udp: load cvm-vmailmgr-udp.o cvm-vmailmgr.o main.o lookup.o cvm/getpwnam.o crypt.lib
-	./load cvm-vmailmgr-udp cvm-vmailmgr.o main.o lookup.o cvm/getpwnam.o `cat crypt.lib` -lcvm/udp -lcrypto/md5 -lvmailmgr/vpwentry -lcdb/cdb -lcdb/str -ldict/load -ldict/dict -liobuf/str -liobuf/iobuf -lpath/path -lstr/str -lmisc/misc -lnet/socket
+cvm-vmailmgr-udp: load cvm-vmailmgr-udp.o cvm-vmailmgr.o main.o lookup.o crypt.lib
+	./load cvm-vmailmgr-udp cvm-vmailmgr.o main.o lookup.o `cat crypt.lib` -lcvm-udp -lcvm-module -lcrypto/md5 -lvmailmgr/vpwentry -lcdb/cdb -lcdb/str -ldict/load -ldict/dict -liobuf/str -liobuf/iobuf -lpath/path -lstr/str -lmisc/misc -lnet/socket
 
@@ -51,14 +51,11 @@ cvm-vmailmgr-udp.o: compile cvm-vmailmgr
 
-cvm-vmailmgr.o: compile cvm-vmailmgr.c cvm/module.h cvm/facts.h cvm/errors.h cvm-vmailmgr.h
+cvm-vmailmgr.o: compile cvm-vmailmgr.c cvm-vmailmgr.h
 	./compile cvm-vmailmgr.c
 
-cvm-vmlookup: load cvm-vmlookup.o main.o lookup.o cvm/getpwnam.o crypt.lib
-	./load cvm-vmlookup main.o lookup.o cvm/getpwnam.o `cat crypt.lib` -lcvm-module -lbg-crypto -lvmailmgr -lbg-net -lbg-cdb -lbg-dict -lbg-iobuf -lbg-path -lbg-str -lbg-misc
+cvm-vmlookup: load cvm-vmlookup.o main.o lookup.o crypt.lib
+	./load cvm-vmlookup main.o lookup.o `cat crypt.lib` -lcvm-module -lbg-crypto -lvmailmgr -lbg-net -lbg-cdb -lbg-dict -lbg-iobuf -lbg-path -lbg-str -lbg-misc
 
-cvm-vmlookup.o: compile cvm-vmlookup.c cvm/module.h cvm/facts.h cvm/errors.h cvm-vmailmgr.h
+cvm-vmlookup.o: compile cvm-vmlookup.c cvm-vmailmgr.h
 	./compile cvm-vmlookup.c
 
-cvm/getpwnam.o: compile cvm/getpwnam.c cvm/module.h cvm/facts.h cvm/errors.h
-	./compile cvm/getpwnam.c
-
 installer: load insthier.o
@@ -88,6 +85,6 @@ load: conf-ld conf-bglibs
 
-lookup.o: compile lookup.c cvm/module.h cvm/facts.h cvm/errors.h cvm-vmailmgr.h
+lookup.o: compile lookup.c cvm-vmailmgr.h
 	./compile lookup.c
 
-main.o: compile main.c cvm/module.h cvm/facts.h cvm/errors.h cvm-vmailmgr.h
+main.o: compile main.c cvm-vmailmgr.h
 	./compile main.c
--- lookup.c	2003-05-23 17:12:25.000000000 -0400
+++ lookup.c	2004-01-21 22:29:06.000000000 -0500
@@ -18,2 +18,3 @@
 #include <errno.h>
+#include <sys/types.h>
 #include <grp.h>
@@ -23,3 +24,2 @@
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
@@ -38,4 +38,2 @@
 
-extern int cvm_getpwnam(const char*, struct passwd**);
-
 static const char* users_path = "users/cdb";
--- main.c	2003-05-23 17:12:25.000000000 -0400
+++ main.c	2004-01-21 22:29:21.000000000 -0500
@@ -18,2 +18,3 @@
 #include <errno.h>
+#include <sys/types.h>
 #include <grp.h>
@@ -23,3 +24,2 @@
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>