diff --git a/ChangeLog b/ChangeLog
index 105d48822..31389a053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-18  Mike Kestner  <mkestner@novell.com>
+
+	* generator/LPGen.cs: remove WIN64LONGS hackery.
+	* generator/LPUGen.cs: remove WIN64LONGS hackery.
+	* generator/SymbolTable.cs: for WIN64LONGS, map them directly to
+	  (u)int SimpleGens instead of using the LP generatables.
+
 2008-09-16  Jeffrey Stedfast  <fejj@novell.com>
 
 	* generator/Property.cs (IsDeprecated): Allow "1" or "true".
diff --git a/generator/LPGen.cs b/generator/LPGen.cs
index ed47f105c..3fb774ec6 100644
--- a/generator/LPGen.cs
+++ b/generator/LPGen.cs
@@ -30,30 +30,18 @@ namespace GtkSharp.Generation {
 
 		public override string MarshalType {
 			get {
-#if WIN64LONGS
-				return "int";
-#else
 				return "IntPtr";
-#endif
 			}
 		}
 
 		public override string CallByName (string var_name)
 		{
-#if WIN64LONGS
-			return "(int) " + var_name;
-#else
 			return "new IntPtr (" + var_name + ")";
-#endif
 		}
 		
 		public override string FromNative(string var)
 		{
-#if WIN64LONGS
-			return var;
-#else
 			return "(long) " + var;
-#endif
 		}
 
 		public void WriteAccessors (StreamWriter sw, string indent, string var)
diff --git a/generator/LPUGen.cs b/generator/LPUGen.cs
index 311eac262..331b25f98 100644
--- a/generator/LPUGen.cs
+++ b/generator/LPUGen.cs
@@ -30,30 +30,18 @@ namespace GtkSharp.Generation {
 
 		public override string MarshalType {
 			get {
-#if WIN64LONGS
-				return "uint";
-#else
 				return "UIntPtr";
-#endif
 			}
 		}
 
 		public override string CallByName (string var_name)
 		{
-#if WIN64LONGS
-			return "(uint) " + var_name;
-#else
 			return "new UIntPtr (" + var_name + ")";
-#endif
 		}
 		
 		public override string FromNative(string var)
 		{
-#if WIN64LONGS
-			return var;
-#else
 			return "(ulong) " + var;
-#endif
 		}
 
 		public void WriteAccessors (StreamWriter sw, string indent, string var)
diff --git a/generator/SymbolTable.cs b/generator/SymbolTable.cs
index a0574649e..cd36df191 100644
--- a/generator/SymbolTable.cs
+++ b/generator/SymbolTable.cs
@@ -77,15 +77,25 @@ namespace GtkSharp.Generation {
 			AddType (new SimpleGen ("GQuark", "int", "0"));
 
 			// platform specific integer types.
-			AddType (new LPGen ("ssize_t"));
+#if WIN64LONGS
+			AddType (new SimpleGen ("long", "int", "0"));
+			AddType (new SimpleGen ("glong", "int", "0"));
+			AddType (new SimpleGen ("ulong", "uint", "0"));
+			AddType (new SimpleGen ("gulong", "uint", "0"));
+			AddType (new SimpleGen ("unsigned long", "uint", "0"));
+#else
 			AddType (new LPGen ("long"));
 			AddType (new LPGen ("glong"));
-			AddType (new LPGen ("gssize"));
-			AddType (new LPUGen ("size_t"));
 			AddType (new LPUGen ("ulong"));
 			AddType (new LPUGen ("gulong"));
 			AddType (new LPUGen ("unsigned long"));
+#endif
+
+			AddType (new LPGen ("ssize_t"));
+			AddType (new LPGen ("gssize"));
+			AddType (new LPUGen ("size_t"));
 			AddType (new LPUGen ("gsize"));
+
 #if OFF_T_8
 			AddType (new AliasGen ("off_t", "long"));
 #else