diff --git a/SWIG/Examples/php4/class/.cvsignore b/SWIG/Examples/php4/class/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/class/.cvsignore
+++ b/SWIG/Examples/php4/class/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/php4/constants/.cvsignore b/SWIG/Examples/php4/constants/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/constants/.cvsignore
+++ b/SWIG/Examples/php4/constants/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/php4/enum/.cvsignore b/SWIG/Examples/php4/enum/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/enum/.cvsignore
+++ b/SWIG/Examples/php4/enum/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/php4/funcptr/.cvsignore b/SWIG/Examples/php4/funcptr/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/funcptr/.cvsignore
+++ b/SWIG/Examples/php4/funcptr/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/php4/pointer/.cvsignore b/SWIG/Examples/php4/pointer/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/pointer/.cvsignore
+++ b/SWIG/Examples/php4/pointer/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/php4/reference/.cvsignore b/SWIG/Examples/php4/reference/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/reference/.cvsignore
+++ b/SWIG/Examples/php4/reference/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/php4/shadow/.cvsignore b/SWIG/Examples/php4/shadow/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/shadow/.cvsignore
+++ b/SWIG/Examples/php4/shadow/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/php4/simple/.cvsignore b/SWIG/Examples/php4/simple/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/simple/.cvsignore
+++ b/SWIG/Examples/php4/simple/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/php4/sync/.cvsignore b/SWIG/Examples/php4/sync/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/sync/.cvsignore
+++ b/SWIG/Examples/php4/sync/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/php4/value/.cvsignore b/SWIG/Examples/php4/value/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/value/.cvsignore
+++ b/SWIG/Examples/php4/value/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/php4/variables/.cvsignore b/SWIG/Examples/php4/variables/.cvsignore
index 4c1bbd46a..9941b8712 100644
--- a/SWIG/Examples/php4/variables/.cvsignore
+++ b/SWIG/Examples/php4/variables/.cvsignore
@@ -1,7 +1,11 @@
+makefile
 Makefile
 Makefile.lnk
+php_example.h
+example.php
 *_wrap.c
 *_wrap.cxx
+*_wrap.cpp
 *.dll
 *.dsw
 *.exp
diff --git a/SWIG/Examples/test-suite/csharp/.cvsignore b/SWIG/Examples/test-suite/csharp/.cvsignore
index fcb794983..13b6b48bf 100644
--- a/SWIG/Examples/test-suite/csharp/.cvsignore
+++ b/SWIG/Examples/test-suite/csharp/.cvsignore
@@ -87,6 +87,9 @@ extend_default
 extend_placement
 extend_template
 extend_template_ns
+extend_variable
+extern_declaration
+extern_namespace
 extern_throws
 features
 friends
@@ -98,6 +101,7 @@ ignore_parameter
 import_nomodule
 imports
 inctest
+inherit
 inherit_missing
 inherit_same_name
 inherit_void_arg
@@ -136,6 +140,7 @@ name_warnings
 nested
 newobject1
 newobject2
+operator_overload
 ordering
 overload_copy
 overload_extend
@@ -238,10 +243,12 @@ template_typedef_import
 template_typedef_ns
 template_typedef_ptr
 template_type_namespace
+template_using
 template_virtual
 template_whitespace
 threads
 throw_exception
+track_objects
 typedef_array_member
 typedef_class
 typedef_funcptr
diff --git a/SWIG/Examples/test-suite/java/.cvsignore b/SWIG/Examples/test-suite/java/.cvsignore
index cb98b537a..c64cf508e 100644
--- a/SWIG/Examples/test-suite/java/.cvsignore
+++ b/SWIG/Examples/test-suite/java/.cvsignore
@@ -85,6 +85,9 @@ extend_default
 extend_placement
 extend_template
 extend_template_ns
+extend_variable
+extern_declaration
+extern_namespace
 extern_throws
 features
 friends
@@ -96,6 +99,7 @@ ignore_parameter
 import_nomodule
 imports
 inctest
+inherit
 inherit_missing
 inherit_same_name
 inherit_void_arg
@@ -145,6 +149,7 @@ name_warnings
 nested
 newobject1
 newobject2
+operator_overload
 ordering
 overload_copy
 overload_extend
@@ -247,10 +252,12 @@ template_typedef_import
 template_typedef_ns
 template_typedef_ptr
 template_type_namespace
+template_using
 template_virtual
 template_whitespace
 threads
 throw_exception
+track_objects
 typedef_array_member
 typedef_class
 typedef_funcptr