diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
index 1c7ff87ebab..1af11c889f8 100644
--- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
@@ -19,6 +19,12 @@
  *
  * Contributor(s): 
  *   Pierre Phaneuf <pp@ludusdesign.com>
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 #include "nsIPref.h" 
@@ -2867,7 +2873,7 @@ GatherSizeReportData(nsISizeOfHandler* aHandler,
   }
 }
 
-static int CompareEntries(const void* ve1, const void* ve2, void* closure)
+static int PR_CALLBACK CompareEntries(const void* ve1, const void* ve2, void* closure)
 {
   SizeReportEntry* e1 = (SizeReportEntry*) ve1;
   SizeReportEntry* e2 = (SizeReportEntry*) ve2;
diff --git a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp
index bb36ab9f642..a3b6ff6ac6b 100644
--- a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp
+++ b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp
@@ -19,6 +19,12 @@
  *
  * Contributor(s): 
  *   Pierre Phaneuf <pp@ludusdesign.com>
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 #include "nsCOMPtr.h"
 #include "nsWebCrawler.h"
@@ -92,7 +98,7 @@ AtomHashTable::AtomHashTable()
                            nsnull, nsnull);
 }
 
-static PR_CALLBACK PRIntn
+static PRIntn PR_CALLBACK
 DestroyEntry(PLHashEntry *he, PRIntn i, void *arg)
 {
   ((nsIAtom*)he->key)->Release();
@@ -971,8 +977,8 @@ struct ExitEvent : public PLEvent {
 
   nsWebCrawler* crawler;
 
-  static PR_CALLBACK void HandleMe(ExitEvent* e);
-  static PR_CALLBACK void DeleteMe(ExitEvent* e);
+  static void PR_CALLBACK HandleMe(ExitEvent* e);
+  static void PR_CALLBACK DeleteMe(ExitEvent* e);
 };
 
 ExitEvent::ExitEvent(nsWebCrawler* aCrawler)
@@ -1026,8 +1032,8 @@ struct LoadEvent : public PLEvent {
   nsString url;
   nsWebCrawler* crawler;
 
-  static PR_CALLBACK void HandleMe(LoadEvent* e);
-  static PR_CALLBACK void DeleteMe(LoadEvent* e);
+  static void PR_CALLBACK HandleMe(LoadEvent* e);
+  static void PR_CALLBACK DeleteMe(LoadEvent* e);
 };
 
 LoadEvent::LoadEvent(nsWebCrawler* aCrawler, const nsString& aURL)
diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
index 3b7c2d4fdf7..b837887a3f0 100644
--- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
@@ -18,6 +18,7 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ *   IBM Corp.
  */
 #include "nsCOMPtr.h"
 #include "nsIPref.h"
@@ -64,7 +65,7 @@
 #include "nsXPIDLString.h"
 
 
-#if defined(WIN32)
+#if defined(WIN32) || defined(XP_OS2_VACPP)
 #include <strstrea.h>
 #else
 #include <strstream.h>