diff --git a/config/CONFIG.Vx.frc40 b/config/CONFIG.Vx.frc40
index a07a92d0c..b9ddff238 100644
--- a/config/CONFIG.Vx.frc40
+++ b/config/CONFIG.Vx.frc40
@@ -10,5 +10,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CFLAGS = -m68040
 
diff --git a/config/CONFIG.Vx.frc5ce b/config/CONFIG.Vx.frc5ce
index 2bf674f39..6d2527e7a 100644
--- a/config/CONFIG.Vx.frc5ce
+++ b/config/CONFIG.Vx.frc5ce
@@ -8,7 +8,8 @@ CMPLR_SUFFIX = sparc
 ARCH_CLASS = sparc
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=SPARC -DCPU_FAMILY=SPARC
+ARCH_DEP_CPPFLAGS = -DCPU=SPARC -DCPU_FAMILY=SPARC
+ARCH_DEP_CFLAGS =
 # Removed -O2 [24/12/96 PMM]
 OLD_ARCH_DEP_CXXFLAGS = -fno-builtin -ansi -pipe -nostdinc -DCPU=SPARC \
                       -DVXWORKS -Dsigned= -Dvolatile= +V  
diff --git a/config/CONFIG.Vx.hkbaja47 b/config/CONFIG.Vx.hkbaja47
index 5597d99c5..5045dfdb9 100644
--- a/config/CONFIG.Vx.hkbaja47
+++ b/config/CONFIG.Vx.hkbaja47
@@ -11,7 +11,8 @@ CMPLR_SUFFIX = mips
 ARCH_CLASS = mips
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -EB -mcpu=r4000 -mips3 -mgp32 -mfp32 -non_shared -G 0 -DCPU=R4000
+ARCH_DEP_CPPFLAGS = -DCPU=R4000
+ARCH_DEP_CFLAGS = -EB -mcpu=r4000 -mips3 -mgp32 -mfp32 -non_shared -G 0
 
 # Arch specific flags
 GCC += -fsigned-char
diff --git a/config/CONFIG.Vx.hkv2f b/config/CONFIG.Vx.hkv2f
index 75742b2e1..af8ab6864 100644
--- a/config/CONFIG.Vx.hkv2f
+++ b/config/CONFIG.Vx.hkv2f
@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68020 -m68020 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68020 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CFLAGS = -m68020
  
diff --git a/config/CONFIG.Vx.mv147 b/config/CONFIG.Vx.mv147
index 21d0612eb..2fe2b0df5 100644
--- a/config/CONFIG.Vx.mv147
+++ b/config/CONFIG.Vx.mv147
@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
  
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68030 -m68030 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68030 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CFLAGS = -m68030
  
diff --git a/config/CONFIG.Vx.mv1604 b/config/CONFIG.Vx.mv1604
index aa958c30e..d15ade983 100644
--- a/config/CONFIG.Vx.mv1604
+++ b/config/CONFIG.Vx.mv1604
@@ -10,5 +10,6 @@ CMPLR_SUFFIX = ppc
 ARCH_CLASS = ppc
 
 # Architecture specific build flags (TRUE=1 via LBL; needed in camessage.c)
-ARCH_DEP_CFLAGS = -fno-for-scope -DCPU_FAMILY=PPC -DCPU=PPC604 -D_GNU_TOOL -DTRUE=1
+ARCH_DEP_CPPFLAGS = -DCPU_FAMILY=PPC -DCPU=PPC604 -D_GNU_TOOL -DTRUE=1
+ARCH_DEP_CFLAGS = -fno-for-scope
 
diff --git a/config/CONFIG.Vx.mv162 b/config/CONFIG.Vx.mv162
index 52ab428f2..702ed9c79 100644
--- a/config/CONFIG.Vx.mv162
+++ b/config/CONFIG.Vx.mv162
@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CFLAGS = -m68040
  
diff --git a/config/CONFIG.Vx.mv162lc b/config/CONFIG.Vx.mv162lc
index e63415fa1..ace338d1f 100644
--- a/config/CONFIG.Vx.mv162lc
+++ b/config/CONFIG.Vx.mv162lc
@@ -11,4 +11,5 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68040 -msoft-float -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CFLAGS = -msoft-float
diff --git a/config/CONFIG.Vx.mv167 b/config/CONFIG.Vx.mv167
index 52ab428f2..702ed9c79 100644
--- a/config/CONFIG.Vx.mv167
+++ b/config/CONFIG.Vx.mv167
@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CFLAGS = -m68040
  
diff --git a/config/CONFIG.Vx.mv177 b/config/CONFIG.Vx.mv177
index 4ec36d240..983054897 100644
--- a/config/CONFIG.Vx.mv177
+++ b/config/CONFIG.Vx.mv177
@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68060 -m68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68060 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CFLAGS = -m68040
  
diff --git a/config/CONFIG.Vx.niCpu030 b/config/CONFIG.Vx.niCpu030
index a56b1fe9b..5c80afcef 100644
--- a/config/CONFIG.Vx.niCpu030
+++ b/config/CONFIG.Vx.niCpu030
@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68030 -m68030 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68030 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CFLAGS = -m68030
  
diff --git a/config/CONFIG.Vx.pc486 b/config/CONFIG.Vx.pc486
index d45f205ab..2fdabe6e4 100644
--- a/config/CONFIG.Vx.pc486
+++ b/config/CONFIG.Vx.pc486
@@ -10,7 +10,8 @@ CMPLR_SUFFIX = 386
 #   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
 ARCH_CLASS = pc486
 
-ARCH_DEP_CFLAGS = -DCPU=I80486 -m486 -DCPU_FAMILY=I80x86 -D_X86_ 
+ARCH_DEP_CPPFLAGS = -DCPU=I80486 -DCPU_FAMILY=I80x86 -D_X86_ 
+ARCH_DEP_CFLAGS = -m486
 ARCH_DEP_CXXFLAGS += -x 'c++' 
 ARCH_DEP_CFLAGS +=   -fno-builtin -fno-defer-pop
 
diff --git a/config/CONFIG.Vx.vxipc b/config/CONFIG.Vx.vxipc
index 1a3276c32..1d1606aa0 100644
--- a/config/CONFIG.Vx.vxipc
+++ b/config/CONFIG.Vx.vxipc
@@ -10,7 +10,8 @@ CMPLR_SUFFIX = 386
 #   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
 ARCH_CLASS = pc486
 
-ARCH_DEP_CFLAGS = -DCPU=I80486 -m486 -DCPU_FAMILY=I80x86 -D_X86_ 
+ARCH_DEP_CPPFLAGS = -DCPU=I80486 -DCPU_FAMILY=I80x86 -D_X86_ 
+ARCH_DEP_CFLAGS = -m486
 ARCH_DEP_CXXFLAGS += -x 'c++' 
 ARCH_DEP_CFLAGS +=   -fno-builtin -fno-defer-pop
 
diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON
index eb37e726a..cbae36966 100644
--- a/config/CONFIG_COMMON
+++ b/config/CONFIG_COMMON
@@ -210,7 +210,7 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS)\
  $(STATIC_LDLIBS) $(OP_SYS_LDLIBS)
 
-CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)
 
 CPPSNCFLAGS = $(INCLUDES)