diff -up cmpi-bindings-0.9.5/swig/cmpi.i.orig cmpi-bindings-0.9.5/swig/cmpi.i
--- cmpi-bindings-0.9.5/swig/cmpi.i.orig	2015-02-26 13:52:15.959448585 +0100
+++ cmpi-bindings-0.9.5/swig/cmpi.i	2015-02-26 13:53:24.375460520 +0100
@@ -980,11 +980,11 @@ release_select_filter_exp(select_filter_
 %apply SWIGTYPE *DISOWN { CMPIInstance *instance_disown };
 %apply SWIGTYPE *DISOWN { CMPIObjectPath *path_disown };
 
-# Definitions
+// Definitions
 %include "cmpi_defs.i"
 
-# Data types
+// Data types
 %include "cmpi_types.i"
 
-# Broker callbacks
+// Broker callbacks
 %include "cmpi_callbacks.i"
diff -up cmpi-bindings-0.9.5/swig/cmpi_callbacks.i.orig cmpi-bindings-0.9.5/swig/cmpi_callbacks.i
--- cmpi-bindings-0.9.5/swig/cmpi_callbacks.i.orig	2015-02-26 14:11:04.961834640 +0100
+++ cmpi-bindings-0.9.5/swig/cmpi_callbacks.i	2015-02-26 14:12:49.601260363 +0100
@@ -1,7 +1,10 @@
-# cmpi_callbacks.i
-#
-# swig bindings for CMPI broker callbacks
-#
+%{
+/*
+ * cmpi_callbacks.i
+ *
+ * swig bindings for CMPI broker callbacks
+ */
+%}
 
 %nodefault _CMPIBroker;
 %rename(CMPIBroker) CMPIBroker;
@@ -443,10 +446,12 @@ typedef struct _CMPIBroker {} CMPIBroker
     return result;
   }
 
-#-----------------------------------------------------
-#
-# TODO: CMPIMsgFileHandle stuff
-#
+/*-----------------------------------------------------
+ *
+ * TODO: CMPIMsgFileHandle stuff
+ *
+ */
+
   /*
    * query: The select expression.
    * lang: The query language.
diff -up cmpi-bindings-0.9.5/swig/cmpi_defs.i.orig cmpi-bindings-0.9.5/swig/cmpi_defs.i
--- cmpi-bindings-0.9.5/swig/cmpi_defs.i.orig	2015-02-26 13:53:47.976805438 +0100
+++ cmpi-bindings-0.9.5/swig/cmpi_defs.i	2015-02-26 14:00:52.370494319 +0100
@@ -1,7 +1,10 @@
-# cmpi_defs.i
-#
-# swig bindings for CMPI constant definitions
-#
+%{
+/*
+ * cmpi_defs.i
+ *
+ * swig bindings for CMPI constant definitions
+ */
+%}
 
 %nodefault CMPIData;
 #%ignore _CMPIData::type;
@@ -23,9 +26,9 @@
 #-----------------------------------------------------
 
 #if defined(SWIGRUBY)
