diff --git a/ChangeLog b/ChangeLog
index 986a2162f..27ef5cba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-11  Mike Kestner  <mkestner@ximian.com>
+
+	* gtk/gtk-api.xml : regenerated
+	* sources/Gtk.metadata : applied patch from jluke for hides
+	requested in bug #38660. Also cleaned up the sprawling "hidden"
+	rules to reduce the overall footprint.
+
 2003-10-11  Mike Kestner  <mkestner@ximian.com>
 
 	* generator/OpaqueGen.cs (FromNativeReturn): just do a
diff --git a/gtk/gtk-api.xml b/gtk/gtk-api.xml
index cc76393db..a058b3589 100644
--- a/gtk/gtk-api.xml
+++ b/gtk/gtk-api.xml
@@ -3209,11 +3209,11 @@
       <method name="GetLabel" cname="gtk_frame_get_label">
         <return-type type="const-gchar*"/>
       </method>
-      <method name="GetLabelAlign" cname="gtk_frame_get_label_align">
+      <method name="GetLabelAlign" cname="gtk_frame_get_label_align" hidden="1">
         <return-type type="void"/>
         <parameters>
-          <parameter type="gfloat*" name="xalign" pass_as="out"/>
-          <parameter type="gfloat*" name="yalign" pass_as="out"/>
+          <parameter type="gfloat*" name="xalign"/>
+          <parameter type="gfloat*" name="yalign"/>
         </parameters>
       </method>
       <method name="GetLabelWidget" cname="gtk_frame_get_label_widget">
@@ -3236,7 +3236,7 @@
           <parameter type="const-gchar*" name="label"/>
         </parameters>
       </method>
-      <method name="SetLabelAlign" cname="gtk_frame_set_label_align">
+      <method name="SetLabelAlign" cname="gtk_frame_set_label_align" hidden="1">
         <return-type type="void"/>
         <parameters>
           <parameter type="gfloat" name="xalign"/>
@@ -3283,7 +3283,7 @@
       <field cname="attach_allocation" type="GtkAllocation"/>
       <field cname="float_allocation" type="GtkAllocation"/>
       <property name="Shadow" cname="shadow" type="GtkShadowType" readable="true" writeable="true"/>
-      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true"/>
+      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true" hidden="1"/>
       <property name="HandlePosition" cname="handle_position" type="GtkPositionType" readable="true" writeable="true"/>
       <property name="SnapEdge" cname="snap_edge" type="GtkPositionType" readable="true" writeable="true"/>
       <property name="SnapEdgeSet" cname="snap_edge_set" type="gboolean" readable="true" writeable="true"/>
@@ -6386,7 +6386,7 @@
           <parameter type="guint" name="spacing"/>
         </parameters>
       </method>
-      <method name="SetColSpacings" cname="gtk_table_set_col_spacings">
+      <method name="SetColSpacings" cname="gtk_table_set_col_spacings" hidden="1">
         <return-type type="void"/>
         <parameters>
           <parameter type="guint" name="spacing"/>
@@ -6405,7 +6405,7 @@
           <parameter type="guint" name="spacing"/>
         </parameters>
       </method>
-      <method name="SetRowSpacings" cname="gtk_table_set_row_spacings">
+      <method name="SetRowSpacings" cname="gtk_table_set_row_spacings" hidden="1">
         <return-type type="void"/>
         <parameters>
           <parameter type="guint" name="spacing"/>
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index 53d45b1ae..ad17c55a1 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -2,18 +2,6 @@
 <metadata>
 
 <!-- out parameters -->
-<rule>
-  <class name="GtkFrame">
-    <method>GetLabelAlign</method>
-  </class>
-  <data>
-    <attribute target="param">
-	  <filter level="type">gfloat*</filter>
-	  <name>pass_as</name>
-	  <value>out</value>
-	</attribute>
-  </data>
-</rule>
 <rule>
   <class name="GtkTextBuffer">
     <method>GetIterAtLineOffset</method>
@@ -152,17 +140,6 @@
      </attribute>
    </data>
 </rule>
-<rule>
-  <class name="GtkTreeSelection">
-    <method>GetSelected</method>
-   </class>
-   <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-   </data>
-</rule>
 <rule>
   <class name="GtkTreeStore">
     <method>Append</method>
@@ -459,17 +436,6 @@
 </rule>
 
 <!-- misc -->
-<rule>
-  <class name="GtkFileSelection">
-    <method>GetSelections</method>
-  </class>
-  <data>
-    <attribute target="method">
-     <name>hidden</name>
-     <value>1</value>
-    </attribute>
- </data>
-</rule>
 <rule>
   <class name="GtkHTMLStream">
     <method>Write</method>
@@ -1717,39 +1683,32 @@
   </data>
 </rule>
 
-<!-- hides -->
-<rule>
-  <class name="GtkArrow">
-    <method>Set</method>
-   </class>
-  <class name="GtkIconSet">
-    <method>GetSizes</method>
-  </class>
-  <class name="GtkTreePath">
-    <method>GetIndices</method>
-  </class>
-   <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-   </data>
-</rule>
-
-<!-- Supress private API bits -->
+<!-- hidden classes -->
 <rule>
