--- a/build/unix/run-mozilla.sh
+++ b/build/unix/run-mozilla.sh
@@ -34,17 +34,16 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 cmdname=`basename "$0"`
 MOZ_DIST_BIN=`dirname "$0"`
 MOZ_DEFAULT_NAME="./${cmdname}-bin"
 MOZ_APPRUNNER_NAME="./mozilla-bin"
-MOZ_VIEWER_NAME="./viewer"
 MOZ_PROGRAM=""
 
 exitcode=1
 #
 ##
 ## Functions
 ##
 ##########################################################################
@@ -57,28 +56,20 @@ echo ""
 echo "    -g                   Run in debugger."
 echo "    --debug"
 echo ""
 echo "    -d debugger          Debugger to use."
 echo "    --debugger debugger"
 echo ""
 echo "  Examples:"
 echo ""
-echo "  Run the viewer"
-echo ""
-echo "    ${cmdname} viewer"
-echo ""
 echo "  Run the mozilla-bin binary"
 echo ""
 echo "    ${cmdname} mozilla-bin"
 echo ""
-echo "  Debug the viewer in a debugger"
-echo ""
-echo "    ${cmdname} -g viewer"
-echo ""
 echo "  Debug the mozilla-bin binary in gdb"
 echo ""
 echo "    ${cmdname} -g mozilla-bin -d gdb"
 echo ""
 	return 0
 }
 ##########################################################################
 moz_bail()
@@ -234,21 +225,16 @@ fi
 if [ -z "$MOZ_PROGRAM" ]
 then
 	##
 	## Try this script's name with '-bin' appended
 	##
 	if [ -x "$MOZ_DEFAULT_NAME" ]
 	then
 		MOZ_PROGRAM=$MOZ_DEFAULT_NAME
-	## Try viewer (this should be deprecated)
-	## 
-	elif [ -x "$MOZ_VIEWER_NAME" ]
-	then
-		MOZ_PROGRAM=$MOZ_VIEWER_NAME
 	##
 	## Try mozilla-bin
 	## 
 	elif [ -x "$MOZ_APPRUNNER_NAME" ]
 	then
 		MOZ_PROGRAM=$MOZ_APPRUNNER_NAME
 	fi
 fi

deleted file mode 100644
--- a/parser/htmlparser/tests/html/RTestDTD.pl
+++ /dev/null
@@ -1,94 +0,0 @@
-#/usr/bin/perl
-
-die "\nUsage: perl RtestDTD.pl [FLAG] url_list.txt.
-
-FLAGS:
-  -v    = verify   ( would create rtest_html.veri )
-  -b    = baseline ( would create rtest_html.base )
-  -help = info. on running the script\n" 
-if( @ARGV[0]!~/-help/ && ((@ARGV >2 || @ARGV < 2) || ($ARGV[0]!~m/-v/ && $ARGV[0]!~m/-b/)));
-
-if($ARGV[0]=~m/-help/) {
- print  "
-         1. \"url_list.txt\" can be generated by running UrlGen.pl
-            Ex. perl UrlGen.pl.
-         2. Run base line (-b) before making changes in your tree.
-            This will generate rtest_html.base file [DO NOT CHANGE THIS].
-         3. Run verification (-v) after making changes in your tree.
-            This will generate rtest_html.veri file and will compare
-            rtest_html.base and rtest_html.veri.
-
-NOTE:  Need perl version 5.0 or greater. \n";
- exit(0);
-}
-
-use Cwd;
-
-$ENV{"PARSER_DUMP_CONTENT"}=1;
-
-($drive,@path)=split(/:/,`cd`);
-
-system("$drive:\\mozilla\\dist\\win32_d.obj\\bin\\viewer.exe -f $ARGV[1]");
-
-if($ARGV[0]=~m/-b/) {
-  rename("rtest_html.txt","rtest_html.base");
-}
-elsif($ARGV[0]=~m/-v/) {
-  rename("rtest_html.txt","rtest_html.veri");
-  @result=CompareFiles("rtest_html.base","rtest_html.veri");
-  Display(@result);
-}
-
-sub CompareFiles {
-
-  open(BASE,"<$_[0]") || die "Can't output $_[0] $!";
-  open(VERI,"<$_[1]") || die "Can't output $_[1] $!";
-
-  #Separate file contents into URL and DOCUMENT
-
-  while(<BASE>) {
-   ($url,$document1)=split/;/;
-   push(@url1,$url);
-   push(@documents1,$document1);
-  }
-  while(<VERI>) {
-   ($url,$document2)=split/;/;
-   push(@url2,$url);
-   push(@documents2,$document2);
-  }
-
-  #Search for documents that don't match
-
-  for($i=0;$i<=$#documents1+1;$i++) {
-   if($documents1[$i] !~ /$documents2[$i]/) {
-    (@string1)=split(//,$documents1[$i]);
-    (@string2)=split(//,$documents2[$i]);
-    for($j=0;$j<=$#string1;$j++) {
-     # Find the character that failed
-     if($string1[$j] !~ /$string2[$j]/) {
-       push(@result,$url1[$i],$string2[$j],$j);
-       $j=@string1; # Stop looping
-     }
-    }
-   }
-  }
-  close(BASE);
-  close(VERI);
-
-  return @result;
-}
-
-
-sub Display {
-  for($i=0;$i<@_;$i++) {
-   print "\n $_[$i++] failed on character '$_[$i++]' at location $_[$i]";
-  }
-  print "\n--------------------\n";
-  $count=@_/3;
-  if(($count)>0) {
-    print "$count url(s) failed\n";
-  }
-  else {
-    print "\nALL SUCCEEDED\n";
-  }
-}

--- a/widget/src/os2/nsWidgetDefs.h
+++ b/widget/src/os2/nsWidgetDefs.h
@@ -104,18 +104,16 @@ typedef struct _tagOFN {
    ULONG                             lCustData;
    PFN                               lpfnHook;
    PCSZ                              lpTemplateName;
 } OPENFILENAME, *POPENFILENAME, *LPOPENFILENAME;
 
 extern "C" BOOL APIENTRY DaxOpenSave(BOOL, LONG *, LPOPENFILENAME, PFNWP);
 #endif
 
-#define SUPPORT_NON_XPFE /* support for viewer.exe */
-
 class nsDragService;
 class nsIAppShell;
 
 // messages - here to avoid duplication
 #define WMU_CALLMETHOD   (WM_USER + 1)
 #define WMU_SENDMSG      (WM_USER + 2)
 
 // MP1 is "LONG lIndex", MP2 is reserved