diff -u grace6-5.99.0+final/src/Make.dep grace6-5.99.0+final/src/Make.dep
--- grace6-5.99.0+final/src/Make.dep
+++ grace6-5.99.0+final/src/Make.dep
@@ -4,32 +4,32 @@
   ../include/grace/canvas.h ../include/grace/core.h defines.h utils.h \
   files.h ssdata.h dicts.h core_utils.h plotone.h devlist.h parser.h \
   protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 grace$(O) : grace.c ../include/config.h defines.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h utils.h dicts.h \
   core_utils.h parser.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 project_utils$(O) : project_utils.c ../include/config.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h utils.h \
   core_utils.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 typeset$(O) : typeset.c utils.h grace.h ../include/config.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h \
@@ -45,32 +45,32 @@
   ../include/grace/base.h utils.h grace.h ../include/grace/baseP.h \
   ../include/grace/core.h defines.h files.h core_utils.h plotone.h \
   protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 utils$(O) : utils.c ../include/config.h globals.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h utils.h \
   files.h dicts.h core_utils.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 files$(O) : files.c ../include/config.h grace.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h \
   ../include/grace/core.h defines.h utils.h dicts.h core_utils.h files.h \
   ssdata.h parser.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 xfile$(O) : xfile.c ../include/config.h defines.h utils.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h files.h xfile.h
@@ -78,85 +78,85 @@
   grace.h ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h utils.h dicts.h \
   core_utils.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
   xstrings.h
 xml_out$(O) : xml_out.c ../include/config.h grace.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h \
   ../include/grace/core.h defines.h utils.h dicts.h core_utils.h files.h \
   xfile.h xstrings.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 ssdata$(O) : ssdata.c ../include/config.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h files.h grace.h \
   defines.h ssdata.h parser.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 nonlfit$(O) : nonlfit.c ../include/config.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h utils.h grace.h \
   defines.h parser.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h f2c.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h f2c.h
 lmdif$(O) : lmdif.c ../include/config.h ../include/grace/baseP.h \
   ../include/grace/base.h f2c.h
 fourier$(O) : fourier.c ../include/config.h ../include/grace/baseP.h \
   ../include/grace/base.h globals.h grace.h ../include/grace/canvas.h \
   ../include/grace/core.h defines.h utils.h files.h protos.h noxprotos.h \
-  xprotos.h core_utils.h motifinc.h /usr/X11R6/include/X11/Intrinsic.h \
-  /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/X.h \
-  /usr/X11R6/include/X11/Xfuncproto.h /usr/X11R6/include/X11/Xosdefs.h \
-  /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \
-  /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \
-  /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \
-  /usr/X11R6/include/X11/RectObj.h
+  xprotos.h core_utils.h motifinc.h /usr/include/X11/Intrinsic.h \
+  /usr/include/X11/Xlib.h /usr/include/X11/X.h \
+  /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \
+  /usr/include/X11/Xutil.h /usr/include/X11/Xresource.h \
+  /usr/include/X11/Core.h /usr/include/X11/Composite.h \
+  /usr/include/X11/Constraint.h /usr/include/X11/Object.h \
+  /usr/include/X11/RectObj.h
 graph_utils$(O) : graph_utils.c ../include/config.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h \
   core_utils.h parser.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 set_utils$(O) : set_utils.c ../include/config.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h ssdata.h grace.h \
   defines.h utils.h files.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 region_utils$(O) : region_utils.c ../include/config.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h protos.h noxprotos.h \
   grace.h defines.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 dobject_utils$(O) : dobject_utils.c ../include/config.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h core_utils.h
@@ -164,12 +164,12 @@
   core_utils.h ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h parser.h protos.h \
   noxprotos.h grace.h defines.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 dlmodule$(O) : dlmodule.c ../include/config.h dlmodule.h defines.h utils.h \
   grace.h ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h parser.h
@@ -177,22 +177,22 @@
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h files.h protos.h \
   noxprotos.h xprotos.h core_utils.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 dates$(O) : dates.c defines.h ../include/config.h utils.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h protos.h noxprotos.h \
