diff --git a/Makefile b/Makefile
index 2e483885..58eeedb1 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ database/database.h: database/database.h.in
 	@echo --- making header file database/database.h
 	${SCRIPTS}/makedbh database/database.h.in database/database.h
 
-modules:
+modules: database/database.h depend
 	@echo --- making modules
 	for dir in ${MODULES} ${PROGRAMS}; do \
 		(cd $$dir && ${MAKE} module); done
diff --git a/cif/Depend b/cif/Depend
index cb199a1e..3ebdec12 100644
--- a/cif/Depend
+++ b/cif/Depend
@@ -12,8 +12,9 @@ CIFmain.o: CIFmain.c ../tcltk/tclmagic.h ../utils/magic.h \
  ../windows/windows.h ../dbwind/dbwind.h ../utils/styles.h
 CIFrdcl.o: CIFrdcl.c ../utils/magic.h ../utils/malloc.h \
  ../utils/geometry.h ../tiles/tile.h ../utils/hash.h ../utils/undo.h \
- ../database/database.h ../cif/CIFint.h ../cif/CIFread.h ../utils/utils.h \
- ../windows/windows.h ../dbwind/dbwind.h ../utils/main.h ../drc/drc.h
+ ../database/database.h ../cif/CIFint.h ../cif/CIFread.h ../cif/cif.h \
+ ../calma/calma.h ../utils/utils.h ../windows/windows.h \
+ ../dbwind/dbwind.h ../utils/main.h ../drc/drc.h
 CIFrdpt.o: CIFrdpt.c ../utils/magic.h ../utils/geometry.h ../tiles/tile.h \
  ../utils/hash.h ../utils/malloc.h ../database/database.h \
  ../windows/windows.h ../utils/main.h ../cif/CIFint.h ../cif/CIFread.h
diff --git a/commands/Depend b/commands/Depend
index b2c29da6..9e566656 100644
--- a/commands/Depend
+++ b/commands/Depend
@@ -40,11 +40,12 @@ CmdLQ.o: CmdLQ.c ../tcltk/tclmagic.h ../utils/magic.h ../utils/malloc.h \
  ../netmenu/netmenu.h
 CmdRS.o: CmdRS.c ../tcltk/tclmagic.h ../utils/magic.h ../utils/stack.h \
  ../utils/geometry.h ../utils/utils.h ../tiles/tile.h ../utils/hash.h \
- ../database/database.h ../database/fonts.h ../windows/windows.h \
- ../dbwind/dbwind.h ../utils/main.h ../commands/commands.h \
- ../textio/textio.h ../graphics/graphics.h ../utils/tech.h ../drc/drc.h \
- ../textio/txcommands.h ../utils/malloc.h ../utils/netlist.h \
- ../netmenu/netmenu.h ../select/select.h ../utils/signals.h ../sim/sim.h
+ ../utils/styles.h ../database/database.h ../database/fonts.h \
+ ../windows/windows.h ../dbwind/dbwind.h ../utils/main.h \
+ ../commands/commands.h ../textio/textio.h ../graphics/graphics.h \
+ ../utils/tech.h ../drc/drc.h ../textio/txcommands.h ../utils/malloc.h \
+ ../utils/netlist.h ../netmenu/netmenu.h ../select/select.h \
+ ../utils/signals.h ../sim/sim.h
 CmdTZ.o: CmdTZ.c ../tcltk/tclmagic.h ../utils/magic.h ../utils/malloc.h \
  ../utils/geometry.h ../utils/utils.h ../tiles/tile.h ../utils/hash.h \
  ../database/database.h ../windows/windows.h ../dbwind/dbwind.h \
diff --git a/drc/Depend b/drc/Depend
index d8c486cb..08a0cf08 100644
--- a/drc/Depend
+++ b/drc/Depend
@@ -15,10 +15,10 @@ DRCcontin.o: DRCcontin.c ../tcltk/tclmagic.h ../utils/magic.h \
  ../dbwind/dbwtech.h ../utils/main.h ../commands/commands.h ../drc/drc.h \
  ../utils/signals.h ../graphics/graphics.h ../utils/undo.h \
  ../utils/malloc.h
