diff --git a/mozilla/caps/src/nsUserDialogHelper.cpp b/mozilla/caps/src/nsUserDialogHelper.cpp
index 4f22d06804d..1f51742e234 100644
--- a/mozilla/caps/src/nsUserDialogHelper.cpp
+++ b/mozilla/caps/src/nsUserDialogHelper.cpp
@@ -24,8 +24,25 @@ extern "C" {
 #include "xp.h"
 #include "xpgetstr.h"
 #include "prprf.h"
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+/*
+ * This is a c++ header, which includes other c++ headers.  It needs to
+ * be complied as c++ source.
+ *
+ * If everything in this page needs to be compiled as C code, then why
+ * isnt this file a .c file ?
+ *
+ */
 #include "nsTarget.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #ifdef XXX
 extern int CAPS_TARGET_RISK_STR_LOW;
 extern int CAPS_TARGET_RISK_STR_MEDIUM;