diff --git a/demos/SPC5/RT-SPC56EC-EVB/Makefile_ghs b/demos/SPC5/RT-SPC56EC-EVB/Makefile_ghs
index 5fa7c22d6..87c7b7058 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/Makefile_ghs
+++ b/demos/SPC5/RT-SPC56EC-EVB/Makefile_ghs
@@ -148,10 +148,10 @@ MOT  = gsrec
 BIN  = gmemfile
 
 # Define C warning options here
-CWARN = --ghstd=last
+CWARN = -Wunknown-pragmas -Wimplicit-int -Wshadow -Wtrigraphs -Wundef
 
 # Define C++ warning options here
-CPPWARN = --ghstd=last
+CPPWARN = -Wunknown-pragmas -Wimplicit-int -Wshadow -Wtrigraphs -Wundef
 
 #
 # Compiler settings
diff --git a/os/common/startup/e200/compilers/GHS/rules.mk b/os/common/startup/e200/compilers/GHS/rules.mk
index 6fd45a430..dcaab3b91 100644
--- a/os/common/startup/e200/compilers/GHS/rules.mk
+++ b/os/common/startup/e200/compilers/GHS/rules.mk
@@ -58,14 +58,6 @@ ifeq ($(BUILDDIR),.)
   BUILDDIR = build
 endif
 
-# Dependencies directory
-ifeq ($(DEPDIR),)
-  DEPDIR = .dep
-endif
-ifeq ($(DEPDIR),.)
-  DEPDIR = .dep
-endif
-
 OUTFILES = $(BUILDDIR)/$(PROJECT).elf $(BUILDDIR)/$(PROJECT).hex \
            $(BUILDDIR)/$(PROJECT).mot $(BUILDDIR)/$(PROJECT).bin \
            $(BUILDDIR)/$(PROJECT).dmp
@@ -240,7 +232,7 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 
 clean: CLEAN_RULE_HOOK
 	@echo Cleaning
-	-rm -fR $(DEPDIR) $(BUILDDIR)
+	-rm -fR $(BUILDDIR)
 	@echo
 	@echo Done
 
@@ -249,6 +241,6 @@ CLEAN_RULE_HOOK:
 #
 # Include the dependency files, should be the last of the makefile
 #
--include $(shell mkdir $(DEPDIR) 2>/dev/null) $(wildcard $(DEPDIR)/*)
+-include $(wildcard $(OBJDIR)/*.d)
 
 # *** EOF ***