diff --git a/scheme/xlib/xlib-interfaces.scm b/scheme/xlib/xlib-interfaces.scm
index 2d46348..a575eb3 100644
--- a/scheme/xlib/xlib-interfaces.scm
+++ b/scheme/xlib/xlib-interfaces.scm
@@ -304,7 +304,12 @@
 (define-interface xlib-event-interface
   (export 
    wait-event
+   next-event
    send-event
+   event-ready?
+   events-pending
+   events-queued
+   ((queued-mode) :syntax)
 	  
    ((event-type) :syntax)
    any-event-type
@@ -714,7 +719,9 @@
 	  change-save-set
 	  set-close-down-mode
 	  get-pointer-mapping
-	  set-pointer-mapping))
+	  set-pointer-mapping
+	  ((wm-state) :syntax)
+	  get-wm-state set-wm-state))
 
 (define-interface xlib-client-interface
   (export iconify-window
@@ -846,31 +853,33 @@
    display? display-after-function 
    display-set-after-function! close-display
    special-time:current-time
+   display-Xdisplay
 
    window? destroy-window window-display
    window-tag window-set-tag!
    special-window:none special-window:pointer-window
    special-window:input-focus special-window:pointer-root
+   window-Xwindow
 
-   drawable? drawable-display
+   drawable? drawable-display drawable-Xobject
 
-   color?
+   color? color-Xcolor
 
-   colormap? free-colormap colormap-display
+   colormap? free-colormap colormap-display colormap-Xcolormap
 
-   pixel?
+   pixel? pixel-Xpixel pixel-colormap
 
    gcontext? free-gcontext gcontext? gcontext-display
-   special-gcontext:none
+   special-gcontext:none gcontext-Xgcontext
 
-   pixmap? free-pixmap pixmap-display
+   pixmap? free-pixmap pixmap-display pixmap-Xpixmap
 
    font? font-display font-name open-font close-font
-   special-font:none
+   special-font:none font-Xfont font-Xfontstruct
 
-   atom? make-atom intern-atom special-atom:none
+   atom? make-atom intern-atom special-atom:none atom-Xatom
 
-   cursor? cursor-display free-cursor
+   cursor? cursor-display free-cursor cursor-Xcursor
 
    visual?
 
diff --git a/scheme/xlib/xlib-internal-interfaces.scm b/scheme/xlib/xlib-internal-interfaces.scm
index 148599b..daebdd8 100644
--- a/scheme/xlib/xlib-internal-interfaces.scm
+++ b/scheme/xlib/xlib-internal-interfaces.scm
@@ -25,7 +25,7 @@
 
    colormap? make-colormap free-colormap colormap-display colormap-Xcolormap
 
-   pixel? make-pixel pixel-Xpixel
+   pixel? make-pixel pixel-Xpixel pixel-colormap
 
    gcontext? make-gcontext free-gcontext gcontext? gcontext-display
    gcontext-Xgcontext special-gcontext:none
diff --git a/scheme/xlib/xlib-packages.scm b/scheme/xlib/xlib-packages.scm
index f8f902f..074af42 100644
--- a/scheme/xlib/xlib-packages.scm
+++ b/scheme/xlib/xlib-packages.scm
@@ -141,6 +141,7 @@
 	external-calls
 	xlib-internal-types
 	signals ;; for error
+	xlib-property ;; get-property and change-property
 	finite-types
 	xlib-helper)
   (files wm))