diff --git a/Lib/python/python.swg b/Lib/python/python.swg
index 36fb72071..937bca393 100644
--- a/Lib/python/python.swg
+++ b/Lib/python/python.swg
@@ -1,38 +1,37 @@
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  * python.swg
  *
  * Python configuration module.
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 
-/*
-  bool type in python is too much generic, we invert order for proper
-  resolution.
-*/
-
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Inner macros
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <pymacros.swg>
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Error manipulation
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <pyerrors.swg>
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  The runtime part
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <pyruntime.swg>
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Special user directives
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <pyuserdir.swg>
 
-/* -----------------------------------------------------------------------------
- *  Typemap specializations
- * ----------------------------------------------------------------------------- */ 
+/* ------------------------------------------------------------
+ *  Look for user fragments file. 
+ * ------------------------------------------------------------ */
+%include "pyfragments.swg"
 
+/* ------------------------------------------------------------
+ *  Typemap specializations
+ * ------------------------------------------------------------ */
 %include <pytypemaps.swg>
 
 /* ------------------------------------------------------------
@@ -48,7 +47,6 @@
 /* ------------------------------------------------------------
  * The Python autodoc support
  * ------------------------------------------------------------ */
-
 %include <pydocs.swg>
 
 /* ------------------------------------------------------------
diff --git a/Lib/python/pytypemaps.swg b/Lib/python/pytypemaps.swg
index ee35cadce..90e4f9633 100644
--- a/Lib/python/pytypemaps.swg
+++ b/Lib/python/pytypemaps.swg
@@ -30,8 +30,6 @@
  *  All the typemaps
  * ----------------------------------------------------------------------------- */
 
-%include "pyfragments.swg"
-
 %include <typemaps/exception.swg>
 %include <pyswigtype.swg>
 %include <typemaps/void.swg>
diff --git a/Lib/ruby/ruby.swg b/Lib/ruby/ruby.swg
index 581c1d01d..dcfaf49e4 100644
--- a/Lib/ruby/ruby.swg
+++ b/Lib/ruby/ruby.swg
@@ -1,37 +1,37 @@
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  * ruby.swg
  *
  * Ruby configuration module.
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Inner macros 
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <rubymacros.swg>
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Error manipulation
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <rubyerrors.swg>
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  The runtime part
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <rubyruntime.swg>
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Special user directives
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <rubyuserdir.swg>
 
-/* -----------------------------------------------------------------------------
- *  Look for user fragments file. If not found, include empty system one.
- * ----------------------------------------------------------------------------- */
+/* ------------------------------------------------------------
+ *  Look for user fragments file. 
+ * ------------------------------------------------------------ */
 %include "rubyfragments.swg"
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Typemap specializations
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <rubytypemaps.swg>
 
 /* ------------------------------------------------------------
@@ -40,12 +40,12 @@
 %include <rubyopers.swg>
 
 /* ------------------------------------------------------------
- * Warnings for Python keywords 
+ * Warnings for Ruby keywords 
  * ------------------------------------------------------------ */
 %include <rubykw.swg>
 
 /* ------------------------------------------------------------
- * The Python initialization function 
+ * The Ruby initialization function 
  * ------------------------------------------------------------ */
 %include <rubyinit.swg>
 
diff --git a/Lib/ruby/rubytypemaps.swg b/Lib/ruby/rubytypemaps.swg
index bb5ae0a8d..c555921f3 100644
--- a/Lib/ruby/rubytypemaps.swg
+++ b/Lib/ruby/rubytypemaps.swg
@@ -2,7 +2,7 @@
  *  Typemap specializations
  * ----------------------------------------------------------------------------- */
 
-/* directors are supported in Python */
+/* directors are supported in Ruby */
 #ifndef SWIG_DIRECTOR_TYPEMAPS
 #define SWIG_DIRECTOR_TYPEMAPS
 #endif
@@ -25,8 +25,6 @@
  *  All the typemaps
  * ----------------------------------------------------------------------------- */
 
-%include "rubyfragments.swg"
-
 %include <typemaps/exception.swg>
 %include <typemaps/swigtype.swg>
 %include <typemaps/void.swg>
diff --git a/Lib/tcl/tcl8.swg b/Lib/tcl/tcl8.swg
index 6bdc674ca..271564383 100644
--- a/Lib/tcl/tcl8.swg
+++ b/Lib/tcl/tcl8.swg
@@ -1,37 +1,37 @@
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  * tcl.swg
  *
  * Tcl configuration module.
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Inner macros 
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <tclmacros.swg>
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Error manipulation
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <tclerrors.swg>
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  The runtime part
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <tclruntime.swg>
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Special user directives
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <tcluserdir.swg>
 
-/* -----------------------------------------------------------------------------
- *  Look for user fragments file. If not found, include empty system one.
- * ----------------------------------------------------------------------------- */
+/* ------------------------------------------------------------
+ *  Look for user fragments file. 
+ * ------------------------------------------------------------ */
 %include "tclfragments.swg"
 
-/* -----------------------------------------------------------------------------
+/* ------------------------------------------------------------
  *  Typemap specializations
- * ----------------------------------------------------------------------------- */
+ * ------------------------------------------------------------ */
 %include <tcltypemaps.swg>
 
 /* ------------------------------------------------------------
@@ -40,12 +40,12 @@
 %include <tclopers.swg>
 
 /* ------------------------------------------------------------
- * Warnings for Python keywords 
+ * Warnings for Tcl keywords 
  * ------------------------------------------------------------ */
 %include <tclkw.swg>
 
 /* ------------------------------------------------------------
- * The Python initialization function 
+ * The Tcl initialization function 
  * ------------------------------------------------------------ */
 %include <tclinit.swg>
 
diff --git a/Lib/tcl/tcltypemaps.swg b/Lib/tcl/tcltypemaps.swg
index d4f52d3ba..cdcd5c2ff 100644
--- a/Lib/tcl/tcltypemaps.swg
+++ b/Lib/tcl/tcltypemaps.swg
@@ -24,8 +24,6 @@
  *  All the typemaps
  * ----------------------------------------------------------------------------- */
 
-%include "tclfragments.swg"
-
 %include <typemaps/exception.swg>
 %include <tclswigtype.swg>
 %include <typemaps/void.swg>