-#
-# Conversion from list of Ruby string array to null terminated char** array.
-#
+/*
+ * Conversion from list of Ruby string array to null terminated char** array.
+ */
 %typemap(in) char ** 
 {
   if ($input == Qnil) {
@@ -77,9 +80,9 @@
 #endif
 
 #if defined(SWIGPYTHON)
-#
-# Conversion from list of python strings to null terminated char** array.
-#
+/*
+ * Conversion from list of python strings to null terminated char** array.
+ */
 
 %typemap(in) char ** 
 {
@@ -127,10 +130,11 @@
 }
 #endif /* defined(SWIGPYTHON) */
 
+/*
 #-----------------------------------------------------
 #
 # CMPIData
-#
+*/
 
 %extend _CMPIData {
 /*
@@ -196,11 +200,11 @@
   }
 }
 
-
+/*
 #-----------------------------------------------------
 #
 # CMPIStatus
-#
+*/
 
 %extend _CMPIStatus {
   _CMPIStatus()
diff -up cmpi-bindings-0.9.5/swig/cmpi_types.i.orig cmpi-bindings-0.9.5/swig/cmpi_types.i
--- cmpi-bindings-0.9.5/swig/cmpi_types.i.orig	2015-02-26 14:01:13.008770970 +0100
+++ cmpi-bindings-0.9.5/swig/cmpi_types.i	2015-02-26 14:09:47.659781392 +0100
@@ -29,6 +29,7 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/
 
+/*
 # cmpift.i
 #
 # swig bindings for CMPI function tables
@@ -39,6 +40,7 @@
 # CMPI types are handled through function tables
 # and the broker.
 #
+*/
 
 %nodefault _CMPIError;
 %rename(CMPIError) _CMPIError;
@@ -100,11 +102,13 @@ typedef struct _CMPIContext {} CMPIConte
 %rename(CMPIDateTime) _CMPIDateTime;
 typedef struct _CMPIDateTime {} CMPIDateTime;
 
+/*
 #-----------------------------------------------------
 #
 # CMPIException
 #
 #-----------------------------------------------------
+*/
 
 %nodefault _CMPIException;
 %rename(CMPIException) CMPIException;
@@ -175,10 +179,12 @@ typedef struct _CMPIException {} CMPIExc
     }
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPIError
 #
+*/
 
 /*
  * Document-class: CMPIError
@@ -370,10 +376,12 @@ typedef struct _CMPIException {} CMPIExc
   }
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPIResult
 #
+*/
 
 /*
  * Document-class: CMPIResult
@@ -407,10 +415,12 @@ typedef struct _CMPIException {} CMPIExc
   }
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPIObjectPath
 #
+*/
 
 /*
  * Document-class: CMPIObjectPath
@@ -858,10 +868,12 @@ FIXME: if clone() is exposed, release()
   }
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPIInstance
 #
+*/
 
 /*
  * Document-class: CMPIInstance
@@ -1164,9 +1176,11 @@ FIXME: if clone() is exposed, release()
   }
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPIArgs
+*/
 
 /*
  * CMPI Arguments
@@ -1280,9 +1294,11 @@ FIXME: if clone() is exposed, release()
   }
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPISelectExp
+*/
 
 /*
  * This structure encompasses queries
@@ -1341,9 +1357,11 @@ FIXME: if clone() is exposed, release()
   }
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPISelectCond
+*/
 
 /*
  * Select conditions
@@ -1370,9 +1388,11 @@ FIXME: if clone() is exposed, release()
 #endif
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPISubCond
+*/
 
 /*
  * Sub Conditions
@@ -1382,9 +1402,11 @@ FIXME: if clone() is exposed, release()
 %extend _CMPISubCond {
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPIPredicate
+*/
 
 /*
  * Predicate
@@ -1411,9 +1433,11 @@ FIXME: if clone() is exposed, release()
 #endif
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPIEnumeration
+*/
 
 /*
  * Enumeration provide a linked-list type access to multiple elements
@@ -1472,9 +1496,11 @@ Python for compatibility */
 
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPIArray
+*/
 
 /*
  * Array of equally-typed elements
@@ -1546,11 +1572,13 @@ Python for compatibility */
   }
 }
 
-#BOOKMARK
+/* BOOKMARK */
 
+/*
 #-----------------------------------------------------
 #
 # CMPIString
+*/
 
 /*
  * A string
@@ -1571,9 +1599,11 @@ Python for compatibility */
   }
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPIContext
+*/
 
 /*
  * Context of the provider invocation
@@ -1685,9 +1715,11 @@ Python for compatibility */
 
 }
 
+/*
 #-----------------------------------------------------
 #
 # CMPIDateTime
+*/
 
 /*
  * Date and Time
@@ -1729,4 +1761,4 @@ Python for compatibility */
   }
 }
 
-# EOF
+/* EOF */