diff --git a/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in b/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
index 211749628e3..7faf0d97905 100644
--- a/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
+++ b/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
@@ -91,7 +91,7 @@ endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
-  LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
+LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
 endif
 
 ifneq ($(OS_ARCH), WINNT)
diff --git a/nsprpub/lib/tests/Makefile.in b/nsprpub/lib/tests/Makefile.in
index 5ed490678b0..257da2413dc 100644
--- a/nsprpub/lib/tests/Makefile.in
+++ b/nsprpub/lib/tests/Makefile.in
@@ -99,7 +99,7 @@ endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
-  LDOPTS += -Zomf -Zlinker /PM:VIO
+LDOPTS += -Zomf -Zlinker /PM:VIO
 endif
 
 ifneq ($(OS_ARCH), WINNT)
diff --git a/nsprpub/pr/src/Makefile.in b/nsprpub/pr/src/Makefile.in
index 66865fdc3d0..dd096ec3d0e 100644
--- a/nsprpub/pr/src/Makefile.in
+++ b/nsprpub/pr/src/Makefile.in
@@ -237,6 +237,7 @@ OBJS = \
 	threads/$(OBJDIR)/prrwlock.$(OBJ_SUFFIX) \
 	threads/$(OBJDIR)/prtpd.$(OBJ_SUFFIX) \
     linking/$(OBJDIR)/prlink.$(OBJ_SUFFIX) \
+    malloc/$(OBJDIR)/prmalloc.$(OBJ_SUFFIX) \
     malloc/$(OBJDIR)/prmem.$(OBJ_SUFFIX) \
     md/$(OBJDIR)/prosdep.$(OBJ_SUFFIX) \
     memory/$(OBJDIR)/prshm.$(OBJ_SUFFIX) \
@@ -255,7 +256,6 @@ OBJS = \
     misc/$(OBJDIR)/pripc.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prlog2.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prlong.$(OBJ_SUFFIX) \
-    malloc/$(OBJDIR)/prmalloc.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prnetdb.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prolock.$(OBJ_SUFFIX)	 \
     misc/$(OBJDIR)/prrng.$(OBJ_SUFFIX)	 \
diff --git a/nsprpub/pr/src/cplus/tests/Makefile.in b/nsprpub/pr/src/cplus/tests/Makefile.in
index f647c11e27b..1b5d4706168 100644
--- a/nsprpub/pr/src/cplus/tests/Makefile.in
+++ b/nsprpub/pr/src/cplus/tests/Makefile.in
@@ -139,7 +139,7 @@ endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
-  LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
+LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
 endif
 
 ifneq ($(OS_ARCH), WINNT)
diff --git a/nsprpub/pr/src/md/os2/os2thred.c b/nsprpub/pr/src/md/os2/os2thred.c
index 901d3331f27..dcd3e93605f 100644
--- a/nsprpub/pr/src/md/os2/os2thred.c
+++ b/nsprpub/pr/src/md/os2/os2thred.c
@@ -37,9 +37,7 @@
 
 #include "primpl.h"
 #include <process.h>  /* for _beginthread() */
-
 #include <signal.h>
-
 #include <float.h>
 
 /* --- globals ------------------------------------------------ */
diff --git a/nsprpub/pr/tests/Makefile.in b/nsprpub/pr/tests/Makefile.in
index 2aecefb2c32..329737cad19 100644
--- a/nsprpub/pr/tests/Makefile.in
+++ b/nsprpub/pr/tests/Makefile.in
@@ -236,8 +236,8 @@ endif # NS_USE_GCC
 endif
 
 ifeq ($(OS_ARCH),OS2)
-  EXTRA_LIBS = $(OS_LIBS)
-  LDOPTS = -Zomf -Zlinker /PM:VIO -Zlinker /ST:0x64000
+EXTRA_LIBS = $(OS_LIBS)
+LDOPTS = -Zomf -Zlinker /PM:VIO -Zlinker /ST:0x64000
 endif
 
 ifneq ($(OS_ARCH), WINNT)
diff --git a/nsprpub/tools/Makefile.in b/nsprpub/tools/Makefile.in
index e961b74f70c..00afdc66903 100644
--- a/nsprpub/tools/Makefile.in
+++ b/nsprpub/tools/Makefile.in
@@ -90,7 +90,7 @@ endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
-  LDOPTS += -Zomf -Zlinker /PM:VIO
+LDOPTS += -Zomf -Zlinker /PM:VIO
 endif
 
 ifneq ($(OS_ARCH), WINNT)