diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index 40310ad..4f5e423 100644
--- a/src/extensions/glx.xml
+++ b/src/extensions/glx.xml
@@ -282,7 +282,7 @@ The patch that fixed this server bug in X.org CVS is here:
 			<pad bytes="1" />
 			<pad bytes="4" />
 			<field type="CARD32" name="n" />
-			<pad byes="16" />
+			<pad bytes="16" />
 		</reply>
 	</request>
 
@@ -367,7 +367,7 @@ The patch that fixed this server bug in X.org CVS is here:
 		<reply>
 			<pad bytes="1" />
 			<field type="CARD32" name="context_tag" />
-			<pad byes="20" />
+			<pad bytes="20" />
 		</reply>
 	</request>
 
diff --git a/src/extensions/xprint.xml b/src/extensions/xprint.xml
index dbabbde..5fc8923 100644
--- a/src/extensions/xprint.xml
+++ b/src/extensions/xprint.xml
@@ -50,36 +50,36 @@ authorization from the authors.
 
     <!-- "PrintGetDocumentData" -->
     <enum name="GetDoc">
-        <item name="Finished">0</item>
-            <item name="SecondConsumer">1</item>
+        <item name="Finished"><value>0</value></item>
+            <item name="SecondConsumer"><value>1</value></item>
     </enum>
 
     <!-- Event Mask ("PrintSelectInput") -->
     <enum name="EvMask">
-        <item name="NoEventMask">0x00000000</item>
-        <item name="PrintMask">0x00000001</item>
-        <item name="AttributeMask">0x00000002</item>
+        <item name="NoEventMask"><value>0x00000000</value></item>
+        <item name="PrintMask"><value>0x00000001</value></item>
+        <item name="AttributeMask"><value>0x00000002</value></item>
     </enum>
 
     <!-- "PrintNotify" detail -->
     <enum name="Detail">
-        <item name="StartJobNotify">1</item>
-        <item name="EndJobNotify">2</item>
-        <item name="StartDocNotify">3</item>
-        <item name="EndDocNotify">4</item>
-        <item name="StartPageNotify">5</item>
-        <item name="EndPageNotify">6</item>
+        <item name="StartJobNotify"><value>1</value></item>
+        <item name="EndJobNotify"><value>2</value></item>
+        <item name="StartDocNotify"><value>3</value></item>
+        <item name="EndDocNotify"><value>4</value></item>
+        <item name="StartPageNotify"><value>5</value></item>
+        <item name="EndPageNotify"><value>6</value></item>
     </enum>
 
     <!-- "AttributeNotify" detail -->
     <enum name="Attr">
-        <item name="JobAttr">1</item>
-        <item name="DocAttr">2</item>
-        <item name="PageAttr">3</item>
-        <item name="PrinterAttr">4</item>
-        <item name="ServerAttr">5</item>
-        <item name="MediumAttr">6</item>
-        <item name="SpoolerAttr">7</item>
+        <item name="JobAttr"><value>1</value></item>
+        <item name="DocAttr"><value>2</value></item>
+        <item name="PageAttr"><value>3</value></item>
+        <item name="PrinterAttr"><value>4</value></item>
+        <item name="ServerAttr"><value>5</value></item>
+        <item name="MediumAttr"><value>6</value></item>
+        <item name="SpoolerAttr"><value>7</value></item>
     </enum>
     
     
diff --git a/src/extensions/xvmc.xml b/src/extensions/xvmc.xml
index 5e61def..e2eb04d 100644
--- a/src/extensions/xvmc.xml
+++ b/src/extensions/xvmc.xml
@@ -77,7 +77,7 @@ authorization from the authors.
             <field type="CARD16" name="width_actual" />
             <field type="CARD16" name="height_actual" />
             <field type="CARD32" name="flags_return" />
-            <pad byte="20" />
+            <pad bytes="20" />
             <list type="CARD32" name="priv_data" />
         </reply>
     </request>