diff --git a/Graphics/XHB/Shared.hs b/Graphics/XHB/Shared.hs
--- a/Graphics/XHB/Shared.hs
+++ b/Graphics/XHB/Shared.hs
@@ -56,6 +56,10 @@
     fromXid = id
     toXid   = id
 
+instance XidLike Word32 where
+    fromXid (MkXid w) = w
+    toXid = MkXid
+
 xidNone :: Xid
 xidNone = MkXid 0
 
diff --git a/patched/Graphics/XHB/Gen/Extension.hs b/patched/Graphics/XHB/Gen/Extension.hs
--- a/patched/Graphics/XHB/Gen/Extension.hs
+++ b/patched/Graphics/XHB/Gen/Extension.hs
@@ -24,8 +24,8 @@
 import qualified Graphics.XHB.Gen.XPrint.Types
 import qualified Graphics.XHB.Gen.SELinux.Types
 import qualified Graphics.XHB.Gen.Test.Types
-import qualified Graphics.XHB.Gen.XvMC.Types
 import qualified Graphics.XHB.Gen.Xv.Types
+import qualified Graphics.XHB.Gen.XvMC.Types
  
 errorDispatch :: ExtensionId -> Word8 -> Maybe (Get SomeError)
 errorDispatch "BIG-REQUESTS"
@@ -69,9 +69,9 @@
   = Graphics.XHB.Gen.SELinux.Types.deserializeError
 errorDispatch "XTEST"
   = Graphics.XHB.Gen.Test.Types.deserializeError
+errorDispatch "XVideo" = Graphics.XHB.Gen.Xv.Types.deserializeError
 errorDispatch "XVideo-MotionCompensation"
   = Graphics.XHB.Gen.XvMC.Types.deserializeError
-errorDispatch "XVideo" = Graphics.XHB.Gen.Xv.Types.deserializeError
 errorDispatch _ = const (Nothing)
  
 eventDispatch :: ExtensionId -> Word8 -> Maybe (Get SomeEvent)
@@ -116,7 +116,7 @@
   = Graphics.XHB.Gen.SELinux.Types.deserializeEvent
 eventDispatch "XTEST"
   = Graphics.XHB.Gen.Test.Types.deserializeEvent
+eventDispatch "XVideo" = Graphics.XHB.Gen.Xv.Types.deserializeEvent
 eventDispatch "XVideo-MotionCompensation"
   = Graphics.XHB.Gen.XvMC.Types.deserializeEvent
-eventDispatch "XVideo" = Graphics.XHB.Gen.Xv.Types.deserializeEvent
 eventDispatch _ = const (Nothing)
diff --git a/xhb.cabal b/xhb.cabal
--- a/xhb.cabal
+++ b/xhb.cabal
@@ -1,5 +1,5 @@
 Name:         xhb
-Version:      0.3.2009.6.28
+Version:      0.4.2010.12.26
 Cabal-Version:  >= 1.2.3
 Synopsis:     X Haskell Bindings
 Description:
@@ -8,8 +8,8 @@
   Similar to XCB - the X C Bindings.
   .
   This library is based on version 1.5 of the xcb-proto
-  package.  See http:\/\/xcb.freedesktop.org\/XmlXcb\/ and
-  http:\/\/xcb.freedesktop.org\/dist\/ .
+  package.  See http://xcb.freedesktop.org/XmlXcb/ and
+  http://xcb.freedesktop.org/dist/ .
 
 License:      BSD3
 License-file: LICENSE
@@ -59,8 +59,8 @@
    Graphics.XHB.Gen.Xproto,
    Graphics.XHB.Gen.SELinux,
    Graphics.XHB.Gen.Test,
-   Graphics.XHB.Gen.XvMC,
-   Graphics.XHB.Gen.Xv
+   Graphics.XHB.Gen.Xv,
+   Graphics.XHB.Gen.XvMC
 
  Other-modules:
    Graphics.XHB.Shared,
@@ -90,10 +90,9 @@
    Graphics.XHB.Gen.Xproto.Types,
    Graphics.XHB.Gen.SELinux.Types,
    Graphics.XHB.Gen.Test.Types,
-   Graphics.XHB.Gen.XvMC.Types,
    Graphics.XHB.Gen.Xv.Types,
+   Graphics.XHB.Gen.XvMC.Types,
    Graphics.XHB.Gen.Extension
 
  hs-source-dirs: . patched
-