diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index 1ea79ac26a8..285bc48b5c8 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -2047,9 +2047,6 @@ nsDocument::ContentAppended(nsIContent* aContainer,
 {
   NS_ABORT_IF_FALSE(aContainer, "Null container!");
 
-#ifdef XP_OS2_VACPP
-  volatile
-#endif
   PRInt32 i;
 
   // XXXdwh There is a hacky ordering dependency between the binding
diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index aa67a9af5da..869932e7318 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -37,13 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifdef XP_OS2_VACPP
-// XXX every other file that pulls in _os2.h has no problem with HTMX there;
-// this one does; the problem may lie with the order of the headers below,
-// which is why this fix is here instead of in _os2.h
-typedef unsigned long HMTX;
-#endif
-
 #include "nsDocShell.h"
 #include "nsIWebShell.h"
 #include "nsWebShell.h"
diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in
index 15e8dd2e8e3..7b887d38c3d 100644
--- a/mozilla/intl/uconv/src/Makefile.in
+++ b/mozilla/intl/uconv/src/Makefile.in
@@ -118,12 +118,8 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-OS_LIBS += libuls.lib
-else
 OS_LIBS += -llibuni
 endif
-endif
 
 LOCAL_INCLUDES	= -I$(srcdir)/../util
 
diff --git a/mozilla/intl/uconv/ucvibm/Makefile.in b/mozilla/intl/uconv/ucvibm/Makefile.in
index 69dcee1403c..2e199ce6928 100644
--- a/mozilla/intl/uconv/ucvibm/Makefile.in
+++ b/mozilla/intl/uconv/ucvibm/Makefile.in
@@ -17,18 +17,8 @@
 # Rights Reserved.
 #
 # Contributor(s): 
-# IBM Corporation
+#  IBM Corp.
 #
-# This Original Code has been modified by IBM Corporation.
-# Modifications made by IBM described herein are
-# Copyright (c) International Business Machines
-# Corporation, 1999
-#
-# Modifications to Mozilla code or documentation
-# identified per MPL Section 3.3
-#
-# Date         Modified by     Description of modification
-# 12/09/1999   IBM Corp.       Support for IBM codepages - 850,852,855,857,862,864
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -67,11 +57,7 @@ EXPORTS		= nsUCvIBMCID.h
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-OS_LIBS += libuls.lib
-else
 OS_LIBS += -llibuni
 endif
-endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/layout/generic/nsLineLayout.h b/mozilla/layout/generic/nsLineLayout.h
index 4abd491b532..6beb5446493 100644
--- a/mozilla/layout/generic/nsLineLayout.h
+++ b/mozilla/layout/generic/nsLineLayout.h
@@ -393,7 +393,7 @@ protected:
   PerFrameData* mFrameFreeList;
   PRInt32 mInitialFramesFreed;
 
-#if defined(AIX_XLC_364) || defined(XP_OS2_VACPP)
+#if defined(AIX_XLC_364)
 public:
 #endif
   struct PerSpanData {
@@ -431,7 +431,7 @@ public:
       mLastFrame = pfd;
     }
   };
-#if defined(AIX_XLC_364) || defined(XP_OS2_VACPP)
+#if defined(AIX_XLC_364)
 protected:
 #endif
   PerSpanData mSpanDataBuf[NS_LINELAYOUT_NUM_SPANS];
diff --git a/mozilla/layout/html/base/src/nsLineLayout.h b/mozilla/layout/html/base/src/nsLineLayout.h
index 4abd491b532..6beb5446493 100644
--- a/mozilla/layout/html/base/src/nsLineLayout.h
+++ b/mozilla/layout/html/base/src/nsLineLayout.h
@@ -393,7 +393,7 @@ protected:
   PerFrameData* mFrameFreeList;
   PRInt32 mInitialFramesFreed;
 
-#if defined(AIX_XLC_364) || defined(XP_OS2_VACPP)
+#if defined(AIX_XLC_364)
 public:
 #endif
   struct PerSpanData {
@@ -431,7 +431,7 @@ public:
       mLastFrame = pfd;
     }
   };