-DRCmain.o: DRCmain.c ../utils/magic.h ../utils/malloc.h \
- ../textio/textio.h ../utils/geometry.h ../tiles/tile.h ../utils/hash.h \
- ../database/database.h ../windows/windows.h ../dbwind/dbwind.h \
- ../drc/drc.h ../utils/undo.h
+DRCmain.o: DRCmain.c ../tcltk/tclmagic.h ../utils/magic.h \
+ ../utils/malloc.h ../textio/textio.h ../utils/geometry.h ../tiles/tile.h \
+ ../utils/hash.h ../database/database.h ../windows/windows.h \
+ ../dbwind/dbwind.h ../drc/drc.h ../utils/undo.h
 DRCsubcell.o: DRCsubcell.c ../utils/magic.h ../textio/textio.h \
  ../utils/geometry.h ../tiles/tile.h ../utils/hash.h \
  ../database/database.h ../drc/drc.h ../windows/windows.h \
diff --git a/extcheck/Depend b/extcheck/Depend
deleted file mode 100644
index 9cba00af..00000000
--- a/extcheck/Depend
+++ /dev/null
@@ -1,3 +0,0 @@
-extcheck.o: extcheck.c ../utils/magic.h ../utils/paths.h \
- ../utils/geometry.h ../utils/hash.h ../utils/utils.h \
- ../utils/pathvisit.h ../extflat/extflat.h ../utils/runstats.h
diff --git a/extract/Depend b/extract/Depend
index 7171cc1a..cf4319dd 100644
--- a/extract/Depend
+++ b/extract/Depend
@@ -9,7 +9,7 @@ ExtBasic.o: ExtBasic.c ../tcltk/tclmagic.h ../utils/magic.h \
  ../database/database.h ../utils/malloc.h ../textio/textio.h \
  ../debug/debug.h ../extract/extract.h ../extract/extractInt.h \
  ../extract/extDebugInt.h ../utils/signals.h ../windows/windows.h \
- ../dbwind/dbwind.h ../utils/styles.h ../utils/stack.h
+ ../dbwind/dbwind.h ../utils/styles.h ../utils/stack.h ../utils/utils.h
 ExtCell.o: ExtCell.c ../utils/magic.h ../utils/geometry.h \
  ../utils/styles.h ../tiles/tile.h ../utils/hash.h ../database/database.h \
  ../utils/malloc.h ../textio/textio.h ../debug/debug.h \
@@ -57,8 +57,8 @@ ExtRegion.o: ExtRegion.c ../utils/magic.h ../utils/geometry.h \
  ../tiles/tile.h ../utils/hash.h ../database/database.h ../utils/malloc.h \
  ../textio/textio.h ../debug/debug.h ../extract/extract.h \
  ../extract/extractInt.h ../extract/extDebugInt.h ../utils/signals.h
-ExtSubtree.o: ExtSubtree.c ../utils/magic.h ../utils/geometry.h \
- ../utils/geofast.h ../tiles/tile.h ../utils/hash.h \
+ExtSubtree.o: ExtSubtree.c ../tcltk/tclmagic.h ../utils/magic.h \
+ ../utils/geometry.h ../utils/geofast.h ../tiles/tile.h ../utils/hash.h \
  ../database/database.h ../utils/malloc.h ../textio/textio.h \
  ../debug/debug.h ../extract/extract.h ../extract/extractInt.h \
  ../extract/extDebugInt.h ../utils/signals.h ../windows/windows.h \
@@ -67,7 +67,8 @@ ExtTech.o: ExtTech.c ../tcltk/tclmagic.h ../utils/magic.h \
  ../utils/utils.h ../utils/geometry.h ../tiles/tile.h ../utils/hash.h \
  ../database/database.h ../database/databaseInt.h ../utils/malloc.h \
  ../textio/textio.h ../utils/tech.h ../debug/debug.h ../extract/extract.h \
- ../extract/extractInt.h ../extract/extDebugInt.h ../cif/CIFint.h
+ ../extract/extractInt.h ../extract/extDebugInt.h ../cif/CIFint.h \
+ ../cif/cif.h
 ExtTest.o: ExtTest.c ../utils/magic.h ../utils/utils.h \
  ../utils/geometry.h ../utils/styles.h ../tiles/tile.h ../utils/hash.h \
  ../database/database.h ../utils/malloc.h ../windows/windows.h \
