diff --git a/Packages/cgal_window/changes.txt b/Packages/cgal_window/changes.txt
index 7400da13cbf..f6f76113e21 100644
--- a/Packages/cgal_window/changes.txt
+++ b/Packages/cgal_window/changes.txt
@@ -1,3 +1,6 @@
+0.9.9  /test subdir added
+       some Makefiles were removed
+
 0.9.8  a few file headers were fixed
 
 0.9.7  first version for an internal release ...
diff --git a/Packages/cgal_window/src/CGALWin/Make.lst b/Packages/cgal_window/src/CGALWin/Make.lst
deleted file mode 100644
index 8f3abca1ae0..00000000000
--- a/Packages/cgal_window/src/CGALWin/Make.lst
+++ /dev/null
@@ -1,10 +0,0 @@
-
-OBJECTS = \
-_basic$(o) \
-_base_window$(o) \
-_base_panel$(o) \
-_color$(o) \
-_file$(o) \
-_file_panel$(o) \
-_string_manip$(o) \
-_window$(o)
diff --git a/Packages/cgal_window/src/CGALWin/Makefile b/Packages/cgal_window/src/CGALWin/Makefile
deleted file mode 100644
index a8808de9bef..00000000000
--- a/Packages/cgal_window/src/CGALWin/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-D = window
-
-L = libCGALWin
-
-include ../Make.src
-
diff --git a/Packages/cgal_window/src/CGALWin/mswin/Make.lst b/Packages/cgal_window/src/CGALWin/mswin/Make.lst
deleted file mode 100644
index 8c7da89b456..00000000000
--- a/Packages/cgal_window/src/CGALWin/mswin/Make.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-
-OBJECTS = _x_basic$(o)
-
diff --git a/Packages/cgal_window/src/CGALWin/mswin/Makefile b/Packages/cgal_window/src/CGALWin/mswin/Makefile
deleted file mode 100644
index 22f3ab6f4e2..00000000000
--- a/Packages/cgal_window/src/CGALWin/mswin/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-D = mswin
-
-L = ..\libCGALWin
-
-include ../../Make.src
-
diff --git a/Packages/cgal_window/src/CGALWin/mswin/Makefilewin b/Packages/cgal_window/src/CGALWin/mswin/Makefilewin
deleted file mode 100644
index 22f3ab6f4e2..00000000000
--- a/Packages/cgal_window/src/CGALWin/mswin/Makefilewin
+++ /dev/null
@@ -1,6 +0,0 @@
-D = mswin
-
-L = ..\libCGALWin
-
-include ../../Make.src
-
diff --git a/Packages/cgal_window/src/CGALWin/x11/Make.lst b/Packages/cgal_window/src/CGALWin/x11/Make.lst
deleted file mode 100644
index 327a5ce4b1d..00000000000
--- a/Packages/cgal_window/src/CGALWin/x11/Make.lst
+++ /dev/null
@@ -1,7 +0,0 @@
-
-OBJECTS = _x_basic$(o)
-
-# _x_basic.c cannot be compiled with -O ?
-
-CFLAGS=
-
diff --git a/Packages/cgal_window/src/CGALWin/x11/Makefile b/Packages/cgal_window/src/CGALWin/x11/Makefile
deleted file mode 100644
index d9c416c6b88..00000000000
--- a/Packages/cgal_window/src/CGALWin/x11/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-DFLAGS = $(XINC_PATH)
-
-D = x11
-
-L = ../libCGALWin
-
-include ../../Make.src
-
diff --git a/Packages/cgal_window/test/cgal_window/bitmap.C b/Packages/cgal_window/test/cgal_window/bitmap.C
index a8e03d57baa..bed12230519 100644
--- a/Packages/cgal_window/test/cgal_window/bitmap.C
+++ b/Packages/cgal_window/test/cgal_window/bitmap.C
@@ -13,8 +13,10 @@ list<std::string>        L2;
 #endif
 */
 
