29 files changed, 228 insertions, 198 deletions
diff --git a/nexgb/bigreq/bigreq.go b/nexgb/bigreq/bigreq.go
index 8bb05c1..c2263a0 100644
--- a/nexgb/bigreq/bigreq.go
+++ b/nexgb/bigreq/bigreq.go
@@ -1,7 +1,8 @@
+// Package bigreq is the X client API for the BIG-REQUESTS extension.
 package bigreq
 
 /*
-	This file was generated by bigreq.xml on May 10 2012 4:20:27pm EDT.
+	This file was generated by bigreq.xml on May 10 2012 8:04:31pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +40,16 @@ func init() {
 	xgb.NewExtErrorFuncs["BIG-REQUESTS"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -53,16 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Request Enable
 // size: 4
 type EnableCookie struct {
diff --git a/nexgb/composite/composite.go b/nexgb/composite/composite.go
index 266c087..5a3d7c4 100644
--- a/nexgb/composite/composite.go
+++ b/nexgb/composite/composite.go
@@ -1,7 +1,8 @@
+// Package composite is the X client API for the Composite extension.
 package composite
 
 /*
-	This file was generated by composite.xml on May 10 2012 4:20:27pm EDT.
+	This file was generated by composite.xml on May 10 2012 8:04:31pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
diff --git a/nexgb/damage/damage.go b/nexgb/damage/damage.go
index 8fe1e38..8c59f55 100644
--- a/nexgb/damage/damage.go
+++ b/nexgb/damage/damage.go
@@ -1,7 +1,8 @@
+// Package damage is the X client API for the DAMAGE extension.
 package damage
 
 /*
-	This file was generated by damage.xml on May 10 2012 4:20:27pm EDT.
+	This file was generated by damage.xml on May 10 2012 8:04:31pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,12 +41,6 @@ func init() {
 	xgb.NewExtErrorFuncs["DAMAGE"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
 // Skipping definition for base type 'Int32'
 
 // Skipping definition for base type 'Void'
@@ -64,6 +59,12 @@ func init() {
 
 // Skipping definition for base type 'Bool'
 
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
 const (
 	ReportLevelRawRectangles   = 0
 	ReportLevelDeltaRectangles = 1
diff --git a/nexgb/dpms/dpms.go b/nexgb/dpms/dpms.go
index 01314ac..de748e4 100644
--- a/nexgb/dpms/dpms.go
+++ b/nexgb/dpms/dpms.go
@@ -1,7 +1,8 @@
+// Package dpms is the X client API for the DPMS extension.
 package dpms
 
 /*
-	This file was generated by dpms.xml on May 10 2012 4:20:27pm EDT.
+	This file was generated by dpms.xml on May 10 2012 8:04:31pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,10 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["DPMS"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
 // Skipping definition for base type 'Byte'
 
 // Skipping definition for base type 'Int8'
@@ -63,6 +60,10 @@ func init() {
 
 // Skipping definition for base type 'Int16'
 
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
 const (
 	DPMSModeOn      = 0
 	DPMSModeStandby = 1
diff --git a/nexgb/dri2/dri2.go b/nexgb/dri2/dri2.go
index cffe20e..c875111 100644
--- a/nexgb/dri2/dri2.go
+++ b/nexgb/dri2/dri2.go
@@ -1,7 +1,8 @@
+// Package dri2 is the X client API for the DRI2 extension.
 package dri2
 
 /*
-	This file was generated by dri2.xml on May 10 2012 4:20:27pm EDT.
+	This file was generated by dri2.xml on May 10 2012 8:04:31pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,14 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["DRI2"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
-// Skipping definition for base type 'Int8'
-
-// Skipping definition for base type 'Card16'
-
 // Skipping definition for base type 'Char'
 
 // Skipping definition for base type 'Card32'
@@ -63,6 +56,14 @@ func init() {
 
 // Skipping definition for base type 'Int32'
 
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
+// Skipping definition for base type 'Card16'
+
 const (
 	AttachmentBufferFrontLeft      = 0
 	AttachmentBufferBackLeft       = 1
diff --git a/nexgb/ge/ge.go b/nexgb/ge/ge.go
index 7753e28..5bb11fa 100644
--- a/nexgb/ge/ge.go
+++ b/nexgb/ge/ge.go
@@ -1,7 +1,8 @@
+// Package ge is the X client API for the Generic Event Extension extension.
 package ge
 
 /*
-	This file was generated by ge.xml on May 10 2012 4:20:27pm EDT.
+	This file was generated by ge.xml on May 10 2012 8:04:31pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,18 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["Generic Event Extension"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card16'
-
-// Skipping definition for base type 'Char'
-
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
 // Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Int16'
@@ -63,6 +52,18 @@ func init() {
 
 // Skipping definition for base type 'Int8'
 
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Char'
+
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
 // Request QueryVersion
 // size: 8
 type QueryVersionCookie struct {
diff --git a/nexgb/glx/glx.go b/nexgb/glx/glx.go
index 0aa2e55..887d96b 100644
--- a/nexgb/glx/glx.go
+++ b/nexgb/glx/glx.go
@@ -1,7 +1,8 @@
+// Package glx is the X client API for the GLX extension.
 package glx
 
 /*
-	This file was generated by glx.xml on May 10 2012 4:20:27pm EDT.
+	This file was generated by glx.xml on May 10 2012 8:04:31pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +40,8 @@ func init() {
 	xgb.NewExtErrorFuncs["GLX"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Float'
+
 // Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Int16'
@@ -61,8 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Bool'
 
-// Skipping definition for base type 'Float'
-
 const (
 	PbcetDamaged = 32791
 	PbcetSaved   = 32792
diff --git a/nexgb/randr/randr.go b/nexgb/randr/randr.go
index 4d78691..ba8c0f2 100644
--- a/nexgb/randr/randr.go
+++ b/nexgb/randr/randr.go
@@ -1,7 +1,8 @@
+// Package randr is the X client API for the RANDR extension.
 package randr
 
 /*
-	This file was generated by randr.xml on May 10 2012 4:20:27pm EDT.
+	This file was generated by randr.xml on May 10 2012 8:04:31pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,8 +41,6 @@ func init() {
 	xgb.NewExtErrorFuncs["RANDR"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Int32'
-
 // Skipping definition for base type 'Void'
 
 // Skipping definition for base type 'Byte'
@@ -64,6 +63,8 @@ func init() {
 
 // Skipping definition for base type 'Int16'
 
+// Skipping definition for base type 'Int32'
+
 const (
 	RotationRotate0   = 1
 	RotationRotate90  = 2
diff --git a/nexgb/record/record.go b/nexgb/record/record.go
index 04d514b..740353d 100644
--- a/nexgb/record/record.go
+++ b/nexgb/record/record.go
@@ -1,7 +1,8 @@
+// Package record is the X client API for the RECORD extension.
 package record
 
 /*
-	This file was generated by record.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by record.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +40,10 @@ func init() {
 	xgb.NewExtErrorFuncs["RECORD"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
 // Skipping definition for base type 'Int16'
 
 // Skipping definition for base type 'Int32'
@@ -59,10 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Bool'
 
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
 const (
 	HTypeFromServerTime     = 1
 	HTypeFromClientTime     = 2
diff --git a/nexgb/render/render.go b/nexgb/render/render.go
index a939ed9..ca3f9bd 100644
--- a/nexgb/render/render.go
+++ b/nexgb/render/render.go
@@ -1,7 +1,8 @@
+// Package render is the X client API for the RENDER extension.
 package render
 
 /*
-	This file was generated by render.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by render.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +40,10 @@ func init() {
 	xgb.NewExtErrorFuncs["RENDER"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
 // Skipping definition for base type 'Int32'
 
 // Skipping definition for base type 'Void'
@@ -59,10 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
 const (
 	PictTypeIndexed = 0
 	PictTypeDirect  = 1
diff --git a/nexgb/res/res.go b/nexgb/res/res.go
index aa958ab..e81fa96 100644
--- a/nexgb/res/res.go
+++ b/nexgb/res/res.go
@@ -1,7 +1,8 @@
+// Package res is the X client API for the X-Resource extension.
 package res
 
 /*
-	This file was generated by res.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by res.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +40,14 @@ func init() {
 	xgb.NewExtErrorFuncs["X-Resource"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
 // Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Int16'
@@ -55,14 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Char'
 
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
 // 'Client' struct definition
 // Size: 8
 type Client struct {
diff --git a/nexgb/screensaver/screensaver.go b/nexgb/screensaver/screensaver.go
index d9353f2..f11113e 100644
--- a/nexgb/screensaver/screensaver.go
+++ b/nexgb/screensaver/screensaver.go
@@ -1,7 +1,8 @@
+// Package screensaver is the X client API for the MIT-SCREEN-SAVER extension.
 package screensaver
 
 /*
-	This file was generated by screensaver.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by screensaver.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +40,16 @@ func init() {
 	xgb.NewExtErrorFuncs["MIT-SCREEN-SAVER"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
 // Skipping definition for base type 'Void'
 
 // Skipping definition for base type 'Byte'
@@ -53,16 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Double'
 
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
 const (
 	KindBlanked  = 0
 	KindInternal = 1
diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index 5d9dbf3..97be0f7 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -1,7 +1,8 @@
+// Package shape is the X client API for the SHAPE extension.
 package shape
 
 /*
-	This file was generated by shape.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by shape.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,14 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["SHAPE"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
 // Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Int16'
@@ -63,6 +56,14 @@ func init() {
 
 // Skipping definition for base type 'Char'
 
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
 const (
 	SoSet       = 0
 	SoUnion     = 1
diff --git a/nexgb/shm/shm.go b/nexgb/shm/shm.go
index ecffafc..d262667 100644
--- a/nexgb/shm/shm.go
+++ b/nexgb/shm/shm.go
@@ -1,7 +1,8 @@
+// Package shm is the X client API for the MIT-SHM extension.
 package shm
 
 /*
-	This file was generated by shm.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by shm.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
diff --git a/nexgb/sync/sync.go b/nexgb/sync/sync.go
index 689a5c3..cde5cab 100644
--- a/nexgb/sync/sync.go
+++ b/nexgb/sync/sync.go
@@ -1,7 +1,8 @@
+// Package sync is the X client API for the SYNC extension.
 package sync
 
 /*
-	This file was generated by sync.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by sync.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,14 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["SYNC"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
 // Skipping definition for base type 'Int32'
 
 // Skipping definition for base type 'Void'
@@ -63,6 +56,14 @@ func init() {
 
 // Skipping definition for base type 'Double'
 
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
 const (
 	AlarmstateActive    = 0
 	AlarmstateInactive  = 1
diff --git a/nexgb/xcmisc/xcmisc.go b/nexgb/xcmisc/xcmisc.go
index 324d455..d4f7b0d 100644
--- a/nexgb/xcmisc/xcmisc.go
+++ b/nexgb/xcmisc/xcmisc.go
@@ -1,7 +1,8 @@
+// Package xcmisc is the X client API for the XC-MISC extension.
 package xcmisc
 
 /*
-	This file was generated by xc_misc.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by xc_misc.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +40,8 @@ func init() {
 	xgb.NewExtErrorFuncs["XC-MISC"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Float'
+
 // Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Int16'
@@ -61,8 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Bool'
 
-// Skipping definition for base type 'Float'
-
 // Request GetVersion
 // size: 8
 type GetVersionCookie struct {
diff --git a/nexgb/xevie/xevie.go b/nexgb/xevie/xevie.go
index c3943f9..47d9146 100644
--- a/nexgb/xevie/xevie.go
+++ b/nexgb/xevie/xevie.go
@@ -1,7 +1,8 @@
+// Package xevie is the X client API for the XEVIE extension.
 package xevie
 
 /*
-	This file was generated by xevie.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by xevie.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +40,16 @@ func init() {
 	xgb.NewExtErrorFuncs["XEVIE"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -53,16 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 const (
 	DatatypeUnmodified = 0
 	DatatypeModified   = 1
diff --git a/nexgb/xf86dri/xf86dri.go b/nexgb/xf86dri/xf86dri.go
index 0259729..ac87c0a 100644
--- a/nexgb/xf86dri/xf86dri.go
+++ b/nexgb/xf86dri/xf86dri.go
@@ -1,7 +1,8 @@
+// Package xf86dri is the X client API for the XFree86-DRI extension.
 package xf86dri
 
 /*
-	This file was generated by xf86dri.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by xf86dri.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,16 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XFree86-DRI"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -63,6 +54,16 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // 'DrmClipRect' struct definition
 // Size: 8
 type DrmClipRect struct {
diff --git a/nexgb/xf86vidmode/xf86vidmode.go b/nexgb/xf86vidmode/xf86vidmode.go
index 4137df8..d32f601 100644
--- a/nexgb/xf86vidmode/xf86vidmode.go
+++ b/nexgb/xf86vidmode/xf86vidmode.go
@@ -1,7 +1,8 @@
+// Package xf86vidmode is the X client API for the XFree86-VidModeExtension extension.
 package xf86vidmode
 
 /*
-	This file was generated by xf86vidmode.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by xf86vidmode.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
diff --git a/nexgb/xfixes/xfixes.go b/nexgb/xfixes/xfixes.go
index 7115e02..3b6bbea 100644
--- a/nexgb/xfixes/xfixes.go
+++ b/nexgb/xfixes/xfixes.go
@@ -1,7 +1,8 @@
+// Package xfixes is the X client API for the XFIXES extension.
 package xfixes
 
 /*
-	This file was generated by xfixes.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by xfixes.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -41,6 +42,16 @@ func init() {
 	xgb.NewExtErrorFuncs["XFIXES"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -55,16 +66,6 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 const (
 	SaveSetModeInsert = 0
 	SaveSetModeDelete = 1
diff --git a/nexgb/xgbgen/context.go b/nexgb/xgbgen/context.go
index 67699cf..c40313f 100644
--- a/nexgb/xgbgen/context.go
+++ b/nexgb/xgbgen/context.go
@@ -51,6 +51,8 @@ func (c *Context) Morph(xmlBytes []byte) {
 	c.protocol = parsedXml.Translate(nil)
 
 	// Start with Go header.
+	c.Putln("// Package %s is the X client API for the %s extension.",
+		c.protocol.PkgName(), c.protocol.ExtXName)
 	c.Putln("package %s", c.protocol.PkgName())
 	c.Putln("")
 	c.Putln("/*")
diff --git a/nexgb/xinerama/xinerama.go b/nexgb/xinerama/xinerama.go
index eb7cd9a..587b628 100644
--- a/nexgb/xinerama/xinerama.go
+++ b/nexgb/xinerama/xinerama.go
@@ -1,7 +1,8 @@
+// Package xinerama is the X client API for the XINERAMA extension.
 package xinerama
 
 /*
-	This file was generated by xinerama.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by xinerama.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +40,14 @@ func init() {
 	xgb.NewExtErrorFuncs["XINERAMA"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -55,14 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Card8'
 
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // 'ScreenInfo' struct definition
 // Size: 8
 type ScreenInfo struct {
diff --git a/nexgb/xinput/xinput.go b/nexgb/xinput/xinput.go
index 40635f3..cdb0fec 100644
--- a/nexgb/xinput/xinput.go
+++ b/nexgb/xinput/xinput.go
@@ -1,7 +1,8 @@
+// Package xinput is the X client API for the XInputExtension extension.
 package xinput
 
 /*
-	This file was generated by xinput.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by xinput.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,6 +40,12 @@ func init() {
 	xgb.NewExtErrorFuncs["XInputExtension"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
 // Skipping definition for base type 'Void'
 
 // Skipping definition for base type 'Byte'
@@ -57,12 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
 const (
 	ValuatorModeRelative = 0
 	ValuatorModeAbsolute = 1
diff --git a/nexgb/xprint/xprint.go b/nexgb/xprint/xprint.go
index 2fcf49f..0037a22 100644
--- a/nexgb/xprint/xprint.go
+++ b/nexgb/xprint/xprint.go
@@ -1,7 +1,8 @@
+// Package xprint is the X client API for the XpExtension extension.
 package xprint
 
 /*
-	This file was generated by xprint.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by xprint.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,16 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XpExtension"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -63,6 +54,16 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 const (
 	GetDocFinished       = 0
 	GetDocSecondConsumer = 1
diff --git a/nexgb/xproto/xproto.go b/nexgb/xproto/xproto.go
index 2516225..39956f1 100644
--- a/nexgb/xproto/xproto.go
+++ b/nexgb/xproto/xproto.go
@@ -1,7 +1,8 @@
+// Package xproto is the X client API for the  extension.
 package xproto
 
 /*
-	This file was generated by xproto.xml on May 10 2012 4:20:28pm EDT.
+	This file was generated by xproto.xml on May 10 2012 8:04:32pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -22,10 +23,6 @@ func (s *SetupInfo) DefaultScreen(c *xgb.Conn) *ScreenInfo {
 	return &s.Roots[c.DefaultScreen]
 }
 
-// Skipping definition for base type 'Int8'
-
-// Skipping definition for base type 'Card16'
-
 // Skipping definition for base type 'Char'
 
 // Skipping definition for base type 'Card32'
@@ -46,6 +43,10 @@ func (s *SetupInfo) DefaultScreen(c *xgb.Conn) *ScreenInfo {
 
 // Skipping definition for base type 'Byte'
 
+// Skipping definition for base type 'Int8'
+
+// Skipping definition for base type 'Card16'
+
 const (
 	VisualClassStaticGray  = 0
 	VisualClassGrayScale   = 1
diff --git a/nexgb/xselinux/xselinux.go b/nexgb/xselinux/xselinux.go
index 4675e90..cb0532f 100644
--- a/nexgb/xselinux/xselinux.go
+++ b/nexgb/xselinux/xselinux.go
@@ -1,7 +1,8 @@
+// Package xselinux is the X client API for the SELinux extension.
 package xselinux
 
 /*
-	This file was generated by xselinux.xml on May 10 2012 4:20:29pm EDT.
+	This file was generated by xselinux.xml on May 10 2012 8:04:33pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,14 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["SELinux"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -63,6 +56,14 @@ func init() {
 
 // Skipping definition for base type 'Card8'
 
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // 'ListItem' struct definition
 // Size: ((12 + xgb.Pad((int(ObjectContextLen) * 1))) + xgb.Pad((int(DataContextLen) * 1)))
 type ListItem struct {
diff --git a/nexgb/xtest/xtest.go b/nexgb/xtest/xtest.go
index e035fe5..357b325 100644
--- a/nexgb/xtest/xtest.go
+++ b/nexgb/xtest/xtest.go
@@ -1,7 +1,8 @@
+// Package xtest is the X client API for the XTEST extension.
 package xtest
 
 /*
-	This file was generated by xtest.xml on May 10 2012 4:20:29pm EDT.
+	This file was generated by xtest.xml on May 10 2012 8:04:33pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -39,10 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XTEST"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -63,6 +60,10 @@ func init() {
 
 // Skipping definition for base type 'Int32'
 
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 const (
 	CursorNone    = 0
 	CursorCurrent = 1
diff --git a/nexgb/xv/xv.go b/nexgb/xv/xv.go
index 8faaf83..4e495cf 100644
--- a/nexgb/xv/xv.go
+++ b/nexgb/xv/xv.go
@@ -1,7 +1,8 @@
+// Package xv is the X client API for the XVideo extension.
 package xv
 
 /*
-	This file was generated by xv.xml on May 10 2012 4:20:29pm EDT.
+	This file was generated by xv.xml on May 10 2012 8:04:33pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,16 +41,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XVideo"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -64,6 +55,16 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 const (
 	TypeInputMask  = 1
 	TypeOutputMask = 2
diff --git a/nexgb/xvmc/xvmc.go b/nexgb/xvmc/xvmc.go
index 8878acf..60fcb2e 100644
--- a/nexgb/xvmc/xvmc.go
+++ b/nexgb/xvmc/xvmc.go
@@ -1,7 +1,8 @@
+// Package xvmc is the X client API for the XVideo-MotionCompensation extension.
 package xvmc
 
 /*
-	This file was generated by xvmc.xml on May 10 2012 4:20:29pm EDT.
+	This file was generated by xvmc.xml on May 10 2012 8:04:33pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,8 +41,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XVideo-MotionCompensation"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Bool'
-
 // Skipping definition for base type 'Float'
 
 // Skipping definition for base type 'Card8'
@@ -64,6 +63,8 @@ func init() {
 
 // Skipping definition for base type 'Double'
 
+// Skipping definition for base type 'Bool'
+
 type Context uint32
 
 func NewContextId(c *xgb.Conn) (Context, error) {