diff --git a/config/config.mk b/config/config.mk
index d246b8dc8ac0..9ad21697a370 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -660,12 +660,6 @@ endif
 -include $(topsrcdir)/$(MOZ_BUILD_APP)/app-config.mk
 -include $(MY_CONFIG)
 
-######################################################################
-# Now test variables that might have been set or overridden by $(MY_CONFIG).
-
-DEFINES		+= -DOSTYPE=\"$(OS_CONFIG)\"
-DEFINES		+= -DOSARCH=$(OS_ARCH)
-
 ######################################################################
 
 GARBAGE		+= $(DEPENDENCIES) $(MKDEPENDENCIES) $(MKDEPENDENCIES).bak core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB
diff --git a/intl/locale/src/unix/Makefile.in b/intl/locale/src/unix/Makefile.in
index c28ea5c56c3e..4093cfd1fd00 100644
--- a/intl/locale/src/unix/Makefile.in
+++ b/intl/locale/src/unix/Makefile.in
@@ -71,6 +71,8 @@ ifeq ($(OS_ARCH), Linux)
 DEFINES		+= -D_XOPEN_SOURCE=500
 endif
 
+DEFINES += -DOSTYPE=\"$(OS_CONFIG)\"
+
 nsUNIXCharset.$(OBJ_SUFFIX): unixcharset.properties.h
 
 unixcharset.properties.h: $(srcdir)/../props2arrays.py unixcharset.properties
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index d246b8dc8ac0..9ad21697a370 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -660,12 +660,6 @@ endif
 -include $(topsrcdir)/$(MOZ_BUILD_APP)/app-config.mk
 -include $(MY_CONFIG)
 
-######################################################################
-# Now test variables that might have been set or overridden by $(MY_CONFIG).
-
-DEFINES		+= -DOSTYPE=\"$(OS_CONFIG)\"
-DEFINES		+= -DOSARCH=$(OS_ARCH)
-
 ######################################################################
 
 GARBAGE		+= $(DEPENDENCIES) $(MKDEPENDENCIES) $(MKDEPENDENCIES).bak core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB
diff --git a/layout/style/forms.css b/layout/style/forms.css
index 5681ebe13d72..869819550b51 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -692,7 +692,7 @@ progress {
   background-color: #0064b4; /* blue */
 }
 
-%if OSARCH==OS2
+%ifdef XP_OS2
 input {
   font: medium serif; font-family: inherit
 }