diff --git a/src/qamqp/amqp.cpp b/src/qamqp/amqp.cpp
index 8b51173..1e23cd0 100644
--- a/src/qamqp/amqp.cpp
+++ b/src/qamqp/amqp.cpp
@@ -9,7 +9,9 @@
 
 using namespace QAMQP;
 
-struct QAMQP::ClientExceptionCleaner
+namespace QAMQP
+{
+struct ClientExceptionCleaner
 {
 	/* this cleans up when the constructor throws an exception */
 	static inline void cleanup(Client *that, ClientPrivate *d)
@@ -23,6 +25,7 @@ struct QAMQP::ClientExceptionCleaner
 #endif
 	}
 };
+}
 
 //////////////////////////////////////////////////////////////////////////
 
diff --git a/src/qamqp/amqp_frame.cpp b/src/qamqp/amqp_frame.cpp
index 1601b73..4be0fe9 100644
--- a/src/qamqp/amqp_frame.cpp
+++ b/src/qamqp/amqp_frame.cpp
@@ -9,7 +9,8 @@
 using namespace QAMQP::Frame;
 Base::Base( Type type ) :type_(type), channel_(0), size_(0) {}
 
-Base::Base( QDataStream& raw ){
+Base::Base( QDataStream& raw )
+{
 	readHeader(raw);
 }
 
@@ -673,4 +674,4 @@ void QAMQP::Frame::ContentBody::readPayload( QDataStream & in )
 qint32 QAMQP::Frame::ContentBody::size() const
 {
 	return body_.size();
-}
\ No newline at end of file
+}
diff --git a/src/qamqp/amqp_frame.h b/src/qamqp/amqp_frame.h
index 97b7abe..effddef 100644
--- a/src/qamqp/amqp_frame.h
+++ b/src/qamqp/amqp_frame.h
@@ -49,10 +49,9 @@ namespace QAMQP
 			quint32 value;
 
 		};
-		Q_DECLARE_METATYPE(QAMQP::Frame::decimal);
+
 
 		typedef QHash<QString, QVariant> TableField;
-		Q_DECLARE_METATYPE(QAMQP::Frame::TableField);
 
 		QDataStream & serialize( QDataStream & stream, const QAMQP::Frame::TableField & f );
 		QDataStream & deserialize( QDataStream & stream, QAMQP::Frame::TableField & f );
@@ -174,4 +173,7 @@ namespace QAMQP
 	}
 }
 
-#endif // amqp_frame_h__
\ No newline at end of file
+Q_DECLARE_METATYPE(QAMQP::Frame::decimal);
+Q_DECLARE_METATYPE(QAMQP::Frame::TableField);
+
+#endif // amqp_frame_h__