diff --git a/SWIG/Examples/GIFPlot/Chicken/full/Makefile b/SWIG/Examples/GIFPlot/Chicken/full/Makefile
index 966ea826e..8d1e129a2 100644
--- a/SWIG/Examples/GIFPlot/Chicken/full/Makefile
+++ b/SWIG/Examples/GIFPlot/Chicken/full/Makefile
@@ -32,7 +32,7 @@ $(TARGET): $(SRCS)
 
 clean::
 	rm -f *_wrap* *.o core *~ *.so *.stackdump STACKTRACE
-	rm -f $(CHICKGEN)
+	rm -f $(CHICKGEN) csi.c precsi.c ogifplot.c
 	rm -f gifplot.scm
 	rm -f $(TARGET)
 	rm -f *.gif
diff --git a/SWIG/Examples/GIFPlot/Chicken/simple/Makefile b/SWIG/Examples/GIFPlot/Chicken/simple/Makefile
index 52d4b5636..017a2dd12 100644
--- a/SWIG/Examples/GIFPlot/Chicken/simple/Makefile
+++ b/SWIG/Examples/GIFPlot/Chicken/simple/Makefile
@@ -32,7 +32,7 @@ $(TARGET): $(SRCS)
 
 clean::
 	rm -f *_wrap* *.o core *~ *.so *.stackdump STACKTRACE
-	rm -f $(CHICKGEN)
+	rm -f $(CHICKGEN) csi.c precsi.c osimple.c
 	rm -f simple.scm
 	rm -f $(TARGET)
 	rm -f *.gif
diff --git a/SWIG/Examples/chicken/class/Makefile b/SWIG/Examples/chicken/class/Makefile
index db98ca811..f0ed7647a 100644
--- a/SWIG/Examples/chicken/class/Makefile
+++ b/SWIG/Examples/chicken/class/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../swig
-CHICKGEN   = csi.o precsi.o oexample.o example.cxx example_wrap.cxx
-SRCS       = $(CHICKGEN)
+CHICKGEN   = csi.o precsi.o oexample.o example_wrap.cxx
+SRCS       = $(CHICKGEN) example.cxx
 TARGET     = class
 INCLUDE    =
 SWIGOPT    = 
@@ -10,7 +10,7 @@ CFLAGS     =
 all:: $(TARGET) example_generic.scm example_clos.scm
 
 .c.o:
-	$(MAKE) -f $(TOP)/Makefile CFLAGS='$(CFLAGS)' TARGET='$@' \
+	$(MAKE) -f $(TOP)/Makefile CFLAGS='$$(CHICKEN_CFLAGS) $(CFLAGS)' TARGET='$@' \
 		INCLUDE='$(INCLUDE)' INTERFACE='$<' compile
 csi.c:
 	$(MAKE) -f $(TOP)/Makefile TARGET='csi.c' \
@@ -35,7 +35,7 @@ $(TARGET): $(SRCS)
 
 clean::
 	rm -f *_wrap* *.o core *~ *.so *.stackdump STACKTRACE
-	rm -f $(CHICKGEN)
+	rm -f $(CHICKGEN) csi.c precsi.c oexample.c
 	rm -f example.scm example_generic.scm example_clos.scm
 	rm -f $(TARGET)
 
diff --git a/SWIG/Examples/chicken/constants/Makefile b/SWIG/Examples/chicken/constants/Makefile
index ec8e61bb5..e12a4bb06 100644
--- a/SWIG/Examples/chicken/constants/Makefile
+++ b/SWIG/Examples/chicken/constants/Makefile
@@ -31,7 +31,7 @@ $(TARGET): $(SRCS)
 
 clean::
 	rm -f *_wrap* *.o core *~ *.so *.stackdump STACKTRACE
-	rm -f $(CHICKGEN)
+	rm -f $(CHICKGEN) csi.c precsi.c oexample.c
 	rm -f example.scm
 	rm -f $(TARGET)
 
diff --git a/SWIG/Examples/chicken/multimap/Makefile b/SWIG/Examples/chicken/multimap/Makefile
index 889928b7e..a8da9580d 100644
--- a/SWIG/Examples/chicken/multimap/Makefile
+++ b/SWIG/Examples/chicken/multimap/Makefile
@@ -31,7 +31,7 @@ $(TARGET): $(SRCS)
 
 clean::
 	rm -f *_wrap* *.o core *~ *.so *.stackdump STACKTRACE
-	rm -f $(CHICKGEN)
+	rm -f $(CHICKGEN) csi.c precsi.c oexample.c
 	rm -f example.scm
 	rm -f $(TARGET)
 
diff --git a/SWIG/Examples/chicken/overload/Makefile b/SWIG/Examples/chicken/overload/Makefile
index eb942275d..b90f67246 100644
--- a/SWIG/Examples/chicken/overload/Makefile
+++ b/SWIG/Examples/chicken/overload/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../swig
-CHICKGEN   = csi.o precsi.o oexample.o example.cxx example_wrap.cxx
-SRCS       = $(CHICKGEN)
+CHICKGEN   = csi.o precsi.o oexample.o example_wrap.cxx
+SRCS       = $(CHICKGEN) example.cxx
 TARGET     = overload
 INCLUDE    =
 SWIGOPT    =
@@ -10,7 +10,7 @@ CFLAGS     =
 all:: $(TARGET) example_generic.scm example_clos.scm
 
 .c.o:
-	$(MAKE) -f $(TOP)/Makefile CFLAGS='$(CFLAGS)' TARGET='$@' \
+	$(MAKE) -f $(TOP)/Makefile CFLAGS='$$(CHICKEN_CFLAGS) $(CFLAGS)' TARGET='$@' \
 		INCLUDE='$(INCLUDE)' INTERFACE='$<' compile
 
 csi.c:
@@ -36,7 +36,7 @@ $(TARGET): $(SRCS)
 
 clean::
 	rm -f *_wrap* *.o core *~ *.so *.stackdump STACKTRACE
-	rm -f $(CHICKGEN)
+	rm -f $(CHICKGEN) csi.c precsi.c oexample.c
 	rm -f example.scm example_generic.scm example_clos.scm
 	rm -f $(TARGET)
 
diff --git a/SWIG/Examples/chicken/simple/Makefile b/SWIG/Examples/chicken/simple/Makefile
index f414f1bae..8960fe202 100644
--- a/SWIG/Examples/chicken/simple/Makefile
+++ b/SWIG/Examples/chicken/simple/Makefile
@@ -31,7 +31,7 @@ $(TARGET): $(SRCS)
 
 clean::
 	rm -f *_wrap* *.o core *~ *.so *.stackdump STACKTRACE
-	rm -f $(CHICKGEN)
+	rm -f $(CHICKGEN)  csi.c precsi.c oexample.c
 	rm -f example.scm
 	rm -f $(TARGET)
 
diff --git a/SWIG/Examples/chicken/zlib/Makefile b/SWIG/Examples/chicken/zlib/Makefile
index a1fd10ae8..e9c3675fa 100644
--- a/SWIG/Examples/chicken/zlib/Makefile
+++ b/SWIG/Examples/chicken/zlib/Makefile
@@ -34,7 +34,7 @@ $(TARGET): $(SRCS)
 
 clean::
 	rm -f *_wrap* *.o core *~ *.so *.stackdump STACKTRACE
-	rm -f $(CHICKGEN)
+	rm -f $(CHICKGEN) csi.c precsi.c oexample.c
 	rm -f example.scm
 	rm -f $(TARGET)