-  xprotos.h core_utils.h motifinc.h /usr/X11R6/include/X11/Intrinsic.h \
-  /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/X.h \
-  /usr/X11R6/include/X11/Xfuncproto.h /usr/X11R6/include/X11/Xosdefs.h \
-  /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \
-  /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \
-  /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \
-  /usr/X11R6/include/X11/RectObj.h
+  xprotos.h core_utils.h motifinc.h /usr/include/X11/Intrinsic.h \
+  /usr/include/X11/Xlib.h /usr/include/X11/X.h \
+  /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \
+  /usr/include/X11/Xutil.h /usr/include/X11/Xresource.h \
+  /usr/include/X11/Core.h /usr/include/X11/Composite.h \
+  /usr/include/X11/Constraint.h /usr/include/X11/Object.h \
+  /usr/include/X11/RectObj.h
 dummydrv$(O) : dummydrv.c ../include/grace/canvas.h ../include/grace/base.h \
   ../include/config.h devlist.h dummydrv.h defines.h
 mfdrv$(O) : mfdrv.c ../include/config.h ../include/grace/canvas.h \
@@ -204,12 +204,12 @@
   ../include/grace/base.h utils.h grace.h ../include/grace/baseP.h \
   ../include/grace/core.h defines.h devlist.h psdrv.h protos.h \
   noxprotos.h xprotos.h core_utils.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 pdfdrv$(O) : pdfdrv.c ../include/config.h
 svgdrv$(O) : svgdrv.c ../include/config.h ../include/grace/canvas.h \
   ../include/grace/base.h utils.h grace.h ../include/grace/baseP.h \
@@ -223,29 +223,29 @@
 mathstuff$(O) : mathstuff.c protos.h noxprotos.h grace.h ../include/config.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h xprotos.h \
-  core_utils.h motifinc.h /usr/X11R6/include/X11/Intrinsic.h \
-  /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/X.h \
-  /usr/X11R6/include/X11/Xfuncproto.h /usr/X11R6/include/X11/Xosdefs.h \
-  /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \
-  /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \
-  /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \
-  /usr/X11R6/include/X11/RectObj.h utils.h ../cephes/cephes.h mathstuff.h
+  core_utils.h motifinc.h /usr/include/X11/Intrinsic.h \
+  /usr/include/X11/Xlib.h /usr/include/X11/X.h \
+  /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \
+  /usr/include/X11/Xutil.h /usr/include/X11/Xresource.h \
+  /usr/include/X11/Core.h /usr/include/X11/Composite.h \
+  /usr/include/X11/Constraint.h /usr/include/X11/Object.h \
+  /usr/include/X11/RectObj.h utils.h ../cephes/cephes.h mathstuff.h
 bi$(O) : bi.c ../include/config.h buildinfo.h
 Tab$(O) : Tab.c TabP.h Tab.h
-ListTree$(O) : ListTree.c /usr/X11R6/include/X11/IntrinsicP.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
-  /usr/X11R6/include/X11/CoreP.h /usr/X11R6/include/X11/CompositeP.h \
-  /usr/X11R6/include/X11/ConstrainP.h /usr/X11R6/include/X11/ObjectP.h \
-  /usr/X11R6/include/X11/RectObjP.h /usr/X11R6/include/X11/StringDefs.h \
+ListTree$(O) : ListTree.c /usr/include/X11/IntrinsicP.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
+  /usr/include/X11/CoreP.h /usr/include/X11/CompositeP.h \
+  /usr/include/X11/ConstrainP.h /usr/include/X11/ObjectP.h \
+  /usr/include/X11/RectObjP.h /usr/include/X11/StringDefs.h \
   ListTreeP.h ListTree.h
-motifutils$(O) : motifutils.c ../include/config.h /usr/X11R6/include/X11/X.h \
-  /usr/X11R6/include/X11/Xatom.h /usr/X11R6/include/X11/cursorfont.h \
-  /usr/X11R6/include/X11/Xmu/Editres.h Tab.h motifinc.h grace.h \
+motifutils$(O) : motifutils.c ../include/config.h /usr/include/X11/X.h \
+  /usr/include/X11/Xatom.h /usr/include/X11/cursorfont.h \
+  /usr/include/X11/Xmu/Editres.h Tab.h motifinc.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h globals.h \
   jbitmaps.h core_utils.h utils.h dicts.h parser.h protos.h noxprotos.h \
@@ -253,45 +253,45 @@
 compwin$(O) : compwin.c ../include/config.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h utils.h grace.h \