diff --git a/graphics/Depend b/graphics/Depend
index 6546e387..ff4c0a1f 100644
--- a/graphics/Depend
+++ b/graphics/Depend
@@ -93,10 +93,10 @@ grTOGL2.o: grTOGL2.c ../tcltk/tclmagic.h ../utils/magic.h \
  grTOGLInt.h
 grTOGL3.o: grTOGL3.c ../tcltk/tclmagic.h ../utils/magic.h \
  ../utils/geometry.h ../utils/malloc.h ../windows/windows.h \
- ../graphics/graphics.h ../graphics/graphicsInt.h ../textio/textio.h \
- ../utils/signals.h ../utils/utils.h ../utils/hash.h \
- ../graphics/grTOGLInt.h ../graphics/grTkCommon.h ../database/fonts.h \
- ../tiles/tile.h
+ ../graphics/graphics.h ../graphics/graphicsInt.h ../dbwind/dbwind.h \
+ ../database/database.h ../tiles/tile.h ../utils/hash.h \
+ ../textio/textio.h ../utils/signals.h ../utils/utils.h \
+ ../graphics/grTOGLInt.h ../graphics/grTkCommon.h ../database/fonts.h
 grTOGL4.o: grTOGL4.c ../tcltk/tclmagic.h ../utils/magic.h \
  ../utils/magsgtty.h ../textio/textio.h ../utils/geometry.h \
  ../windows/windows.h ../graphics/graphics.h ../graphics/graphicsInt.h \
@@ -136,3 +136,28 @@ X11Helper.o: X11Helper.c
 grX11thread.o: grX11thread.c ../utils/magic.h ../utils/geometry.h \
  ../graphics/graphics.h ../windows/windows.h ../graphics/graphicsInt.h \
  grX11Int.h
+grTCairo1.o: grTCairo1.c ../tcltk/tclmagic.h ../utils/main.h \
+ ../windows/windows.h ../utils/magic.h ../utils/geometry.h \
+ ../database/database.h ../tiles/tile.h ../utils/hash.h ../utils/malloc.h \
+ ../utils/magsgtty.h ../graphics/graphics.h ../graphics/graphicsInt.h \
+ ../textio/textio.h ../textio/txcommands.h ../utils/signals.h \
+ ../utils/utils.h ../drc/drc.h ../utils/macros.h \
+ ../graphics/grTCairoInt.h ../utils/paths.h ../graphics/grTkCommon.h
+grTCairo2.o: grTCairo2.c ../tcltk/tclmagic.h ../utils/magic.h \
+ ../textio/textio.h ../utils/geometry.h ../graphics/glyphs.h \
+ ../windows/windows.h ../graphics/graphics.h ../graphics/graphicsInt.h \
+ grTCairoInt.h ../textio/txcommands.h
+grTCairo3.o: grTCairo3.c ../tcltk/tclmagic.h ../utils/magic.h \
+ ../utils/geometry.h ../utils/malloc.h ../windows/windows.h \
+ ../graphics/graphics.h ../graphics/graphicsInt.h ../dbwind/dbwind.h \
+ ../database/database.h ../tiles/tile.h ../utils/hash.h \
+ ../textio/textio.h ../utils/signals.h ../utils/utils.h \
+ ../graphics/grTCairoInt.h ../graphics/grTkCommon.h ../database/fonts.h
+grTCairo4.o: grTCairo4.c ../tcltk/tclmagic.h ../utils/magic.h \
+ ../utils/magsgtty.h ../textio/textio.h ../utils/geometry.h \
+ ../windows/windows.h ../graphics/graphics.h ../graphics/graphicsInt.h \
+ ../graphics/grTkCommon.h ../textio/txcommands.h grTCairoInt.h
+grTCairo5.o: grTCairo5.c ../tcltk/tclmagic.h ../utils/magic.h \
+ ../utils/styles.h ../utils/hash.h ../textio/textio.h ../utils/geometry.h \
+ ../graphics/glyphs.h ../windows/windows.h ../graphics/graphics.h \
+ ../graphics/graphicsInt.h grTkCommon.h grTCairoInt.h
diff --git a/lef/Depend b/lef/Depend
index c30ba247..37ec5a4f 100644
--- a/lef/Depend
+++ b/lef/Depend
@@ -19,7 +19,7 @@ lefRead.o: lefRead.c ../tcltk/tclmagic.h ../utils/magic.h \
  ../utils/geometry.h ../tiles/tile.h ../utils/hash.h ../utils/undo.h \
  ../database/database.h ../windows/windows.h ../graphics/graphics.h \
  ../dbwind/dbwind.h ../utils/malloc.h ../textio/textio.h ../cif/cif.h \
