diff --git a/src/gio/VolumeT.d b/src/gio/VolumeT.d
@@ -260,7 +260,7 @@ public template VolumeT(TStruct)
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**
@@ -278,7 +278,7 @@ public template VolumeT(TStruct)
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**
@@ -295,7 +295,7 @@ public template VolumeT(TStruct)
 			return null;
 		}
 
-		return ObjectG.getDObject!(Drive)(cast(GDrive*) p);
+		return ObjectG.getDObject!(Drive, DriveIF)(cast(GDrive*) p);
 	}
 
 	/**
@@ -312,7 +312,7 @@ public template VolumeT(TStruct)
 			return null;
 		}
 
-		return ObjectG.getDObject!(Mount)(cast(GMount*) p);
+		return ObjectG.getDObject!(Mount, MountIF)(cast(GMount*) p);
 	}
 
 	/**

diff --git a/src/gtk/Action.d b/src/gtk/Action.d
@@ -729,7 +729,7 @@ public class Action : ObjectG, BuildableIF
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**

diff --git a/src/gtk/CellArea.d b/src/gtk/CellArea.d
@@ -1166,7 +1166,7 @@ public class CellArea : ObjectG, BuildableIF, CellLayoutIF
 			return null;
 		}
 
-		return ObjectG.getDObject!(CellEditable)(cast(GtkCellEditable*) p);
+		return ObjectG.getDObject!(CellEditable, CellEditableIF)(cast(GtkCellEditable*) p);
 	}
 
 	/**

diff --git a/src/gtk/CellRenderer.d b/src/gtk/CellRenderer.d
@@ -350,7 +350,7 @@ public class CellRenderer : ObjectG
 			return null;
 		}
 
-		return ObjectG.getDObject!(CellEditable)(cast(GtkCellEditable*) p);
+		return ObjectG.getDObject!(CellEditable, CellEditableIF)(cast(GtkCellEditable*) p);
 	}
 
 	/**

diff --git a/src/gtk/CellView.d b/src/gtk/CellView.d
@@ -282,7 +282,7 @@ public class CellView : Widget, CellLayoutIF, OrientableIF
 			return null;
 		}
 
-		return ObjectG.getDObject!(TreeModel)(cast(GtkTreeModel*) p);
+		return ObjectG.getDObject!(TreeModel, TreeModelIF)(cast(GtkTreeModel*) p);
 	}
 
 	/**

diff --git a/src/gtk/ComboBox.d b/src/gtk/ComboBox.d
@@ -630,7 +630,7 @@ public class ComboBox : Bin, CellLayoutIF, CellEditableIF
 			return null;
 		}
 
-		return ObjectG.getDObject!(TreeModel)(cast(GtkTreeModel*) p);
+		return ObjectG.getDObject!(TreeModel, TreeModelIF)(cast(GtkTreeModel*) p);
 	}
 
 	/**

diff --git a/src/gtk/Entry.d b/src/gtk/Entry.d
@@ -1499,7 +1499,7 @@ public class Entry : Widget, EditableIF, CellEditableIF
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**

diff --git a/src/gtk/EntryCompletion.d b/src/gtk/EntryCompletion.d
@@ -407,7 +407,7 @@ public class EntryCompletion : ObjectG, BuildableIF, CellLayoutIF
 			return null;
 		}
 
-		return ObjectG.getDObject!(TreeModel)(cast(GtkTreeModel*) p);
+		return ObjectG.getDObject!(TreeModel, TreeModelIF)(cast(GtkTreeModel*) p);
 	}
 
 	/**

diff --git a/src/gtk/IconView.d b/src/gtk/IconView.d
@@ -513,7 +513,7 @@ public class IconView : Container, CellLayoutIF, ScrollableIF
 			return null;
 		}
 
-		return ObjectG.getDObject!(TreeModel)(cast(GtkTreeModel*) p);
+		return ObjectG.getDObject!(TreeModel, TreeModelIF)(cast(GtkTreeModel*) p);
 	}
 
 	/**

diff --git a/src/gtk/NumerableIcon.d b/src/gtk/NumerableIcon.d
@@ -138,7 +138,7 @@ public class NumerableIcon : GioEmblemedIcon
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**
@@ -160,7 +160,7 @@ public class NumerableIcon : GioEmblemedIcon
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**
@@ -179,7 +179,7 @@ public class NumerableIcon : GioEmblemedIcon
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**

diff --git a/src/gtk/RecentInfo.d b/src/gtk/RecentInfo.d
@@ -464,7 +464,7 @@ public class RecentInfo
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**

diff --git a/src/gtk/StatusIcon.d b/src/gtk/StatusIcon.d
@@ -674,7 +674,7 @@ public class StatusIcon : ObjectG
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**

diff --git a/src/gtk/TreeModelFilter.d b/src/gtk/TreeModelFilter.d
@@ -286,7 +286,7 @@ public class TreeModelFilter : ObjectG, TreeModelIF, TreeDragSourceIF
 			return null;
 		}
 
-		return ObjectG.getDObject!(TreeModel)(cast(GtkTreeModel*) p);
+		return ObjectG.getDObject!(TreeModel, TreeModelIF)(cast(GtkTreeModel*) p);
 	}
 
 	/**

diff --git a/src/gtk/TreeModelSort.d b/src/gtk/TreeModelSort.d
@@ -191,7 +191,7 @@ public class TreeModelSort : ObjectG, TreeModelIF, TreeDragSourceIF, TreeSortabl
 			return null;
 		}
 
-		return ObjectG.getDObject!(TreeModel)(cast(GtkTreeModel*) p);
+		return ObjectG.getDObject!(TreeModel, TreeModelIF)(cast(GtkTreeModel*) p);
 	}
 
 	/**

diff --git a/src/gtk/TreeRowReference.d b/src/gtk/TreeRowReference.d
@@ -308,7 +308,7 @@ public class TreeRowReference
 			return null;
 		}
 
-		return ObjectG.getDObject!(TreeModel)(cast(GtkTreeModel*) p);
+		return ObjectG.getDObject!(TreeModel, TreeModelIF)(cast(GtkTreeModel*) p);
 	}
 
 	/**

diff --git a/src/gtk/TreeView.d b/src/gtk/TreeView.d
@@ -838,7 +838,7 @@ public class TreeView : Container, ScrollableIF
 			return null;
 		}
 
-		return ObjectG.getDObject!(TreeModel)(cast(GtkTreeModel*) p);
+		return ObjectG.getDObject!(TreeModel, TreeModelIF)(cast(GtkTreeModel*) p);
 	}
 
 	/**

diff --git a/srcgl/glgdk/GLContext.d b/srcgl/glgdk/GLContext.d
@@ -179,7 +179,7 @@ public class GLContext : ObjectG
 			return null;
 		}
 
-		return ObjectG.getDObject!(GLDrawable)(cast(GdkGLDrawable*) p);
+		return ObjectG.getDObject!(GLDrawable, GLDrawableIF)(cast(GdkGLDrawable*) p);
 	}
 
 	/**

diff --git a/srcsv/gsv/SourceBuffer.d b/srcsv/gsv/SourceBuffer.d
@@ -753,7 +753,7 @@ public class SourceBuffer : TextBuffer
 			return null;
 		}
 
-		return ObjectG.getDObject!(SourceUndoManager)(cast(GtkSourceUndoManager*) p);
+		return ObjectG.getDObject!(SourceUndoManager, SourceUndoManagerIF)(cast(GtkSourceUndoManager*) p);
 	}
 
 	/**

diff --git a/srcsv/gsv/SourceGutterRendererPixbuf.d b/srcsv/gsv/SourceGutterRendererPixbuf.d
@@ -196,7 +196,7 @@ public class SourceGutterRendererPixbuf : SourceGutterRenderer
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**

diff --git a/srcsv/gsv/SourceMarkAttributes.d b/srcsv/gsv/SourceMarkAttributes.d
@@ -330,7 +330,7 @@ public class SourceMarkAttributes : ObjectG
 			return null;
 		}
 
-		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
 	}
 
 	/**

diff --git a/wrap/utils/funct.d b/wrap/utils/funct.d
@@ -733,6 +733,8 @@ public struct Funct
 		{
 			if ( convParms.outPack == "cairo" || convParms.outPack == "glib" || convParms.outPack == "gthread" )
 				return "new "~ type;
+			else if( GtkDClass.endsWith(typeWrap, "IF") )
+				return "ObjectG.getDObject!("~ type[0..$-2] ~", "~ type ~")";
 			else
 				return "ObjectG.getDObject!("~ type ~")";
 		}
@@ -1133,8 +1135,6 @@ public struct Funct
 						/* What's with all the casting? */
 						/* A; Casting is needed because some GTK+
 						 *    functions can return void pointers. */
-						else if( GtkDClass.endsWith(typeWrap, "IF") )
-							bd ~= "return " ~ construct(typeWrap[0..$-2]) ~ "(cast(" ~ type ~ ") p);";
 						else
 							bd ~= "return " ~ construct(typeWrap) ~ "(cast(" ~ type ~ ") p);";
-Original file line number
+Diff line change
@@ Expand Up / @@ -729,7 +729,7 @@ public class Action : ObjectG, BuildableIF @@
     			return null;
     		}
-    		return ObjectG.getDObject!(Icon)(cast(GIcon*) p);
+    		return ObjectG.getDObject!(Icon, IconIF)(cast(GIcon*) p);
     	}
     	/**
@@ Expand Down @@