-  defines.h ssdata.h motifinc.h /usr/X11R6/include/X11/Intrinsic.h \
-  /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/X.h \
-  /usr/X11R6/include/X11/Xfuncproto.h /usr/X11R6/include/X11/Xosdefs.h \
-  /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \
-  /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \
-  /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \
-  /usr/X11R6/include/X11/RectObj.h protos.h noxprotos.h xprotos.h
+  defines.h ssdata.h motifinc.h /usr/include/X11/Intrinsic.h \
+  /usr/include/X11/Xlib.h /usr/include/X11/X.h \
+  /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \
+  /usr/include/X11/Xutil.h /usr/include/X11/Xresource.h \
+  /usr/include/X11/Core.h /usr/include/X11/Composite.h \
+  /usr/include/X11/Constraint.h /usr/include/X11/Object.h \
+  /usr/include/X11/RectObj.h protos.h noxprotos.h xprotos.h
 eblockwin$(O) : eblockwin.c ../include/config.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h utils.h grace.h \
   defines.h ssdata.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 editpwin$(O) : editpwin.c ../include/config.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h utils.h grace.h \
   defines.h files.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
   ../Xbae/Xbae/Matrix.h ../Xbae/Xbae/patchlevel.h
 events$(O) : events.c ../include/config.h utils.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h \
   core_utils.h events.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
-  /usr/X11R6/include/X11/keysym.h /usr/X11R6/include/X11/keysymdef.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
+  /usr/include/X11/keysym.h /usr/include/X11/keysymdef.h \
   protos.h noxprotos.h
 fileswin$(O) : fileswin.c ../include/config.h globals.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
@@ -301,22 +301,22 @@
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h utils.h \
   files.h protos.h noxprotos.h xprotos.h core_utils.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h
 miscwin$(O) : miscwin.c ../include/config.h globals.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h utils.h \
-  core_utils.h motifinc.h /usr/X11R6/include/X11/Intrinsic.h \
-  /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/X.h \
-  /usr/X11R6/include/X11/Xfuncproto.h /usr/X11R6/include/X11/Xosdefs.h \
-  /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \
-  /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \
-  /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \
-  /usr/X11R6/include/X11/RectObj.h protos.h noxprotos.h xprotos.h
+  core_utils.h motifinc.h /usr/include/X11/Intrinsic.h \
+  /usr/include/X11/Xlib.h /usr/include/X11/X.h \
+  /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \
+  /usr/include/X11/Xutil.h /usr/include/X11/Xresource.h \
+  /usr/include/X11/Core.h /usr/include/X11/Composite.h \
+  /usr/include/X11/Constraint.h /usr/include/X11/Object.h \
+  /usr/include/X11/RectObj.h protos.h noxprotos.h xprotos.h
 monwin$(O) : monwin.c ../include/config.h globals.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h files.h \
@@ -324,13 +324,13 @@
 printwin$(O) : printwin.c ../include/config.h globals.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h utils.h \
-  plotone.h motifinc.h /usr/X11R6/include/X11/Intrinsic.h \
-  /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/X.h \
-  /usr/X11R6/include/X11/Xfuncproto.h /usr/X11R6/include/X11/Xosdefs.h \
-  /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \
-  /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \
-  /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \
-  /usr/X11R6/include/X11/RectObj.h protos.h noxprotos.h xprotos.h \
+  plotone.h motifinc.h /usr/include/X11/Intrinsic.h \
+  /usr/include/X11/Xlib.h /usr/include/X11/X.h \
+  /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \
+  /usr/include/X11/Xutil.h /usr/include/X11/Xresource.h \
+  /usr/include/X11/Core.h /usr/include/X11/Composite.h \
+  /usr/include/X11/Constraint.h /usr/include/X11/Object.h \
+  /usr/include/X11/RectObj.h protos.h noxprotos.h xprotos.h \
   core_utils.h
 setwin$(O) : setwin.c ../include/config.h ../Xbae/Xbae/Matrix.h \
   ../Xbae/Xbae/patchlevel.h core_utils.h ../include/grace/core.h \
@@ -341,13 +341,13 @@
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h utils.h \
   dicts.h core_utils.h explorer.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
-  ListTree.h qbitmaps.h /usr/X11R6/include/X11/xpm.h protos.h noxprotos.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
+  ListTree.h qbitmaps.h /usr/include/X11/xpm.h protos.h noxprotos.h \
   xprotos.h
 project_ui$(O) : project_ui.c explorer.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
@@ -357,32 +357,32 @@
 graph_ui$(O) : graph_ui.c core_utils.h ../include/grace/core.h \
   ../include/grace/baseP.h ../include/grace/base.h ../include/config.h \
   ../include/grace/canvas.h explorer.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
   grace.h defines.h ListTree.h
 frame_ui$(O) : frame_ui.c core_utils.h ../include/grace/core.h \
   ../include/grace/baseP.h ../include/grace/base.h ../include/config.h \
   ../include/grace/canvas.h explorer.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
   grace.h defines.h ListTree.h protos.h noxprotos.h xprotos.h
 set_ui$(O) : set_ui.c ../include/config.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h explorer.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
   grace.h defines.h ListTree.h
 axis_ui$(O) : axis_ui.c ../include/config.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
