diff --git a/ChangeLog b/ChangeLog
index 874c17a85..c58ddb68d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-02  Shane Hyde  <shane@enactive.org>
+
+	* generator/GenBase.cs : put #line directive after the 
+	#region so line numbers match up.
+
+2003-07-02  Mike Kestner  <mkestner@speakeasy.net>
+
+	* generator/StructBase.cs : remove doc comments
+
 2003-06-25  Martin Willemoes Hansen <mwh@sysrq.dk>
 
 	* parser/gapi_pp.pl: Added striping of C comments
diff --git a/generator/GenBase.cs b/generator/GenBase.cs
index 2ece3873c..56dfa6869 100644
--- a/generator/GenBase.cs
+++ b/generator/GenBase.cs
@@ -101,8 +101,8 @@ namespace GtkSharp.Generation {
 			char sep = Path.DirectorySeparatorChar;
 			string custom = ".." + sep + NS.ToLower() + sep + Name + ".custom";
 			if (File.Exists(custom)) {
-				sw.WriteLine ("#line 1 \"" + Name + ".custom\"");
 				sw.WriteLine ("#region Customized extensions");
+				sw.WriteLine ("#line 1 \"" + Name + ".custom\"");
 				FileStream custstream = new FileStream(custom, FileMode.Open, FileAccess.Read);
 				StreamReader sr = new StreamReader(custstream);
 				sw.WriteLine (sr.ReadToEnd ());
diff --git a/generator/StructBase.cs b/generator/StructBase.cs
index 67dd79462..f92c7ede5 100644
--- a/generator/StructBase.cs
+++ b/generator/StructBase.cs
@@ -221,10 +221,6 @@ namespace GtkSharp.Generation {
 			sw.WriteLine ("\tusing System.Runtime.InteropServices;");
 			sw.WriteLine ();
 			
-			sw.WriteLine("\t\t/// <summary> " + Name + " Struct </summary>");
-			sw.WriteLine("\t\t/// <remarks>");
-			sw.WriteLine("\t\t/// </remarks>");
-
 			sw.WriteLine ("#region Autogenerated code");
 			sw.WriteLine ("\t[StructLayout(LayoutKind.Sequential)]");
 			sw.WriteLine ("\tpublic struct " + Name + " {");