- ../cif/CIFint.h ../lef/lefInt.h
+ ../cif/CIFint.h ../cif/CIFread.h ../lef/lefInt.h
 defRead.o: defRead.c ../tcltk/tclmagic.h ../utils/magic.h \
  ../utils/geometry.h ../tiles/tile.h ../utils/hash.h ../utils/undo.h \
  ../database/database.h ../windows/windows.h ../dbwind/dbwind.h \
diff --git a/lisp/Depend b/lisp/Depend
index 66f52c37..b09f6811 100644
--- a/lisp/Depend
+++ b/lisp/Depend
@@ -22,6 +22,12 @@ lispFrame.o: lispFrame.c ../lisp/lisp.h lispInt.h ../utils/magic.h \
 lispTrace.o: lispTrace.c ../lisp/lisp.h lispInt.h ../utils/magic.h \
  ../utils/geometry.h ../textio/txcommands.h ../textio/textio.h \
  ../utils/malloc.h
+lispMagic.o: lispMagic.c ../lisp/lisp.h lispInt.h ../utils/magic.h \
+ ../utils/geometry.h ../textio/txcommands.h lispargs.h ../utils/geofast.h \
+ ../textio/textio.h ../utils/malloc.h ../tiles/tile.h ../utils/hash.h \
+ ../database/database.h ../windows/windows.h ../dbwind/dbwind.h \
+ ../utils/main.h ../commands/commands.h ../utils/utils.h \
+ ../select/select.h
 lispArith.o: lispArith.c ../lisp/lisp.h lispInt.h ../utils/magic.h \
  ../utils/geometry.h ../textio/txcommands.h lispargs.h ../textio/textio.h \
  ../utils/malloc.h
diff --git a/textio/Depend b/textio/Depend
index a2fd88ff..76214273 100644
--- a/textio/Depend
+++ b/textio/Depend
@@ -1,10 +1,10 @@
-txCommands.o: txCommands.c ../utils/magsgtty.h ../utils/magic.h \
- ../textio/textio.h ../utils/geometry.h ../textio/txcommands.h \
- ../textio/textioInt.h ../utils/macros.h ../utils/hash.h \
- ../windows/windows.h ../tiles/tile.h ../database/database.h \
- ../dbwind/dbwind.h ../drc/drc.h ../utils/signals.h \
- ../graphics/graphics.h ../utils/dqueue.h ../utils/malloc.h \
- ../utils/utils.h ../lisp/lisp.h
+txCommands.o: txCommands.c ../tcltk/tclmagic.h ../utils/magsgtty.h \
+ ../utils/magic.h ../textio/textio.h ../utils/geometry.h \
+ ../textio/txcommands.h ../textio/textioInt.h ../utils/macros.h \
+ ../utils/hash.h ../windows/windows.h ../tiles/tile.h \
+ ../database/database.h ../dbwind/dbwind.h ../drc/drc.h \
+ ../utils/signals.h ../graphics/graphics.h ../utils/dqueue.h \
+ ../utils/malloc.h ../utils/utils.h ../lisp/lisp.h
 txInput.o: txInput.c ../utils/magsgtty.h ../utils/magic.h ../utils/main.h \
  ../windows/windows.h ../utils/geometry.h ../database/database.h \
  ../tiles/tile.h ../utils/hash.h ../textio/textio.h \
diff --git a/utils/Depend b/utils/Depend
index 8e4f10c3..4f469cb1 100644
--- a/utils/Depend
+++ b/utils/Depend
@@ -18,19 +18,20 @@ list.o: list.c ../utils/magic.h ../utils/utils.h ../utils/malloc.h \
 lookup.o: lookup.c ../utils/magic.h ../utils/utils.h
 lookupany.o: lookupany.c
 lookupfull.o: lookupfull.c ../utils/magic.h
-macros.o: macros.c ../utils/magic.h ../utils/utils.h ../utils/hash.h \
- ../utils/malloc.h ../utils/macros.h ../windows/windows.h \
- ../utils/geometry.h
-main.o: main.c ../utils/main.h ../windows/windows.h ../utils/magic.h \
+macros.o: macros.c ../utils/magic.h ../utils/main.h ../windows/windows.h \
  ../utils/geometry.h ../database/database.h ../tiles/tile.h \