@@ -391,71 +391,71 @@
 dobject_ui$(O) : dobject_ui.c ../include/config.h explorer.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
   grace.h defines.h ListTree.h
 atext_ui$(O) : atext_ui.c ../include/config.h explorer.h core_utils.h \
   ../include/grace/core.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
   grace.h defines.h ListTree.h
 region_ui$(O) : region_ui.c explorer.h core_utils.h ../include/grace/core.h \
   ../include/grace/baseP.h ../include/grace/base.h ../include/config.h \
-  ../include/grace/canvas.h motifinc.h /usr/X11R6/include/X11/Intrinsic.h \
-  /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/X.h \
-  /usr/X11R6/include/X11/Xfuncproto.h /usr/X11R6/include/X11/Xosdefs.h \
-  /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \
-  /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \
-  /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \
-  /usr/X11R6/include/X11/RectObj.h grace.h defines.h ListTree.h protos.h \
+  ../include/grace/canvas.h motifinc.h /usr/include/X11/Intrinsic.h \
+  /usr/include/X11/Xlib.h /usr/include/X11/X.h \
+  /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \
+  /usr/include/X11/Xutil.h /usr/include/X11/Xresource.h \
+  /usr/include/X11/Core.h /usr/include/X11/Composite.h \
+  /usr/include/X11/Constraint.h /usr/include/X11/Object.h \
+  /usr/include/X11/RectObj.h grace.h defines.h ListTree.h protos.h \
   noxprotos.h xprotos.h
 worldwin$(O) : worldwin.c ../include/config.h mbitmaps.h globals.h grace.h \
   ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h \
-  core_utils.h utils.h motifinc.h /usr/X11R6/include/X11/Intrinsic.h \
-  /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/X.h \
-  /usr/X11R6/include/X11/Xfuncproto.h /usr/X11R6/include/X11/Xosdefs.h \
-  /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \
-  /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \
-  /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \
-  /usr/X11R6/include/X11/RectObj.h protos.h noxprotos.h xprotos.h
+  core_utils.h utils.h motifinc.h /usr/include/X11/Intrinsic.h \
+  /usr/include/X11/Xlib.h /usr/include/X11/X.h \
+  /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \
+  /usr/include/X11/Xutil.h /usr/include/X11/Xresource.h \
+  /usr/include/X11/Core.h /usr/include/X11/Composite.h \
+  /usr/include/X11/Constraint.h /usr/include/X11/Object.h \
+  /usr/include/X11/RectObj.h protos.h noxprotos.h xprotos.h
 fontwin$(O) : fontwin.c ../include/config.h ../Xbae/Xbae/Matrix.h \
   ../Xbae/Xbae/patchlevel.h globals.h grace.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h \
   ../include/grace/core.h defines.h motifinc.h protos.h noxprotos.h \
   xprotos.h core_utils.h
-xutil$(O) : xutil.c ../include/config.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/cursorfont.h \
+xutil$(O) : xutil.c ../include/config.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/cursorfont.h \
   defines.h globals.h grace.h ../include/grace/baseP.h \
   ../include/grace/base.h ../include/grace/canvas.h \
   ../include/grace/core.h utils.h files.h core_utils.h plotone.h \
-  motifinc.h /usr/X11R6/include/X11/Intrinsic.h \
-  /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \
-  /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \
-  /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \
-  /usr/X11R6/include/X11/RectObj.h protos.h noxprotos.h xprotos.h
-x11drv$(O) : x11drv.c ../include/config.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h ../include/grace/canvas.h \
+  motifinc.h /usr/include/X11/Intrinsic.h \
+  /usr/include/X11/Xutil.h /usr/include/X11/Xresource.h \
+  /usr/include/X11/Core.h /usr/include/X11/Composite.h \
+  /usr/include/X11/Constraint.h /usr/include/X11/Object.h \
+  /usr/include/X11/RectObj.h protos.h noxprotos.h xprotos.h
+x11drv$(O) : x11drv.c ../include/config.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h ../include/grace/canvas.h \
   ../include/grace/base.h globals.h grace.h ../include/grace/baseP.h \
   ../include/grace/core.h defines.h devlist.h protos.h noxprotos.h \
