diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 7e3009b1d7e8..4f1027da57a2 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -561,7 +561,6 @@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
 # XXX - these need to be cleaned up and have real checks added -cls
 CM_BLDTYPE=dbg
 AWT_11=1
-MOZ_BITS=32
 OS_TARGET=@OS_TARGET@
 OS_ARCH=@OS_ARCH@
 OS_RELEASE=@OS_RELEASE@
diff --git a/configure.in b/configure.in
index 4e572c031ffc..d5679320b009 100644
--- a/configure.in
+++ b/configure.in
@@ -2240,7 +2240,7 @@ case "$target" in
             fi
         fi
     fi
-    MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg$(MOZ_BITS)$(VERSION_NUMBER),$(DEPTH)/jpeg)'
+    MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg32$(VERSION_NUMBER),$(DEPTH)/jpeg)'
     MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/modules/libimg/png)'
     AC_DEFINE(HAVE_SNPRINTF)
     AC_DEFINE(_WINDOWS)
diff --git a/dbm/include/Makefile.win b/dbm/include/Makefile.win
index df31e52737db..a96e60912e1f 100644
--- a/dbm/include/Makefile.win
+++ b/dbm/include/Makefile.win
@@ -41,12 +41,6 @@
 #//
 #//------------------------------------------------------------------------
 
-!if "$(MOZ_BITS)" == "16"
-!ifndef MOZ_DEBUG
-OPTIMIZER=-Os -UDEBUG -DNDEBUG
-!endif
-!endif
-
 #//------------------------------------------------------------------------
 #//
 #// Specify the depth of the current directory relative to the
diff --git a/dbm/src/Makefile.in b/dbm/src/Makefile.in
index 2f7476d8c86f..48a99d7558cb 100644
--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@@ -46,7 +46,7 @@ LIBRARY_NAME	= mozdbm_s
 LIB_IS_C_ONLY	= 1
 
 ifeq ($(OS_ARCH),WINNT)
-LIBRARY_NAME	= dbm$(MOZ_BITS)
+LIBRARY_NAME	= dbm32
 endif
 
 CSRCS		= \
diff --git a/dbm/src/Makefile.win b/dbm/src/Makefile.win
index 91bdf7d2092f..4a4e86949a05 100644
--- a/dbm/src/Makefile.win
+++ b/dbm/src/Makefile.win
@@ -41,12 +41,6 @@
 #//
 #//------------------------------------------------------------------------
 
-!if "$(MOZ_BITS)" == "16"
-!ifndef MOZ_DEBUG
-OPTIMIZER=-Os -UDEBUG -DNDEBUG
-!endif
-!endif
-
 #//------------------------------------------------------------------------
 #//
 #// Specify the depth of the current directory relative to the
@@ -64,7 +58,7 @@ MAKE_OBJ_TYPE=EXE
 #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
 #//
 #//------------------------------------------------------------------------
-LIBNAME=dbm$(MOZ_BITS)
+LIBNAME=dbm32
 PDBFILE=$(LIBNAME).pdb
 
 #//------------------------------------------------------------------------
diff --git a/dbm/tests/Makefile.in b/dbm/tests/Makefile.in
index ffb83f29b3de..46fc62918a32 100644
--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@@ -51,7 +51,7 @@ PROGRAM		= lots$(BIN_SUFFIX)
 CSRCS		= lots.c
 
 ifeq ($(OS_ARCH),WINNT)
-EXTRA_DSO_LIBS	= dbm$(MOZ_BITS)
+EXTRA_DSO_LIBS	= dbm32
 else
 EXTRA_DSO_LIBS	= mozdbm_s
 endif
diff --git a/jpeg/Makefile.in b/jpeg/Makefile.in
index fb422455957d..d19133ddbf10 100644
--- a/jpeg/Makefile.in
+++ b/jpeg/Makefile.in
@@ -46,7 +46,7 @@ MODULE		= jpeg
 LIBRARY_NAME	= mozjpeg
 
 ifeq ($(OS_ARCH),WINNT)
-LIBRARY_NAME	= jpeg$(MOZ_BITS)$(VERSION_NUMBER)
+LIBRARY_NAME	= jpeg32$(VERSION_NUMBER)
 # FIXME: bug 413019
 ifndef GNU_CC
 OS_COMPILE_CFLAGS += -GL-
diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in
index 79bcee300e12..fb2500a49f15 100644
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -49,7 +49,7 @@ MODULE		= jsdebug
 LIBRARY_NAME	= jsd
 FORCE_SHARED_LIB= 1
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
-LIBRARY_NAME	= jsd$(MOZ_BITS)$(VERSION_NUMBER)
+LIBRARY_NAME	= jsd32$(VERSION_NUMBER)
 endif
 
 # REQUIRES	= java js
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 144f75026b46..fdcf58d2a3c0 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -296,7 +296,6 @@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
 # XXX - these need to be cleaned up and have real checks added -cls
 CM_BLDTYPE=dbg
 AWT_11=1
-MOZ_BITS=32
 OS_TARGET=@OS_TARGET@
 OS_ARCH=@OS_ARCH@
 OS_RELEASE=@OS_RELEASE@
diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in
index 2bcbc4e9afad..626d9ef92f67 100644
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -52,8 +52,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= xpconnect
 GRE_MODULE	= 1
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
-LIBRARY_NAME	= xpc$(MOZ_BITS)$(VERSION_NUMBER)
-SHORT_LIBNAME	= xpc$(MOZ_BITS)$(VERSION_NUMBER)
+LIBRARY_NAME	= xpc32$(VERSION_NUMBER)
+SHORT_LIBNAME	= xpc32$(VERSION_NUMBER)
 endif
 LIBXUL_LIBRARY = 1
 
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
index b7836f0385ea..9bffa53b4bbf 100644
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -48,7 +48,7 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsPrefModule
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
-LIBRARY_NAME	= xppref$(MOZ_BITS)
+LIBRARY_NAME	= xppref32
 endif
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1