- ../utils/hash.h ../utils/malloc.h ../utils/magsgtty.h ../utils/macros.h \
- ../textio/textio.h ../textio/txcommands.h ../utils/tech.h ../drc/drc.h \
- ../graphics/graphics.h ../dbwind/dbwind.h ../commands/commands.h \
- ../utils/signals.h ../utils/utils.h ../utils/runstats.h ../cif/cif.h \
- ../router/router.h ../lef/lef.h ../extract/extract.h ../utils/undo.h \
- ../netmenu/netmenu.h ../plow/plow.h ../utils/paths.h ../wiring/wiring.h \
- ../plot/plot.h ../sim/sim.h ../utils/list.h ../mzrouter/mzrouter.h \
- ../lisp/lisp.h ../graphics/wind3d.h
+ ../utils/hash.h ../utils/utils.h ../utils/malloc.h ../utils/macros.h
+main.o: main.c ../tcltk/tclmagic.h ../utils/main.h ../windows/windows.h \
+ ../utils/magic.h ../utils/geometry.h ../database/database.h \
+ ../tiles/tile.h ../utils/hash.h ../utils/malloc.h ../utils/magsgtty.h \
+ ../utils/macros.h ../textio/textio.h ../textio/txcommands.h \
+ ../utils/tech.h ../drc/drc.h ../graphics/graphics.h ../dbwind/dbwind.h \
+ ../commands/commands.h ../utils/signals.h ../utils/utils.h \
+ ../utils/runstats.h ../cif/cif.h ../router/router.h ../lef/lef.h \
+ ../extract/extract.h ../utils/undo.h ../netmenu/netmenu.h ../plow/plow.h \
+ ../utils/paths.h ../wiring/wiring.h ../plot/plot.h ../sim/sim.h \
+ ../utils/list.h ../mzrouter/mzrouter.h ../lisp/lisp.h \
+ ../graphics/wind3d.h
 malloc.o: malloc.c ../tcltk/tclmagic.h ../utils/magic.h ../utils/malloc.h
 match.o: match.c ../utils/magic.h ../textio/textio.h
 maxrect.o: maxrect.c ../utils/maxrect.h ../database/database.h \
@@ -63,9 +64,9 @@ set.o: set.c ../utils/magic.h ../utils/utils.h ../utils/geometry.h \
 show.o: show.c ../utils/magic.h ../utils/geometry.h ../windows/windows.h \
  ../graphics/graphics.h ../utils/hash.h ../tiles/tile.h \
  ../database/database.h ../dbwind/dbwind.h
-tech.o: tech.c ../utils/magic.h ../utils/geometry.h ../utils/utils.h \
- ../utils/tech.h ../textio/textio.h ../windows/windows.h \
- ../utils/malloc.h
+tech.o: tech.c ../database/database.h ../tiles/tile.h ../utils/magic.h \
+ ../utils/geometry.h ../utils/hash.h ../utils/utils.h ../utils/tech.h \
+ ../textio/textio.h ../windows/windows.h ../utils/malloc.h
 touchtypes.o: touchtypes.c ../utils/magic.h ../utils/geometry.h \
  ../utils/geofast.h ../tiles/tile.h ../utils/hash.h \
  ../database/database.h
diff --git a/windows/Depend b/windows/Depend
index 17fdaf7b..4127f723 100644
--- a/windows/Depend
+++ b/windows/Depend
@@ -10,7 +10,7 @@ windCmdAM.o: windCmdAM.c ../tcltk/tclmagic.h ../utils/magic.h \
  ../utils/signals.h ../graphics/graphics.h ../utils/styles.h \
  ../textio/txcommands.h ../graphics/glyphs.h ../windows/windInt.h \
  ../tiles/tile.h ../database/database.h ../dbwind/dbwind.h \
- ../utils/utils.h
+ ../utils/utils.h ../cif/cif.h
 windCmdNR.o: windCmdNR.c ../utils/magic.h ../textio/textio.h \
  ../utils/geometry.h ../windows/windows.h ../graphics/glyphs.h \
  ../windows/windInt.h ../tiles/tile.h ../utils/hash.h \