-#if defined(AIX_XLC_364) || defined(XP_OS2_VACPP)
+#if defined(AIX_XLC_364)
 protected:
 #endif
   PerSpanData mSpanDataBuf[NS_LINELAYOUT_NUM_SPANS];
diff --git a/mozilla/modules/libpref/src/prefapi.cpp b/mozilla/modules/libpref/src/prefapi.cpp
index 5a4210474f0..c189a1f9117 100644
--- a/mozilla/modules/libpref/src/prefapi.cpp
+++ b/mozilla/modules/libpref/src/prefapi.cpp
@@ -605,10 +605,7 @@ pref_savePref(PLDHashTable *table, PLDHashEntryHdr *heh, PRUint32 i, void *arg)
     return PL_DHASH_NEXT;
 }
 
-int
-#ifdef XP_OS2_VACPP
-_Optlink
-#endif
+int PR_CALLBACK
 pref_CompareStrings(const void *v1, const void *v2, void *unused)
 {
     char *s1 = *(char**) v1;
diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in
index 962b8a7bc5a..66414561e0d 100644
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/Makefile.in
@@ -158,12 +158,8 @@ EXTRA_LIBS		= $(TK_LIBS)
 XLIB_LIBS		= unix/xlib/libviewer_xlib_s.a $(XP_LIBS) $(MOZ_XLIB_LDFLAGS)
 GTK_LIBS		= unix/gtk/libviewer_gtk_s.a -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
 
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-XP_DIST_DEP_LIBS    := $(patsubst -l%,$(DIST)/lib/%.lib,$(XP_DIST_LIBS))
-else
 XP_DIST_DEP_LIBS	:= $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS))
 XP_DIST_DEP_LIBS	:= $(wildcard $(addprefix $(DIST)/,$(patsubst -l%,bin/$(LIB_PREFIX)%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s)))*)
-endif
 
 EXTRA_DEPS		= \
 			$(XP_DIST_DEP_LIBS) \
diff --git a/mozilla/webshell/tests/viewer/os2/nsdefs.h b/mozilla/webshell/tests/viewer/os2/nsdefs.h
index 7c85d343a5f..ab90c27739f 100644
--- a/mozilla/webshell/tests/viewer/os2/nsdefs.h
+++ b/mozilla/webshell/tests/viewer/os2/nsdefs.h
@@ -42,9 +42,6 @@
 #define INCL_WINERRORS
 #endif
 #include <os2.h>
-#ifdef XP_OS2_VACPP
-#include <builtin.h>
-#endif
 
 #ifdef _DEBUG
   #define BREAK_TO_DEBUGGER           _interrupt(3)
diff --git a/mozilla/widget/src/os2/Makefile.in b/mozilla/widget/src/os2/Makefile.in
index 7da6d43f4a1..54ddf34d3cc 100644
--- a/mozilla/widget/src/os2/Makefile.in
+++ b/mozilla/widget/src/os2/Makefile.in
@@ -70,11 +70,7 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-OS_LIBS += libuls.lib libconv.lib unikbd.lib
-else
 OS_LIBS += -llibuni -luconv -lunikbd
-endif
 
 ifdef ENABLE_TESTS
 HAS_EXTRAEXPORTS = 1
diff --git a/mozilla/widget/src/os2/nsdefs.h b/mozilla/widget/src/os2/nsdefs.h
index fb5d1a3484a..93c2223f8c6 100644
--- a/mozilla/widget/src/os2/nsdefs.h
+++ b/mozilla/widget/src/os2/nsdefs.h
@@ -42,16 +42,9 @@
 #define INCL_WINERRORS
 #endif
 #include <os2.h>
-#ifdef XP_OS2_VACPP
-#include <builtin.h>
-#endif
 
 #ifdef _DEBUG
- #ifdef XP_OS2_VACPP
-  #define BREAK_TO_DEBUGGER           _interrupt(3)
- #else
   #define BREAK_TO_DEBUGGER           asm("int $3")
- #endif
 #else   
   #define BREAK_TO_DEBUGGER
 #endif