-  xprotos.h core_utils.h motifinc.h /usr/X11R6/include/X11/Intrinsic.h \
-  /usr/X11R6/include/X11/Xutil.h /usr/X11R6/include/X11/Xresource.h \
-  /usr/X11R6/include/X11/Core.h /usr/X11R6/include/X11/Composite.h \
-  /usr/X11R6/include/X11/Constraint.h /usr/X11R6/include/X11/Object.h \
-  /usr/X11R6/include/X11/RectObj.h
+  xprotos.h core_utils.h motifinc.h /usr/include/X11/Intrinsic.h \
+  /usr/include/X11/Xutil.h /usr/include/X11/Xresource.h \
+  /usr/include/X11/Core.h /usr/include/X11/Composite.h \
+  /usr/include/X11/Constraint.h /usr/include/X11/Object.h \
+  /usr/include/X11/RectObj.h
 xmgrace$(O) : xmgrace.c ../include/config.h ../Xbae/Xbae/Matrix.h \
-  ../Xbae/Xbae/patchlevel.h /usr/X11R6/include/X11/xpm.h globals.h \
+  ../Xbae/Xbae/patchlevel.h /usr/include/X11/xpm.h globals.h \
   grace.h ../include/grace/baseP.h ../include/grace/base.h \
   ../include/grace/canvas.h ../include/grace/core.h defines.h bitmaps.h \
   utils.h files.h core_utils.h plotone.h events.h xprotos.h motifinc.h \
@@ -466,10 +466,10 @@
   grace.h ../cephes/cephes.h utils.h files.h core_utils.h plotone.h \
   dlmodule.h ssdata.h protos.h noxprotos.h xprotos.h motifinc.h \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
+  /usr/include/X11/Intrinsic.h /usr/include/X11/Xlib.h \
+  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
+  /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \
+  /usr/include/X11/Xresource.h /usr/include/X11/Core.h \
+  /usr/include/X11/Composite.h /usr/include/X11/Constraint.h \
+  /usr/include/X11/Object.h /usr/include/X11/RectObj.h \
   parser.h mathstuff.h
 buildinfo$(O) : buildinfo.c ../include/config.h ../Xbae/Xbae/patchlevel.h
diff -u grace6-5.99.0+final/debian/control grace6-5.99.0+final/debian/control
--- grace6-5.99.0+final/debian/control
+++ grace6-5.99.0+final/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ionut Georgescu <george@pks.mpg.de>
 Uploaders: Torsten Werner <twerner@debian.org>
 Standards-Version: 3.6.2.1
-Build-Depends: cdbs, debhelper (>= 4.1.0), lesstif2-dev, libxpm-dev, fftw-dev, libjpeg-dev, libpng-dev, netcdfg-dev, gfortran | g77 | fortran-compiler, xmhtml1-dev, libt1-dev, defoma, libexpat1-dev, libxmu-dev, linuxdoc-tools, libplot-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), lesstif2-dev, libxpm-dev, fftw-dev, libjpeg-dev, libpng-dev, netcdfg-dev, gfortran | g77 | fortran-compiler, xmhtml1-dev, libt1-dev, defoma, libexpat1-dev, libxmu-dev, linuxdoc-tools, libplot-dev, libxp-dev
 
 Package: grace6
 Architecture: any
diff -u grace6-5.99.0+final/debian/changelog grace6-5.99.0+final/debian/changelog
--- grace6-5.99.0+final/debian/changelog
+++ grace6-5.99.0+final/debian/changelog
@@ -1,3 +1,11 @@
+grace6 (5.99.0+final-9ubuntu1) dapper; urgency=low
+
+  * Resychronize with Debian.
+  * Change all hardcoded "/usr/X11R6/include/X11" in src/Make.dep to
+    "/usr/include/X11" to adapt the new X layout.
+
+ -- Ming Hua <minghua@rice.edu>  Sat, 19 Nov 2005 04:26:10 -0600
+
 grace6 (5.99.0+final-9) unstable; urgency=low
 
   * Revert the LaTeX stuff. Upstream agrees on it, but not just as a simple
@@ -7,6 +15,12 @@
 
  -- Ionut Georgescu <george@pks.mpg.de>  Wed, 19 Oct 2005 14:38:08 +0200
 
+grace6 (5.99.0+final-8ubuntu1) breezy; urgency=low
+
+  * Add build-dep for libxp-dev to provide Print.h
+
+ -- Barry deFreese <bddebian@comcast.net>  Sun, 18 Sep 2005 22:55:34 -0400
+
 grace6 (5.99.0+final-8) unstable; urgency=low
 
   * Bump version.