diff --git a/share/trick/makefiles/Makefile.common b/share/trick/makefiles/Makefile.common
index 15087b35..eae1cac1 100644
--- a/share/trick/makefiles/Makefile.common
+++ b/share/trick/makefiles/Makefile.common
@@ -68,13 +68,10 @@ ifeq ($(MAKELEVEL),0)
 
 export TRICK_INCLUDES := -I${TRICK_HOME}/trick_source -I${TRICK_HOME}/include -I${TRICK_HOME}/include/trick/compat
 export TRICK_VERSIONS := -DTRICK_VER=$(TRICK_MAJOR) -DTRICK_MINOR=$(TRICK_MINOR)
+
 TRICK_SYSTEM_CFLAGS = $(TRICK_INCLUDES) $(TRICK_VERSIONS) -fpic
-ifdef TRICK_CXXFLAGS
-    TRICK_SYSTEM_CXXFLAGS += $(TRICK_INCLUDES) $(TRICK_VERSIONS) -fpic
-else
-    TRICK_SYSTEM_CXXFLAGS := ${TRICK_CFLAGS}
-endif
-TRICK_SYSTEM_SFLAGS += -I${TRICK_HOME}/share/trick $(TRICK_INCLUDES) $(TRICK_VERSIONS)
+TRICK_SYSTEM_CXXFLAGS = $(TRICK_INCLUDES) $(TRICK_VERSIONS) -fpic
+TRICK_SYSTEM_SFLAGS = -I${TRICK_HOME}/share/trick $(TRICK_INCLUDES) $(TRICK_VERSIONS)
 
 # append additional c and cxx flags defined in config_*.mk files.
 TRICK_SYSTEM_CFLAGS += $(TRICK_ADDITIONAL_CFLAGS)