-int main()
+int main(int argc, char *argv[])
 { 
+  if (argc >= 2) { return 0; }
+
   CGAL::window W(400,400);
   W.set_bg_color(CGAL::yellow);
   W.display();
diff --git a/Packages/cgal_window/test/cgal_window/bitmap.cmd b/Packages/cgal_window/test/cgal_window/bitmap.cmd
new file mode 100755
index 00000000000..842dea93d7e
--- /dev/null
+++ b/Packages/cgal_window/test/cgal_window/bitmap.cmd
@@ -0,0 +1 @@
+do not execute 
diff --git a/Packages/cgal_window/test/cgal_window/bm_buttons.C b/Packages/cgal_window/test/cgal_window/bm_buttons.C
index 96350c0f1e1..97a30205d90 100644
--- a/Packages/cgal_window/test/cgal_window/bm_buttons.C
+++ b/Packages/cgal_window/test/cgal_window/bm_buttons.C
@@ -5,8 +5,10 @@
 
 using namespace std;
 
-int main()
+int main(int argc, char *argv[])
 { 
+  if (argc >= 2) { return 0; }
+
   CGAL::panel P("Bitmap Buttons");
   P.buttons_per_line(8);
   P.set_button_space(3);
diff --git a/Packages/cgal_window/test/cgal_window/bm_buttons.cmd b/Packages/cgal_window/test/cgal_window/bm_buttons.cmd
new file mode 100755
index 00000000000..842dea93d7e
--- /dev/null
+++ b/Packages/cgal_window/test/cgal_window/bm_buttons.cmd
@@ -0,0 +1 @@
+do not execute 
diff --git a/Packages/cgal_window/test/cgal_window/event.C b/Packages/cgal_window/test/cgal_window/event.C
index 8c2cb19edfa..3203276d3aa 100644
--- a/Packages/cgal_window/test/cgal_window/event.C
+++ b/Packages/cgal_window/test/cgal_window/event.C
@@ -3,8 +3,10 @@
 #include <CGAL/LEDA/window.h>
 #include <cmath>
 
-int main()
+int main(int argc, char *argv[])
 {
+  if (argc >= 2) { return 0; }
+
   CGAL::window W(450,500,"Event Demo");
   W.display();
 
diff --git a/Packages/cgal_window/test/cgal_window/event.cmd b/Packages/cgal_window/test/cgal_window/event.cmd
new file mode 100755
index 00000000000..842dea93d7e
--- /dev/null
+++ b/Packages/cgal_window/test/cgal_window/event.cmd
@@ -0,0 +1 @@
+do not execute 
diff --git a/Packages/cgal_window/test/cgal_window/filepanel.C b/Packages/cgal_window/test/cgal_window/filepanel.C
index a8659e22bf5..e9b9130b2ca 100644
--- a/Packages/cgal_window/test/cgal_window/filepanel.C
+++ b/Packages/cgal_window/test/cgal_window/filepanel.C
@@ -14,8 +14,10 @@ void dummy(string fn)
  std::cout << "dummy got parameter " << fn << "\n"; 
 }
 
-int main()
+int main(int argc, char *argv[])
 {
+ if (argc >= 2) { return 0; }
+
  CGAL::window Win(600,600);
  Win.init(0,600,0);
  
diff --git a/Packages/cgal_window/test/cgal_window/filepanel.cmd b/Packages/cgal_window/test/cgal_window/filepanel.cmd
new file mode 100755
index 00000000000..842dea93d7e
--- /dev/null
+++ b/Packages/cgal_window/test/cgal_window/filepanel.cmd
@@ -0,0 +1 @@
+do not execute 
diff --git a/Packages/cgal_window/test/cgal_window/loadtest.C b/Packages/cgal_window/test/cgal_window/loadtest.C
index 9a8e14076d6..5bf47f7e193 100644
--- a/Packages/cgal_window/test/cgal_window/loadtest.C
+++ b/Packages/cgal_window/test/cgal_window/loadtest.C
@@ -28,8 +28,10 @@ void dummy(string fn)
  std::cout << "dummy got parameter " << fn << "\n"; 
 }
 
-int main()
+int main(int argc, char *argv[])
 {
+ if (argc >= 2) { return 0; }
+
  CGAL::window Win(600,600);
  Win.init(0,600,0);
  
diff --git a/Packages/cgal_window/test/cgal_window/loadtest.cmd b/Packages/cgal_window/test/cgal_window/loadtest.cmd
new file mode 100755
index 00000000000..842dea93d7e
--- /dev/null
+++ b/Packages/cgal_window/test/cgal_window/loadtest.cmd
@@ -0,0 +1 @@
+do not execute 
diff --git a/Packages/cgal_window/test/cgal_window/menu_bar.C b/Packages/cgal_window/test/cgal_window/menu_bar.C
index 32dd2bd75a6..c5b0ffd9ab8 100644
--- a/Packages/cgal_window/test/cgal_window/menu_bar.C
+++ b/Packages/cgal_window/test/cgal_window/menu_bar.C
@@ -4,7 +4,9 @@
 #include <CGAL/LEDA/file.h>
 
 
-int main() {
+int main(int argc, char *argv[]) 
+{
+  if (argc >= 2) { return 0; }
 
   CGAL::menu M;
   M.button("button 1");
diff --git a/Packages/cgal_window/test/cgal_window/menu_bar.cmd b/Packages/cgal_window/test/cgal_window/menu_bar.cmd
new file mode 100755
index 00000000000..842dea93d7e
--- /dev/null
+++ b/Packages/cgal_window/test/cgal_window/menu_bar.cmd
@@ -0,0 +1 @@
+do not execute 
diff --git a/Packages/cgal_window/test/cgal_window/panel_demo.C b/Packages/cgal_window/test/cgal_window/panel_demo.C
index ad8d20d3034..6e325a46227 100644
--- a/Packages/cgal_window/test/cgal_window/panel_demo.C
+++ b/Packages/cgal_window/test/cgal_window/panel_demo.C
@@ -16,8 +16,10 @@ static unsigned char* bm_bits [] = {
 using namespace std;
 
 
-int main()
+int main(int argc, char *argv[])
 { 
+  if (argc >= 2) { return 0; }  
+
   bool   B     = false;
   CGAL::color  col   = CGAL::blue2;
   double R     = 3.1415;
diff --git a/Packages/cgal_window/test/cgal_window/panel_demo.cmd b/Packages/cgal_window/test/cgal_window/panel_demo.cmd
new file mode 100755
index 00000000000..842dea93d7e
--- /dev/null
+++ b/Packages/cgal_window/test/cgal_window/panel_demo.cmd
@@ -0,0 +1 @@
+do not execute 
diff --git a/Packages/cgal_window/test/cgal_window/progress.C b/Packages/cgal_window/test/cgal_window/progress.C
index eb12769fe81..005a7421876 100644
--- a/Packages/cgal_window/test/cgal_window/progress.C
+++ b/Packages/cgal_window/test/cgal_window/progress.C
@@ -2,8 +2,10 @@
 
 #include <CGAL/LEDA/window.h>
 
-int main()
+int main(int argc, char *argv[])
 {
+  if (argc >= 2) { return 0; }
+
   int count = 0;
 
   CGAL::window W(400,100);
diff --git a/Packages/cgal_window/test/cgal_window/progress.cmd b/Packages/cgal_window/test/cgal_window/progress.cmd
new file mode 100755
index 00000000000..842dea93d7e
--- /dev/null
+++ b/Packages/cgal_window/test/cgal_window/progress.cmd
@@ -0,0 +1 @@
+do not execute 
diff --git a/Packages/cgal_window/version b/Packages/cgal_window/version
index 979179116b1..cc7edabce03 100644
--- a/Packages/cgal_window/version
+++ b/Packages/cgal_window/version
@@ -1 +1 @@
-0.9.8 (12 Jun 2001)
+0.9.9 (19 June 2001)