diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index fb167bbe9..81fb51b7b 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -205,9 +205,11 @@ LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(DEPLIB_LDLIBS) $(STATIC_LDLIBS)\
 
 CPPFLAGS += $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS) $(EPICS_BASE_CPPFLAGS)\
  $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
- $(OP_SYS_CPPFLAGS) $(CODE_CPPFLAGS)
+ $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
-CPPSNCFLAGS = $(CPPFLAGS) $(INCLUDES)
+CPPSNCFLAGS += $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS) $(EPICS_BASE_CPPFLAGS)\
+ $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
+ $(OP_SYS_CPPFLAGS) $(CODE_CPPFLAGS)
 
 #--------------------------------------------------
 # ar definition default
@@ -217,7 +219,6 @@ ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
 #--------------------------------------------------
 # snc (state notation language) flags
 # Use C++ constructors to register commands/programs (snc +i option)
-# CPPSNCFLAGS += -x c
 TARGET_SNCFLAGS += +i
 
 #--------------------------------------------------