diff --git a/src/Makefile.txt b/src/Makefile.txt
index e681a3bd545311647c2486df57d1152ff5e921ba..ab3cde443ca224999c1fc83e5f7ba8b73f654e42 100644
--- a/src/Makefile.txt
+++ b/src/Makefile.txt
@@ -63,10 +63,11 @@ CCOPTS2 = $(CCOPTS1)
 
 # OBJS in execution frequency order.  CFILES after libqhull.c are alphabetical
 OBJS = user.o global.o random.o stat.o io.o geom2.o poly2.o \
-       merge.o qhull.o geom.o poly.o qset.o mem.o
+       merge.o geom.o poly.o qset.o mem.o libqhull.o usermem.o userprintf.o \
+       rboxlib.o
 
 CFILES= unix.c libqhull.c geom.c geom2.c global.c io.c mem.c merge.c poly.c \
-        poly2.c random.c qset.c stat.c user.c qconvex.c qdelaun.c qhalf.c qvoronoi.c
+        poly2.c random.c qset.c stat.c user.c qconvex.c qdelaun.c qhalf.c qvoronoi.c usermem.c userprintf.c rboxlib.c
 HFILES= user.h libqhull.h qhull_a.h geom.h io.h mem.h merge.h poly.h random.h qset.h stat.h
 TXTFILES= ../Announce.txt ../REGISTER.txt ../COPYING.txt ../README.txt Changes.txt
 DOCFILES= ../html/rbox.txt ../html/qhull.txt
@@ -86,7 +87,7 @@ qconvex.o:   libqhull.h user.h mem.h
 qdelaun.o:   libqhull.h user.h mem.h
 qhalf.o:   libqhull.h user.h mem.h
 qvoronoi.o:   libqhull.h user.h mem.h
-qhull.o:  $(HFILES)
+libqhull.o:  $(HFILES)
 geom.o:   $(HFILES)
 geom2.o:  $(HFILES)
 global.o: $(HFILES)
@@ -177,8 +178,8 @@ qhullx: qconvex.o qdelaun.o qhalf.o qvoronoi.o unix.o $(OBJS)
 	-chmod +x ../eg/q_test ../eg/q_eg ../eg/q_egtest
 	-cd ..; ./rbox D4 | ./qhull
 
-rbox: rbox.o
-	$(CC) -o rbox rbox.o $(CCOPTS2) -lm
+rbox: rbox.o libqhull.a
+	$(CC) -o rbox rbox.o -L. -lqhull $(CCOPTS2) -lm
 	cp rbox ..
 
 user_eg: user_eg.o libqhull.a 
diff --git a/src/qconvex.c b/src/qconvex.c
index ab5b0d8fbe50e9c607d4f4aeff3b93900adc045b..7cbc9bf6b6c688bfccba9b1ca85af0256c59e89d 100644
--- a/src/qconvex.c
+++ b/src/qconvex.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
-#include "qhulllib.h"
+#include "libqhull.h"
 #include "mem.h"
 #include "qset.h"
 
diff --git a/src/qdelaun.c b/src/qdelaun.c
index ede62cd233fd0883a6a8eb62f5ff751b25b04a76..ae2d589a8811d5e253bf7cdb76602712e585b3eb 100644
--- a/src/qdelaun.c
+++ b/src/qdelaun.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
-#include "qhulllib.h"
+#include "libqhull.h"
 #include "mem.h"
 #include "qset.h"
 
diff --git a/src/qhalf.c b/src/qhalf.c
index dba64e7bdd4cb3fdb1cfdaf75e5ddbf326b2300f..1978a866eca7f5d829e611867e54613de1489430 100644
--- a/src/qhalf.c
+++ b/src/qhalf.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
-#include "qhulllib.h"
+#include "libqhull.h"
 #include "mem.h"
 #include "qset.h"
 
diff --git a/src/qvoronoi.c b/src/qvoronoi.c
index 14dd3ca55ee44c82467fc5fcfaec9c4298b585c9..5f8de9dcc00f1cafc76b332909a4a840580d7b73 100644
--- a/src/qvoronoi.c
+++ b/src/qvoronoi.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
-#include "qhulllib.h"
+#include "libqhull.h"
 #include "mem.h"
 #include "qset.h"
 
diff --git a/src/rbox.c b/src/rbox.c
index 00b3b25dfa0aa2f5c2c575ec7ca161837e49fdd3..f1bb9d4b9955f53087c8727dd3ec9e38de6b5c56 100644
--- a/src/rbox.c
+++ b/src/rbox.c
@@ -93,5 +93,5 @@ int main(int argc, char **argv) {
     return_status= qh_ERRmem;
   }
   return return_status;
-}//main
+}/*main*/
 
diff --git a/src/user_eg.c b/src/user_eg.c
index 080acc8a9d3b513e83af9e6ba15b68ea65efd411..7179a6d887d582d47e6d8caa7e45935dbd76df37 100644
--- a/src/user_eg.c
+++ b/src/user_eg.c
@@ -42,7 +42,7 @@
 
    compiled by 'make user_eg'
 
-   see qhulllib.h for data structures, macros, and user-callable functions.
+   see libqhull.h for data structures, macros, and user-callable functions.
 */
 
 #include "qhull_a.h"
diff --git a/src/user_eg2.c b/src/user_eg2.c
index da2c77fe7658952e1e571b1ecdb0e250ef51601c..9a46a094a1a01b2e970c857ee359ecf48a6b41f5 100644
--- a/src/user_eg2.c
+++ b/src/user_eg2.c
@@ -39,7 +39,7 @@
 
    derived from unix.c and compiled by 'make user_eg2'
 
-   see qhulllib.h for data structures, macros, and user-callable functions.
+   see libqhull.h for data structures, macros, and user-callable functions.
 
    If you want to control all output to stdio and input to stdin,
    set the #if below to "1" and delete all lines that contain "io.c".