diff --git a/xpcom/tools/xpidl/xpidl_idl.c b/xpcom/tools/xpidl/xpidl_idl.c
index 2623c6afe091..18fbb7f79e01 100644
--- a/xpcom/tools/xpidl/xpidl_idl.c
+++ b/xpcom/tools/xpidl/xpidl_idl.c
@@ -462,7 +462,11 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
 
     rv = IDL_parse_filename_with_input(filename, input_callback, &stack,
                                        msg_callback, &top,
-                                       &state.ns, IDLF_XPIDL,
+                                       &state.ns,
+#if LIBIDL_VERSION_CODE >= LIBIDL_VERSION (0,6,2)
+                                       IDLF_IGNORE_FORWARDS |
+#endif
+                                       IDLF_XPIDL,
                                        enable_warnings ? IDL_WARNING1 :
                                        IDL_ERROR);
     if (rv != IDL_SUCCESS) {
diff --git a/xpcom/tools/xpidl/xpidl_typelib.c b/xpcom/tools/xpidl/xpidl_typelib.c
index a2e3f739a577..7e2fa0e03877 100644
--- a/xpcom/tools/xpidl/xpidl_typelib.c
+++ b/xpcom/tools/xpidl/xpidl_typelib.c
@@ -42,7 +42,7 @@ struct priv_data {
 #define NEXT_CONST(state) (((struct priv_data *)state->priv)->next_const)
 
 #ifdef DEBUG_shaver
-#define DEBUG_shaver_sort
+/* #define DEBUG_shaver_sort */
 #endif
     
 /*
@@ -707,7 +707,7 @@ typelib_op_dcl(TreeState *state)
         if (!fill_pd_as_nsresult(meth->result))
             return FALSE;
     } else {
-#ifdef DEBUG_shaver
+#ifdef DEBUG_shaver_notxpcom
         fprintf(stderr, "%s is notxpcom\n", IDL_IDENT(op->ident).str);
 #endif
         if (!fill_pd_from_type(state, meth->result, XPT_PD_RETVAL,
diff --git a/xpcom/typelib/xpidl/xpidl_idl.c b/xpcom/typelib/xpidl/xpidl_idl.c
index 2623c6afe091..18fbb7f79e01 100644
--- a/xpcom/typelib/xpidl/xpidl_idl.c
+++ b/xpcom/typelib/xpidl/xpidl_idl.c
@@ -462,7 +462,11 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
 
     rv = IDL_parse_filename_with_input(filename, input_callback, &stack,
                                        msg_callback, &top,
-                                       &state.ns, IDLF_XPIDL,
+                                       &state.ns,
+#if LIBIDL_VERSION_CODE >= LIBIDL_VERSION (0,6,2)
+                                       IDLF_IGNORE_FORWARDS |
+#endif
+                                       IDLF_XPIDL,
                                        enable_warnings ? IDL_WARNING1 :
                                        IDL_ERROR);
     if (rv != IDL_SUCCESS) {
diff --git a/xpcom/typelib/xpidl/xpidl_typelib.c b/xpcom/typelib/xpidl/xpidl_typelib.c
index a2e3f739a577..7e2fa0e03877 100644
--- a/xpcom/typelib/xpidl/xpidl_typelib.c
+++ b/xpcom/typelib/xpidl/xpidl_typelib.c
@@ -42,7 +42,7 @@ struct priv_data {
 #define NEXT_CONST(state) (((struct priv_data *)state->priv)->next_const)
 
 #ifdef DEBUG_shaver
-#define DEBUG_shaver_sort
+/* #define DEBUG_shaver_sort */
 #endif
     
 /*
@@ -707,7 +707,7 @@ typelib_op_dcl(TreeState *state)
         if (!fill_pd_as_nsresult(meth->result))
             return FALSE;
     } else {
-#ifdef DEBUG_shaver
+#ifdef DEBUG_shaver_notxpcom
         fprintf(stderr, "%s is notxpcom\n", IDL_IDENT(op->ident).str);
 #endif
         if (!fill_pd_from_type(state, meth->result, XPT_PD_RETVAL,