diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in
index 5b65042c9e7..a5319b86aa8 100644
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@@ -284,7 +284,6 @@ endif
 ifeq ($(OS_ARCH),OS2)
 ifdef BUILD_STATIC_LIBS
 EXE_DEF_FILE = mozilla.def
-OS_LIBS += -llibuni -luconv
 endif
 endif
 
diff --git a/xpfe/bootstrap/nsNativeAppSupportOS2.cpp b/xpfe/bootstrap/nsNativeAppSupportOS2.cpp
index a3aeb44b037..9b8ba5f6df0 100644
--- a/xpfe/bootstrap/nsNativeAppSupportOS2.cpp
+++ b/xpfe/bootstrap/nsNativeAppSupportOS2.cpp
@@ -198,7 +198,7 @@ public:
 }; // class nsSplashScreenOS2
 
 MRESULT EXPENTRY DialogProc( HWND dlg, ULONG msg, MPARAM mp1, MPARAM mp2 );
-void _Optlink ThreadProc (void *splashScreen);
+void ThreadProc (void *splashScreen);
 
 // Simple Win32 mutex wrapper.
 struct Mutex {
@@ -628,7 +628,7 @@ nsSplashScreenOS2 *nsSplashScreenOS2::GetPointer( HWND dlg ) {
     return (nsSplashScreenOS2*)data;
 }
 
-void _Optlink ThreadProc(void *splashScreen) {
+void ThreadProc(void *splashScreen) {
     HAB hab = WinInitialize( 0 );
     HMQ hmq = WinCreateMsgQueue( hab, 0 );
     WinDlgBox( HWND_DESKTOP, HWND_DESKTOP, (PFNWP)DialogProc, NULLHANDLE, IDD_SPLASH, (MPARAM)splashScreen );