diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 8520af293..85eeb420a 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -45,7 +45,6 @@ FAILING_C_TESTS := \
     unions \
 
 FAILING_CPP_TESTS := \
-    abstract_typedef2 \
     apply_signed_char \
     array_member \
     array_typedef_memberin \
@@ -54,19 +53,13 @@ FAILING_CPP_TESTS := \
     arrays_global \
     arrays_global_twodim \
     char_strings \
-    class_ignore \
-    class_scope_weird \
     constant_pointers \
-    cpp_typedef \
     c_backend_cpp_natural_std_string \
     c_backend_cpp_exception \
     default_arg_values \
     default_args \
     default_constructor \
-    derived_nested \
-    director_basic \
     director_enum \
-    director_property \
     director_string \
     enum_thorough \
     extend \
@@ -75,83 +68,47 @@ FAILING_CPP_TESTS := \
     extend_placement \
     extern_c \
     features \
-    friends_template \
     funcptr_cpp \
     global_scope_types \
     grouping \
     import_nomodule \
-    inherit_missing \
-    kind \
     li_attribute \
     li_boost_shared_ptr \
-    li_boost_shared_ptr_bits \
     li_carrays_cpp \
-    li_cdata_cpp \
     li_std_combinations \
     li_std_deque \
     li_std_map \
     li_std_pair \
     li_std_pair_using \
     li_std_vector \
-    li_swigtype_inout \
     li_windows \
-    long_long_apply \
     member_funcptr_galore \
     member_pointer \
     mixed_types \
-    multiple_inheritance_shared_ptr \
     namespace_class \
-    namespace_typemap \
-    namespace_virtual_method \
-    naturalvar_more \
     nested_class \
     nested_scope \
     nested_template_base \
     operator_overload \
     overload_arrays \
-    overload_polymorphic \
-    refcount \
-    register_par \
     smart_pointer_extend \
     smart_pointer_not \
     smart_pointer_template_defaults_overload \
     special_variables \
     struct_initialization_cpp \
-    template_arg_scope \
     template_arg_typename \
     template_basic \
     template_default \
-    template_default_arg \
     template_default_class_parms_typedef \
-    template_default_vw \
     template_enum \
     template_explicit \
-    template_extend_overload \
-    template_forward \
-    template_nested \
-    template_ns2 \
-    template_ns_enum \
-    template_ns_enum2 \
-    template_opaque \
-    template_retvalue \
-    template_typedef_class_template \
-    template_typedef_cplx5 \
     template_typedef_fnc \
-    template_typemaps \
-    template_typemaps_typedef \
-    template_typemaps_typedef2 \
-    template_using_directive_and_declaration_forward \
-    template_whitespace \
     typedef_array_member \
     typedef_funcptr \
     typedef_struct_cpp \
     typemap_array_qualifiers \
     typemap_namespace \
-    typemap_template_parm_typedef \
-    typemap_variables \
-    typemap_various \
     using_extend \
-    valuewrapper_opaque \
     varargs \
     varargs_overload \
     virtual_poly \
@@ -160,7 +117,6 @@ FAILING_MULTI_CPP_TESTS := \
     clientdata_prop \
     imports \
     import_stl \
-    mod \
     template_typedef_import \
 
 include $(srcdir)/../common.mk
diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx
index cd5cb5d9d..4e879f39d 100644
--- a/Source/Modules/c.cxx
+++ b/Source/Modules/c.cxx
@@ -226,7 +226,7 @@ public:
    * substituteResolvedTypeSpecialVariable()
    * ----------------------------------------------------------------------------- */
 
-  void substituteResolvedTypeSpecialVariable(Node* n, SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
+  void substituteResolvedTypeSpecialVariable(SwigType *classnametype, String *tm, const char *classnamespecialvariable) {
     if (!CPlusPlus) {
       // Just use the original C type when not using C++, we know that this type can be used in the wrappers.
       Clear(tm);
@@ -247,15 +247,21 @@ public:
       if (classname) {
   Replaceall(tm, classnamespecialvariable, classname);  // getProxyName() works for pointers to classes too
       } else {
-	String* const typestr = SwigType_str(classnametype, 0);
+	String* typestr = NIL;
 	SwigType *btype = SwigType_base(classnametype);
 	if (SwigType_isbuiltin(btype)) {
 	  // This should work just as well in C without any changes.
-	  Replaceall(tm, classnamespecialvariable, typestr);
+	  typestr = SwigType_str(classnametype, 0);
 	} else {
-	  Swig_error(Getfile(n), Getline(n), "Unhandled type \"%s\".\n", typestr);
+	  // Swig doesn't know anything about this type, use descriptor for it.
+	  typestr = NewStringf("SWIGTYPE%s", SwigType_manglestr(classnametype));
+
+	  // And make sure it is declared before it is used.
+	  Printf(f_wrappers_types, "typedef struct %s %s;\n\n", typestr, typestr);
 	}
 	Delete(btype);
+
+	Replaceall(tm, classnamespecialvariable, typestr);
 	Delete(typestr);
       }
     }
@@ -277,14 +283,14 @@ public:
    *   substitution_performed - flag indicating if a substitution was performed
    * ----------------------------------------------------------------------------- */
 
-  bool substituteResolvedType(Node* n, SwigType *pt, String *tm) {
+  bool substituteResolvedType(SwigType *pt, String *tm) {
     bool substitution_performed = false;
     SwigType *type = Copy(SwigType_typedef_resolve_all(pt));
     SwigType *strippedtype = SwigType_strip_qualifiers(type);
 
     if (Strstr(tm, "$resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
-      substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$resolved_type");
+      substituteResolvedTypeSpecialVariable(classnametype, tm, "$resolved_type");
       substitution_performed = true;
       Delete(classnametype);
     }
@@ -292,7 +298,7 @@ public:
       SwigType *classnametype = Copy(strippedtype);
       Delete(SwigType_pop(classnametype));
       if (Len(classnametype) > 0) {
-  substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$*resolved_type");
+  substituteResolvedTypeSpecialVariable(classnametype, tm, "$*resolved_type");
   substitution_performed = true;
       }
       Delete(classnametype);
@@ -300,7 +306,7 @@ public:
     if (Strstr(tm, "$&resolved_type")) {
       SwigType *classnametype = Copy(strippedtype);
       SwigType_add_pointer(classnametype);
-      substituteResolvedTypeSpecialVariable(n, classnametype, tm, "$&resolved_type");
+      substituteResolvedTypeSpecialVariable(classnametype, tm, "$&resolved_type");
       substitution_performed = true;
       Delete(classnametype);
     }
@@ -757,7 +763,7 @@ ready:
               }
             else
               {
-                 substituteResolvedType(n, type, tm);
+                 substituteResolvedType(type, tm);
                  return_type = tm;
               }
        }
@@ -821,7 +827,7 @@ ready:
             if ((stype = Getattr(p, "c:stype"))) {
                 proxy_parm_type = SwigType_lstr(stype, 0);
             } else {
-                substituteResolvedType(n, type, tm);
+                substituteResolvedType(type, tm);
                 proxy_parm_type = tm;              
             }