-GENINC := -I$(ALICE_ROOT)/include -I$(shell root-config --incdir)
-CXXFLAGS += $(GENINC) $(shell root-config --cflags)
-CXXFLAGSNO += $(GENINC) $(shell root-config --cflags)
-CFLAGS += $(GENINC) $(shell root-config --cflags)
-CINTFLAGS += $(GENINC) $(shell root-config --cflags)
-FFLAGS += $(shell root-config --cflags)
-LDFLAGS += $(shell root-config --ldflags)
-SOFLAGS += $(shell root-config --ldflags)
+GENINC := -I$(ALICE_ROOT)/include -isystem$(shell root-config --incdir)
+RCFLAGS := $(shell root-config --auxcflags)
+RLFLAGS := $(shell root-config --ldflags)
+CXXFLAGS += $(GENINC) $(RCFLAGS)
+CXXFLAGSNO += $(GENINC) $(RCFLAGS) -Wno-write-strings
+CFLAGS += $(GENINC) $(RCFLAGS)
+CINTFLAGS += $(GENINC) $(RCFLAGS)
+FFLAGS += $(RCFLAGS)
+LDFLAGS += $(RLFLAGS)
+SOFLAGS += $(RLFLAGS)