diff --git a/Examples/test-suite/aggregate.i b/Examples/test-suite/aggregate.i
index 028efc3e4..dc00f0605 100644
--- a/Examples/test-suite/aggregate.i
+++ b/Examples/test-suite/aggregate.i
@@ -17,7 +17,7 @@
 
 %module aggregate
 
-%include "exception.i"
+%include <exception.i>
 %aggregate_check(int, check_direction, UP, DOWN, LEFT, RIGHT)
 
 %contract move(int x) {
diff --git a/Examples/test-suite/csharp_exceptions.i b/Examples/test-suite/csharp_exceptions.i
index 36a0cff4e..a31c78840 100644
--- a/Examples/test-suite/csharp_exceptions.i
+++ b/Examples/test-suite/csharp_exceptions.i
@@ -1,6 +1,6 @@
 %module csharp_exceptions
 
-%include "exception.i"
+%include <exception.i>
 
 %inline %{
   class Ex {
@@ -64,7 +64,7 @@ void ExceptionSpecificationEnumReference() throw(TestEnum&) { throw TestEnumItem
 %}
 
 // std::string
-%include "std_string.i"
+%include <std_string.i>
 %inline %{
 void ExceptionSpecificationStdStringValue() throw(std::string) { throw std::string("ExceptionSpecificationStdStringValue"); }
 void ExceptionSpecificationStdStringReference() throw(const std::string&) { throw std::string("ExceptionSpecificationStdStringReference"); }
diff --git a/Examples/test-suite/default_args.i b/Examples/test-suite/default_args.i
index 40a8850d1..69c90e2e6 100644
--- a/Examples/test-suite/default_args.i
+++ b/Examples/test-suite/default_args.i
@@ -8,7 +8,7 @@
 #endif
 %}
 
-%include "std_string.i"
+%include <std_string.i>
 
 %inline %{
   #include <string>
diff --git a/Examples/test-suite/default_constructor.i b/Examples/test-suite/default_constructor.i
index 543d8b050..8a591db4b 100644
--- a/Examples/test-suite/default_constructor.i
+++ b/Examples/test-suite/default_constructor.i
@@ -144,7 +144,6 @@ typedef void OSRSpatialReferenceShadow;
 
 class OSRSpatialReferenceShadow {
 private:
-  OSRSpatialReferenceShadow();
 public:
   %extend {
     OSRSpatialReferenceShadow( char const * wkt = "" ) {
diff --git a/Examples/test-suite/director_abstract.i b/Examples/test-suite/director_abstract.i
index b9992d1b2..cc9dca55a 100644
--- a/Examples/test-suite/director_abstract.i
+++ b/Examples/test-suite/director_abstract.i
@@ -11,7 +11,7 @@ public:
 
 %}
 
-%include "std_string.i"
+%include <std_string.i>
 
 %feature("director") Foo;
 
diff --git a/Examples/test-suite/director_basic.i b/Examples/test-suite/director_basic.i
index 26fd29dc6..986a1706f 100644
--- a/Examples/test-suite/director_basic.i
+++ b/Examples/test-suite/director_basic.i
@@ -16,7 +16,7 @@
 
  %}
 
- %include "std_string.i"
+ %include <std_string.i>
 
  %feature("director") Foo;
 
diff --git a/Examples/test-suite/director_default.i b/Examples/test-suite/director_default.i
index 6b82ba441..4aa06845b 100644
--- a/Examples/test-suite/director_default.i
+++ b/Examples/test-suite/director_default.i
@@ -14,7 +14,7 @@ public:
 
 %}
 
-%include "std_string.i"
+%include <std_string.i>
 
 %feature("director") Foo;
 
diff --git a/Examples/test-suite/director_detect.i b/Examples/test-suite/director_detect.i
index af35d38e3..1eb6b6e76 100644
--- a/Examples/test-suite/director_detect.i
+++ b/Examples/test-suite/director_detect.i
@@ -9,7 +9,7 @@
 #include <iostream>
 %}
 
-%include "std_string.i"
+%include <std_string.i>
 
 %feature("director") Bar;
 
diff --git a/Examples/test-suite/director_string.i b/Examples/test-suite/director_string.i
index aeba2f240..e084058e8 100644
--- a/Examples/test-suite/director_string.i
+++ b/Examples/test-suite/director_string.i
@@ -1,5 +1,5 @@
 %module(directors="1") director_string;
-%include stl.i
+%include <stl.i>
 
 #ifndef SWIG_STL_UNIMPL
 
diff --git a/Examples/test-suite/director_wstring.i b/Examples/test-suite/director_wstring.i
index 5e137ac18..8fb8b2061 100644
--- a/Examples/test-suite/director_wstring.i
+++ b/Examples/test-suite/director_wstring.i
@@ -1,5 +1,5 @@
 %module(directors="1") director_wstring;
-%include stl.i
+%include <stl.i>
 
 #ifndef SWIG_STL_UNIMPL
 
diff --git a/Examples/test-suite/li_carrays.i b/Examples/test-suite/li_carrays.i
index be658f9a4..421135211 100644
--- a/Examples/test-suite/li_carrays.i
+++ b/Examples/test-suite/li_carrays.i
@@ -2,7 +2,7 @@
 
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME) doubleArray; /* Ruby, wrong class name */
 
-%include "carrays.i"
+%include <carrays.i>
 
 %array_functions(int,intArray);
 %array_class(double, doubleArray);
diff --git a/Examples/test-suite/li_cdata.i b/Examples/test-suite/li_cdata.i
index 6e08c6fdd..6ce006d3b 100644
--- a/Examples/test-suite/li_cdata.i
+++ b/Examples/test-suite/li_cdata.i
@@ -1,6 +1,6 @@
 %module li_cdata
 
-%include "cdata.i"
+%include <cdata.i>
 
 %cdata(int);
 %cdata(double);
diff --git a/Examples/test-suite/li_cmalloc.i b/Examples/test-suite/li_cmalloc.i
index 6552230de..364351d5a 100644
--- a/Examples/test-suite/li_cmalloc.i
+++ b/Examples/test-suite/li_cmalloc.i
@@ -4,7 +4,7 @@
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME) sizeof_double; /* Ruby, wrong constant name */
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME) sizeof_intp;   /* Ruby, wrong constant name */
 
-%include "cmalloc.i"
+%include <cmalloc.i>
 
 %allocators(int);
 %allocators(double);