Index: res-Makefile
===================================================================
--- res-Makefile	(revision 82414)
+++ res-Makefile	(working copy)
@@ -4,7 +4,7 @@
 HTARGET = $(prefix)/include/$(LIBNAME)/
 LIBTARGET = $(prefix)/lib/
 
-CFLAGS += -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I.
+CFLAGS += -Wall -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I.
 
 ifdef bundle
 EXTRAOBJS = bundle.o
Index: cilc.cs
===================================================================
--- cilc.cs	(revision 82414)
+++ cilc.cs	(working copy)
@@ -339,13 +339,18 @@
 		Hdecls.WriteLine ("#define " + Hdecls_id);
 		Hdecls.WriteLine ();
 
+		Hindex.WriteLine ("#include <mono/metadata/object.h>");
+		Hindex.WriteLine ("#include <mono/metadata/debug-helpers.h>");
+		Hindex.WriteLine ("#include <mono/metadata/appdomain.h>");
+		Hindex.WriteLine ("#include <mono/metadata/assembly.h>");
+		Hindex.WriteLine ("#include <mono/metadata/mono-config.h>");
+
 		Cindex.WriteLine ("#include <glib.h>");
 		Cindex.WriteLine ("#include <glib-object.h>");
 		Cindex.WriteLine ("#include <mono/jit/jit.h>");
 		Cindex.WriteLine ();
-		Cindex.WriteLine ("#include <mono/metadata/object.h>");
-		Cindex.WriteLine ("#include <mono/metadata/debug-helpers.h>");
-		Cindex.WriteLine ("#include <mono/metadata/appdomain.h>");
+		string fname = NsToFlat (ns).ToLower ();
+		Cindex.WriteLine ("#include \""+fname+".h\"");
 		Cindex.WriteLine ();
 		Cindex.WriteLine ("#ifdef CILC_BUNDLE");
 		Cindex.WriteLine ("#include \"bundle.h\"");
@@ -378,8 +383,7 @@
 		Cindex.WriteLine ("return assembly;");
 		Cindex.WriteLine ("}");
 		Cindex.WriteLine ();
-
-
+		
 		Cindex.WriteLine ("MonoObject *" + NsToC (ns) + "_cilc_glib_gobject_get_mobject (GObject *_handle)");
 		Cindex.WriteLine ("{");
 		//FIXME: instantiate monobject if it doesn't exist
@@ -419,6 +423,13 @@
 		Console.WriteLine ();
 
 		Hindex.WriteLine ();
+		Hindex.WriteLine ("MonoDomain *" + NsToC (ns) + "_get_mono_domain (void);");
+		Hindex.WriteLine ("MonoAssembly *" + NsToC (ns) + "_get_mono_assembly (void);");
+		Hindex.WriteLine ("MonoObject *" + NsToC (ns) + "_cilc_glib_gobject_get_mobject (GObject *_handle);");
+		Hindex.WriteLine ("gpointer " + NsToC (ns) + "_cilc_glib_mobject_get_gobject (MonoObject *_mono_object);");
+
+
+		Hindex.WriteLine ();
 		Hindex.WriteLine ("#endif /* " + Hindex_id + " */");
 
 		Hdecls.WriteLine ();
@@ -466,6 +477,8 @@
 			H.WriteLine ("#include <" + include + ">");
 
 		H.WriteLine ();
+		string cfname = NsToFlat (ns).ToLower ();
+		H.WriteLine ("#include \""+cfname+".h\"");
 
 		if (t.BaseType != null && IsRegistered (t.BaseType) && !IsExternal (t.BaseType))
 			H.WriteLine ("#include \"" + NsToFlat (t.BaseType.Namespace).ToLower () + t.BaseType.Name.ToLower () + ".h\"");
@@ -492,11 +505,6 @@
 			C.WriteLine ("#include \"" + iface_fname + ".h" + "\"");
 		}
 
-		C.WriteLine ("#include <mono/metadata/object.h>");
-		C.WriteLine ("#include <mono/metadata/debug-helpers.h>");
-		C.WriteLine ("#include <mono/metadata/appdomain.h>");
-		C.WriteLine ();
-
 		if (t.IsClass)
 			ClassGen (t);
 		else if (t.IsInterface)