diff -ur saods9/htmlwidget/makemake.tcl.in saods9.new/htmlwidget/makemake.tcl.in
--- saods9/htmlwidget/makemake.tcl.in	2005-11-09 01:06:08.000000000 +0100
+++ saods9.new/htmlwidget/makemake.tcl.in	2010-03-30 12:38:29.000000000 +0200
@@ -360,9 +360,7 @@
 
 # A target to build everything.
 #
-set all ${PFX}hwish${TEXE}
-lappend all ${PFX}hv${TEXE}
-lappend all ${PFX}ss${TEXE}
+set all libtkhtml.a
 if {"@ENABLE_SHLIB@"=="1"} {
   lappend all tkhtml@TARGET_SHLIB_EXT@
 #  lappend all tkhtml.so
diff -ur saods9/saotk/colorbar/Makefile saods9.new/saotk/colorbar/Makefile
--- saods9/saotk/colorbar/Makefile	2010-03-30 12:37:51.000000000 +0200
+++ saods9.new/saotk/colorbar/Makefile	2010-03-30 12:38:49.000000000 +0200
@@ -2,7 +2,7 @@
 
 CXXFLAGS = $(CXXOPT) \
 	-I. -I.. -I../widget -I../vector -I../util \
-	-I../../include -I$(X11INCLUDE)
+	-I../../include -I$(X11INCLUDE) -I/usr/include/tk-private/unix
 
 SS	= \
 	cbgrid.C \
diff -ur saods9/saotk/frame/Makefile saods9.new/saotk/frame/Makefile
--- saods9/saotk/frame/Makefile	2010-03-30 12:37:51.000000000 +0200
+++ saods9.new/saotk/frame/Makefile	2010-03-30 12:39:27.000000000 +0200
@@ -6,6 +6,7 @@
 	-I../../include -I$(X11INCLUDE) \
 	-I/usr/include/funtools/util -I/usr/include/blt -I/usr/include/wcs\
 	-I/usr/include/libxml2 \
+	-I/usr/include/tk-private/unix \
 	-I../../$(ASTDIR)
 
 SS	= \
diff -ur saods9/saotk/util/tkpostscript.h saods9.new/saotk/util/tkpostscript.h
--- saods9/saotk/util/tkpostscript.h	2010-03-30 12:37:51.000000000 +0200
+++ saods9.new/saotk/util/tkpostscript.h	2010-03-30 12:39:49.000000000 +0200
@@ -4,6 +4,7 @@
 
 // this is copied from tkCanvPs.c
 
+#include <tk-private/generic/tkInt.h>
 #include <tk-private/generic/tkCanvas.h>
 
 typedef struct TkPostscriptInfo {