diff --git a/PySide/QtCore/qbool_conversions.h b/PySide/QtCore/qbool_conversions.h
index 39bd51a..7559b3c 100644
--- a/PySide/QtCore/qbool_conversions.h
+++ b/PySide/QtCore/qbool_conversions.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
 template <>
 struct Converter<QBool> : public ConverterBase<QBool>
 {
@@ -12,3 +13,4 @@ struct Converter<QBool> : public ConverterBase<QBool>
         return QBool(pyobj == Py_True);
     }
 };
+}
diff --git a/PySide/QtCore/qhash_conversions.h b/PySide/QtCore/qhash_conversions.h
index b1aa9c2..8817044 100644
--- a/PySide/QtCore/qhash_conversions.h
+++ b/PySide/QtCore/qhash_conversions.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
 template <typename qhash>
 struct Converter_qhash
 {
@@ -42,3 +43,4 @@ struct Converter_qhash
 
 template<typename KT, typename VT>
 struct Converter<QHash<KT, VT> > : Converter_qhash<QHash<KT, VT> > {};
+}
diff --git a/PySide/QtCore/qlist_conversions.h b/PySide/QtCore/qlist_conversions.h
index 4ccfbe5..aa32305 100644
--- a/PySide/QtCore/qlist_conversions.h
+++ b/PySide/QtCore/qlist_conversions.h
@@ -1,2 +1,4 @@
+namespace Shiboken {
 template<typename T>
 struct Converter<QList<T> > : Converter_std_list<QList<T> > {};
+}
diff --git a/PySide/QtCore/qmap_conversions.h b/PySide/QtCore/qmap_conversions.h
index d670605..f7cd2c8 100644
--- a/PySide/QtCore/qmap_conversions.h
+++ b/PySide/QtCore/qmap_conversions.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
 template <typename qmap>
 struct Converter_qmap
 {
@@ -42,3 +43,4 @@ struct Converter_qmap
 
 template<typename KT, typename VT>
 struct Converter<QMap<KT, VT> > : Converter_qmap<QMap<KT, VT> > {};
+}
diff --git a/PySide/QtCore/qpair_conversions.h b/PySide/QtCore/qpair_conversions.h
index 54eaaa6..27a3c4a 100644
--- a/PySide/QtCore/qpair_conversions.h
+++ b/PySide/QtCore/qpair_conversions.h
@@ -1,2 +1,4 @@
+namespace Shiboken {
 template<typename FT, typename ST>
 struct Converter<QPair<FT, ST> > : Converter_std_pair<QPair<FT, ST> > {};
+}
diff --git a/PySide/QtCore/qset_conversions.h b/PySide/QtCore/qset_conversions.h
index 183f2ce..60f7d07 100644
--- a/PySide/QtCore/qset_conversions.h
+++ b/PySide/QtCore/qset_conversions.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
 template <typename qset>
 struct Converter_qset
 {
@@ -40,3 +41,4 @@ struct Converter_qset
 
 template<typename T>
 struct Converter<QSet<T> > : Converter_qset<QSet<T> > {};
+}
diff --git a/PySide/QtCore/qstring_conversions.h b/PySide/QtCore/qstring_conversions.h
index b2dc619..e0b8ce0 100644
--- a/PySide/QtCore/qstring_conversions.h
+++ b/PySide/QtCore/qstring_conversions.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
 inline bool Converter< QString >::isConvertible(PyObject* pyobj)
 {
     return PyString_Check(pyobj)
@@ -51,3 +52,4 @@ inline QString Converter< QString >::toCpp(PyObject* pyobj)
 #endif
     return *SbkQString_cptr(pyobj);
 }
+}
diff --git a/PySide/QtCore/qvariant_conversions.h b/PySide/QtCore/qvariant_conversions.h
index 43205f0..d715162 100644
--- a/PySide/QtCore/qvariant_conversions.h
+++ b/PySide/QtCore/qvariant_conversions.h
@@ -29,6 +29,7 @@ struct QMetaTypeId< PyObjectHolder >
 };
 QT_END_NAMESPACE
 
+namespace Shiboken {
 // all types are convertible to QVariant
 inline bool Converter<QVariant>::isConvertible(PyObject* pyobj)
 {
@@ -81,3 +82,4 @@ inline QVariant Converter<QVariant>::toCpp(PyObject* pyobj)
         return QVariant(typeCode, reinterpret_cast<SbkBaseWrapper*>(pyobj)->cptr);
     }
 }
+}
diff --git a/PySide/QtCore/qvector_conversions.h b/PySide/QtCore/qvector_conversions.h
index df70713..f3470f4 100644
--- a/PySide/QtCore/qvector_conversions.h
+++ b/PySide/QtCore/qvector_conversions.h
@@ -1,2 +1,4 @@
+namespace Shiboken {
 template<typename T>
 struct Converter<QVector<T> > : Converter_std_list<QVector<T> > {};
+}
diff --git a/PySide/QtGui/qpixmap_conversion.h b/PySide/QtGui/qpixmap_conversion.h
index 18e3ce9..411592d 100644
--- a/PySide/QtGui/qpixmap_conversion.h
+++ b/PySide/QtGui/qpixmap_conversion.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
 inline bool Converter< QPixmap >::isConvertible(PyObject* pyobj)
 {
     bool isVariant = SbkQVariant_Check(pyobj);
@@ -25,3 +26,4 @@ inline QPixmap Converter< QPixmap >::toCpp(PyObject* pyobj)
 
     return *SbkQPixmap_cptr(pyobj);
 }
+}