+  <class name="GtkBindingArg"/>
+  <class name="GtkBindingEntry"/>
+  <class name="GtkBindingSignal"/>
+  <class name="GtkBindingSet"/>
   <class name="GtkBorder"/>
   <class name="GtkBoxChild"/>
+  <class name="GtkClipboardClearFunc"/>
+  <class name="GtkClipboardGetFunc"/>
   <class name="GtkDebugFlag"/>
   <class name="GtkDestDefaults"/>
   <class name="GtkExpanderStyle"/>
   <class name="GtkFixedChild"/>
+  <class name="GtkIdle_"/>
   <class name="GtkItemFactoryItem"/>
   <class name="GtkKeyHash"/>
   <class name="GtkLabelSelectionInfo"/>
   <class name="GtkObjectFlags"/>
+  <class name="GtkPathPriorityType"/>
+  <class name="GtkPathType"/>
+  <class name="GtkProgress"/>
+  <class name="GtkProgressClass"/>
   <class name="GtkRangeLayout"/>
   <class name="GtkRangeStepTimer"/>
+  <class name="GtkRBNodeColor"/>
   <class name="GtkRcContext"/>
   <class name="GtkRcFlags"/>
   <class name="GtkReadyEvent"/>
@@ -1761,33 +1720,6 @@
   <class name="GtkWidgetFlags"/>
   <class name="GtkWidgetShapeInfo"/>
   <class name="GtkWindowGeometryInfo"/>
-  <class name="GtkRBNodeColor"/>
-  <class name="GtkBindingArg"/>
-  <class name="GtkBindingEntry"/>
-  <class name="GtkBindingSignal"/>
-  <class name="GtkBindingSet"/>
-  <class name="GtkPathPriorityType"/>
-  <class name="GtkPathType"/>
-  <class name="GtkProgress"/>
-  <class name="GtkProgressClass"/>
-  <data>
-    <attribute target="class">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkClipboardClearFunc"/>
-  <data>
-    <attribute target="class">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkClipboardGetFunc"/>
   <data>
     <attribute target="class">
       <name>hidden</name>
@@ -1795,18 +1727,72 @@
     </attribute>
   </data>
 </rule>
+
+<!-- hidden methods -->
 <rule>
+  <class name="GtkArrow">
+    <method>Set</method>
+   </class>
   <class name="GtkColorSelection">
+    <method>GetPreviousColor</method>
+    <method>PaletteFromString</method>
+    <method>PaletteToString</method>
     <method>SetChangePaletteWithScreenHook</method>
+    <method>SetChangePaletteHook</method>
+    <method>SetPreviousColor</method>
   </class>
-  <data>
+  <class name="GtkFileSelection">
+    <method>GetSelections</method>
+  </class>
+  <class name="GtkFrame">
+    <method>GetLabelAlign</method>
+    <method>SetLabelAlign</method>
+   </class>
+  <class name="GtkIconSet">
+    <method>GetSizes</method>
+  </class>
+  <class name="GtkRcStyle">
+    <method>Ref</method>
+    <method>Unref</method>
+  </class>
+  <class name="GtkSelectionData">
+    <method>GetText</method>
+    <method>SetText</method>
+    <method>Set</method>
+  </class>
+  <class name="GtkTable">
+    <method>SetColSpacings</method>
+    <method>SetRowSpacings</method>
+   </class>
+  <class name="GtkTreePath">
+    <method>GetIndices</method>
+  </class>
+  <class name="GtkTreeSelection">
+    <method>GetSelected</method>
+   </class>
+  <class name="GtkTreeView">
+    <method>GetPathAtPos</method>
+    <method>GetSearchEqualFunc</method>
+  </class>
+  <class name="GtkWidget">
+    <method>Destroyed</method>
+    <method>ListAccelClosures</method>
+    <method>Ref</method>
+    <method>Unref</method>
+  </class>
+   <data>
     <attribute target="method">
       <name>hidden</name>
       <value>1</value>
     </attribute>
-  </data>
+   </data>
 </rule>
+
+<!-- hidden properties -->
 <rule>
+  <class name="GtkHandleBox">
+    <property>ShadowType</property>
+  </class>
   <class name="GtkRadioButton">
     <property>Group</property>
   </class>
@@ -1817,89 +1803,6 @@
     </attribute>
   </data>
 </rule>
-<rule>
-  <class name="GtkWidget">
-    <method>Destroyed</method>
-    <method>Ref</method>
-    <method>Unref</method>
-  </class>
-  <class name="GtkRcStyle">
-    <method>Ref</method>
-    <method>Unref</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkColorSelection">
-    <method>PaletteToString</method>
-    <method>PaletteFromString</method>
-    <method>GetPreviousColor</method>
-    <method>SetPreviousColor</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <method>ListAccelClosures</method>
-  </class>
-  <!-- both temporarily disabled because we do not support
-       Native->Managed delegates (only the other way around) -->
-  <class name="GtkColorSelection">
-    <method>SetChangePaletteHook</method>
-  </class>
-  <class name="GtkTreeView">
-    <method>GetSearchEqualFunc</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkSelectionData">
-    <method>GetText</method>
-    <method>SetText</method>
-    <method>Set</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeView">
-    <method>GetPathAtPos</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkIdle_"/>
-   <data>
-    <attribute target="class">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-   </data>
-</rule>
 
 <!-- overloads -->
 <rule>