diff --git a/src/packages.scm b/src/packages.scm
index 1cb6e26..edde81d 100644
--- a/src/packages.scm
+++ b/src/packages.scm
@@ -26,20 +26,23 @@
 	  text-center-pos
 	  window-level
 	  point-in-rectangle?
+	  set-wm-state! get-wm-state ((wm-state) :syntax)
 
 	  maximize-window maximal-size/hints
 	  size-window desired-size/hints desired-position/hints
-	  install-colormaps uninstall-colormaps)
+	  install-colormaps uninstall-colormaps
+	  
+	  now at-time-rv after-time-rv)
   (open scheme i/o list-lib define-record-types finite-types enum-sets
-	threads locks placeholders rendezvous
-	signals handle
+	threads locks placeholders rendezvous rendezvous-channels
+	signals handle scsh
 	rx-syntax field-reader-package
 	xlib)
   (files utils))
 
 (define-structure dragging
   (export install-dragging-control)
-  (open scheme define-record-types threads
+  (open scheme define-record-types threads list-lib
 	rendezvous-channels rendezvous
 	xlib
 	utils)
@@ -52,7 +55,7 @@
   (open scheme define-record-types threads list-lib
 	rendezvous-channels rendezvous
 	xlib
-	utils)
+	utils button)
   (files titlebar))
 
 (define-structure prompt
@@ -62,6 +65,16 @@
 	utils)
   (files prompt))
 
+(define-structure button
+  (export create-button destroy-button
+	  map-button unmap-button
+	  move-resize-button)
+  (open scheme list-lib rendezvous-channels
+	define-record-types
+	xlib
+	utils)
+  (files button))
+
 ;; *** key-grab ******************************************************
 
 (define-structure key-grab