diff --git a/mozilla/xpinstall/cleanup/InstallCleanup.h b/mozilla/xpinstall/cleanup/InstallCleanup.h
index 4bdf61a4354..dc5ebf16e86 100644
--- a/mozilla/xpinstall/cleanup/InstallCleanup.h
+++ b/mozilla/xpinstall/cleanup/InstallCleanup.h
@@ -25,6 +25,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#ifdef XP_OS2
+#define INCL_DOS
+#include <os2.h>
+#include <sys\types.h>
+#include <sys\stat.h>
+#include <string.h>
+#endif
+
 #include "prtypes.h"
 #include "VerReg.h"
 
diff --git a/mozilla/xpinstall/cleanup/Makefile.in b/mozilla/xpinstall/cleanup/Makefile.in
index c6c280ffc56..83a15060923 100644
--- a/mozilla/xpinstall/cleanup/Makefile.in
+++ b/mozilla/xpinstall/cleanup/Makefile.in
@@ -33,9 +33,14 @@ REQUIRES	= libreg
 
 CPPSRCS		= \
         InstallCleanup.cpp \
-	InstallCleanupUnix.cpp \
         $(NULL)
 
+ifeq ($(OS_ARCH),OS2)
+CPPSRCS += InstallCleanupOS2.cpp
+else
+CPPSRCS += InstallCleanupUnix.cpp
+endif
+
 LIBS        = \
         -lmozregsa_s \
         $(NULL)