Added POSIX equivalents to APR classes used by clients, inlined trivial calls.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473087 13f79535-47bb-0310-9956-ffa450edef68

35 files changed, 90 insertions, 90 deletions

diff --git a/cpp/src/qpid/framing/AMQBody.cpp b/cpp/src/qpid/framing/AMQBody.cpp
index 850635af15..5a09979ada 100644
--- a/cpp/src/qpid/framing/AMQBody.cpp
+++ b/cpp/src/qpid/framing/AMQBody.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "qpid/framing/AMQBody.h"
+#include <qpid/framing/AMQBody.h>
 #include <iostream>
 
 std::ostream& qpid::framing::operator<<(std::ostream& out, const qpid::framing::AMQBody& body) 
diff --git a/cpp/src/qpid/framing/AMQBody.h b/cpp/src/qpid/framing/AMQBody.h
index be06e43388..5d2c2de115 100644
--- a/cpp/src/qpid/framing/AMQBody.h
+++ b/cpp/src/qpid/framing/AMQBody.h
@@ -16,8 +16,8 @@
  *
  */
 #include <boost/shared_ptr.hpp>
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/Buffer.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/Buffer.h>
 
 #ifndef _AMQBody_
 #define _AMQBody_
diff --git a/cpp/src/qpid/framing/AMQContentBody.cpp b/cpp/src/qpid/framing/AMQContentBody.cpp
index 16a9e492ab..976731f0d7 100644
--- a/cpp/src/qpid/framing/AMQContentBody.cpp
+++ b/cpp/src/qpid/framing/AMQContentBody.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/AMQContentBody.h"
+#include <qpid/framing/AMQContentBody.h>
 #include <iostream>
 
 qpid::framing::AMQContentBody::AMQContentBody(){
diff --git a/cpp/src/qpid/framing/AMQContentBody.h b/cpp/src/qpid/framing/AMQContentBody.h
index 0aa1325642..91b243800f 100644
--- a/cpp/src/qpid/framing/AMQContentBody.h
+++ b/cpp/src/qpid/framing/AMQContentBody.h
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/AMQBody.h"
-#include "qpid/framing/Buffer.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/AMQBody.h>
+#include <qpid/framing/Buffer.h>
 
 #ifndef _AMQContentBody_
 #define _AMQContentBody_
diff --git a/cpp/src/qpid/framing/AMQDataBlock.h b/cpp/src/qpid/framing/AMQDataBlock.h
index bdb4f55796..c869d2c048 100644
--- a/cpp/src/qpid/framing/AMQDataBlock.h
+++ b/cpp/src/qpid/framing/AMQDataBlock.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/Buffer.h"
+#include <qpid/framing/Buffer.h>
 
 #ifndef _AMQDataBlock_
 #define _AMQDataBlock_
diff --git a/cpp/src/qpid/framing/AMQFrame.cpp b/cpp/src/qpid/framing/AMQFrame.cpp
index 2d89a8a797..58adcb5233 100644
--- a/cpp/src/qpid/framing/AMQFrame.cpp
+++ b/cpp/src/qpid/framing/AMQFrame.cpp
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/QpidError.h"
+#include <qpid/framing/AMQFrame.h>
+#include <qpid/QpidError.h>
 
 using namespace qpid::framing;
 
diff --git a/cpp/src/qpid/framing/AMQFrame.h b/cpp/src/qpid/framing/AMQFrame.h
index 6f05aef584..2c086b4cb3 100644
--- a/cpp/src/qpid/framing/AMQFrame.h
+++ b/cpp/src/qpid/framing/AMQFrame.h
@@ -15,15 +15,15 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/amqp_methods.h"
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/AMQBody.h"
-#include "qpid/framing/AMQDataBlock.h"
-#include "qpid/framing/AMQMethodBody.h"
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/framing/AMQContentBody.h"
-#include "qpid/framing/AMQHeartbeatBody.h"
-#include "qpid/framing/Buffer.h"
+#include <qpid/framing/amqp_methods.h>
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/AMQBody.h>
+#include <qpid/framing/AMQDataBlock.h>
+#include <qpid/framing/AMQMethodBody.h>
+#include <qpid/framing/AMQHeaderBody.h>
+#include <qpid/framing/AMQContentBody.h>
+#include <qpid/framing/AMQHeartbeatBody.h>
+#include <qpid/framing/Buffer.h>
 
 #ifndef _AMQFrame_
 #define _AMQFrame_
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.cpp b/cpp/src/qpid/framing/AMQHeaderBody.cpp
index 6bb24e67c7..0693456bf3 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.cpp
+++ b/cpp/src/qpid/framing/AMQHeaderBody.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/QpidError.h"
-#include "qpid/framing/BasicHeaderProperties.h"
+#include <qpid/framing/AMQHeaderBody.h>
+#include <qpid/QpidError.h>
+#include <qpid/framing/BasicHeaderProperties.h>
 
 qpid::framing::AMQHeaderBody::AMQHeaderBody(int classId) : weight(0), contentSize(0){
     createProperties(classId);
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.h b/cpp/src/qpid/framing/AMQHeaderBody.h
index 422a473200..07c4300e7e 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.h
+++ b/cpp/src/qpid/framing/AMQHeaderBody.h
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/AMQBody.h"
-#include "qpid/framing/Buffer.h"
-#include "qpid/framing/HeaderProperties.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/AMQBody.h>
+#include <qpid/framing/Buffer.h>
+#include <qpid/framing/HeaderProperties.h>
 
 #ifndef _AMQHeaderBody_
 #define _AMQHeaderBody_
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp b/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
index bcac68412b..6cdb9acd96 100644
--- a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
+++ b/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "qpid/framing/AMQHeartbeatBody.h"
+#include <qpid/framing/AMQHeartbeatBody.h>
 #include <iostream>
 
 qpid::framing::AMQHeartbeatBody::~AMQHeartbeatBody() {}
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.h b/cpp/src/qpid/framing/AMQHeartbeatBody.h
index 34222682e5..1f2c5c2fc6 100644
--- a/cpp/src/qpid/framing/AMQHeartbeatBody.h
+++ b/cpp/src/qpid/framing/AMQHeartbeatBody.h
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/AMQBody.h"
-#include "qpid/framing/Buffer.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/AMQBody.h>
+#include <qpid/framing/Buffer.h>
 
 #ifndef _AMQHeartbeatBody_
 #define _AMQHeartbeatBody_
diff --git a/cpp/src/qpid/framing/AMQMethodBody.cpp b/cpp/src/qpid/framing/AMQMethodBody.cpp
index 803bab3517..59d5944f65 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.cpp
+++ b/cpp/src/qpid/framing/AMQMethodBody.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/AMQMethodBody.h"
-#include "qpid/QpidError.h"
+#include <qpid/framing/AMQMethodBody.h>
+#include <qpid/QpidError.h>
 
 void qpid::framing::AMQMethodBody::encode(Buffer& buffer) const{
     buffer.putShort(amqpClassId());
diff --git a/cpp/src/qpid/framing/AMQMethodBody.h b/cpp/src/qpid/framing/AMQMethodBody.h
index 59b297f19e..cb656199fa 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.h
+++ b/cpp/src/qpid/framing/AMQMethodBody.h
@@ -16,10 +16,10 @@
  *
  */
 #include <iostream>
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/AMQBody.h"
-#include "qpid/framing/Buffer.h"
-#include "qpid/framing/AMQP_ServerOperations.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/AMQBody.h>
+#include <qpid/framing/Buffer.h>
+#include <qpid/framing/AMQP_ServerOperations.h>
 
 #ifndef _AMQMethodBody_
 #define _AMQMethodBody_
diff --git a/cpp/src/qpid/framing/BasicHeaderProperties.cpp b/cpp/src/qpid/framing/BasicHeaderProperties.cpp
index 94e2ff3914..80221e2787 100644
--- a/cpp/src/qpid/framing/BasicHeaderProperties.cpp
+++ b/cpp/src/qpid/framing/BasicHeaderProperties.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/BasicHeaderProperties.h"
+#include <qpid/framing/BasicHeaderProperties.h>
 
 //TODO: This could be easily generated from the spec
 
diff --git a/cpp/src/qpid/framing/BasicHeaderProperties.h b/cpp/src/qpid/framing/BasicHeaderProperties.h
index 3450782875..45539ca801 100644
--- a/cpp/src/qpid/framing/BasicHeaderProperties.h
+++ b/cpp/src/qpid/framing/BasicHeaderProperties.h
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/amqp_methods.h"
-#include "qpid/framing/Buffer.h"
-#include "qpid/framing/HeaderProperties.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/amqp_methods.h>
+#include <qpid/framing/Buffer.h>
+#include <qpid/framing/HeaderProperties.h>
 
 #ifndef _BasicHeaderProperties_
 #define _BasicHeaderProperties_
diff --git a/cpp/src/qpid/framing/BodyHandler.cpp b/cpp/src/qpid/framing/BodyHandler.cpp
index 77e68cf313..f43fbb3976 100644
--- a/cpp/src/qpid/framing/BodyHandler.cpp
+++ b/cpp/src/qpid/framing/BodyHandler.cpp
@@ -16,7 +16,7 @@
  *
  */
 #include <boost/shared_ptr.hpp>
-#include "qpid/framing/BodyHandler.h"
+#include <qpid/framing/BodyHandler.h>
 
 using namespace qpid::framing;
 using namespace boost;
diff --git a/cpp/src/qpid/framing/BodyHandler.h b/cpp/src/qpid/framing/BodyHandler.h
index 0cd7f7fa11..280b449189 100644
--- a/cpp/src/qpid/framing/BodyHandler.h
+++ b/cpp/src/qpid/framing/BodyHandler.h
@@ -20,10 +20,10 @@
 #ifndef _BodyHandler_
 #define _BodyHandler_
 
-#include "qpid/framing/AMQMethodBody.h"
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/framing/AMQContentBody.h"
-#include "qpid/framing/AMQHeartbeatBody.h"
+#include <qpid/framing/AMQMethodBody.h>
+#include <qpid/framing/AMQHeaderBody.h>
+#include <qpid/framing/AMQContentBody.h>
+#include <qpid/framing/AMQHeartbeatBody.h>
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/qpid/framing/Buffer.cpp b/cpp/src/qpid/framing/Buffer.cpp
index 05e9be83a9..d14d51bb7a 100644
--- a/cpp/src/qpid/framing/Buffer.cpp
+++ b/cpp/src/qpid/framing/Buffer.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/Buffer.h"
-#include "qpid/framing/FieldTable.h" 
+#include <qpid/framing/Buffer.h>
+#include <qpid/framing/FieldTable.h> 
 
 qpid::framing::Buffer::Buffer(u_int32_t _size) : size(_size), owner(true), position(0), limit(_size){
     data = new char[size];
diff --git a/cpp/src/qpid/framing/Buffer.h b/cpp/src/qpid/framing/Buffer.h
index 8eb92a1d27..8ae4c38a9c 100644
--- a/cpp/src/qpid/framing/Buffer.h
+++ b/cpp/src/qpid/framing/Buffer.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/amqp_types.h"
+#include <qpid/framing/amqp_types.h>
 
 #ifndef _Buffer_
 #define _Buffer_
diff --git a/cpp/src/qpid/framing/FieldTable.cpp b/cpp/src/qpid/framing/FieldTable.cpp
index b4b245292f..faf4563f6a 100644
--- a/cpp/src/qpid/framing/FieldTable.cpp
+++ b/cpp/src/qpid/framing/FieldTable.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/FieldTable.h"
-#include "qpid/QpidError.h"
-#include "qpid/framing/Buffer.h"
-#include "qpid/framing/Value.h"
+#include <qpid/framing/FieldTable.h>
+#include <qpid/QpidError.h>
+#include <qpid/framing/Buffer.h>
+#include <qpid/framing/Value.h>
 #include <assert.h>
 
 namespace qpid {
diff --git a/cpp/src/qpid/framing/FieldTable.h b/cpp/src/qpid/framing/FieldTable.h
index 6b4d9266c1..d2eb855295 100644
--- a/cpp/src/qpid/framing/FieldTable.h
+++ b/cpp/src/qpid/framing/FieldTable.h
@@ -19,7 +19,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <map>
-#include "qpid/framing/amqp_types.h"
+#include <qpid/framing/amqp_types.h>
 
 #ifndef _FieldTable_
 #define _FieldTable_
diff --git a/cpp/src/qpid/framing/HeaderProperties.h b/cpp/src/qpid/framing/HeaderProperties.h
index a699c37163..620086fc44 100644
--- a/cpp/src/qpid/framing/HeaderProperties.h
+++ b/cpp/src/qpid/framing/HeaderProperties.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/Buffer.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/Buffer.h>
 
 #ifndef _HeaderProperties_
 #define _HeaderProperties_
diff --git a/cpp/src/qpid/framing/InitiationHandler.cpp b/cpp/src/qpid/framing/InitiationHandler.cpp
index 7a15864216..7c083ca4ee 100644
--- a/cpp/src/qpid/framing/InitiationHandler.cpp
+++ b/cpp/src/qpid/framing/InitiationHandler.cpp
@@ -16,6 +16,6 @@
  *
  */
 
-#include "qpid/framing/InitiationHandler.h"
+#include <qpid/framing/InitiationHandler.h>
 
 qpid::framing::InitiationHandler::~InitiationHandler() {}
diff --git a/cpp/src/qpid/framing/InitiationHandler.h b/cpp/src/qpid/framing/InitiationHandler.h
index da902f0dff..d8f6790eee 100644
--- a/cpp/src/qpid/framing/InitiationHandler.h
+++ b/cpp/src/qpid/framing/InitiationHandler.h
@@ -20,7 +20,7 @@
 #ifndef _InitiationHandler_
 #define _InitiationHandler_
 
-#include "qpid/framing/ProtocolInitiation.h"
+#include <qpid/framing/ProtocolInitiation.h>
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/qpid/framing/InputHandler.h b/cpp/src/qpid/framing/InputHandler.h
index ef9827283c..ddfb210f4d 100644
--- a/cpp/src/qpid/framing/InputHandler.h
+++ b/cpp/src/qpid/framing/InputHandler.h
@@ -18,7 +18,7 @@
  *
  */
 
-#include "qpid/framing/AMQFrame.h"
+#include <qpid/framing/AMQFrame.h>
 #include <boost/noncopyable.hpp>
 
 namespace qpid {
diff --git a/cpp/src/qpid/framing/OutputHandler.h b/cpp/src/qpid/framing/OutputHandler.h
index b5554bba78..5fa0477572 100644
--- a/cpp/src/qpid/framing/OutputHandler.h
+++ b/cpp/src/qpid/framing/OutputHandler.h
@@ -19,7 +19,7 @@
  *
  */
 #include <boost/noncopyable.hpp>
-#include "qpid/framing/AMQFrame.h"
+#include <qpid/framing/AMQFrame.h>
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.cpp b/cpp/src/qpid/framing/ProtocolInitiation.cpp
index 23e2a24355..05a668bdce 100644
--- a/cpp/src/qpid/framing/ProtocolInitiation.cpp
+++ b/cpp/src/qpid/framing/ProtocolInitiation.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/ProtocolInitiation.h"
+#include <qpid/framing/ProtocolInitiation.h>
 
 qpid::framing::ProtocolInitiation::ProtocolInitiation(){}
 
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.h b/cpp/src/qpid/framing/ProtocolInitiation.h
index 7ce6af4a39..9eac25fa10 100644
--- a/cpp/src/qpid/framing/ProtocolInitiation.h
+++ b/cpp/src/qpid/framing/ProtocolInitiation.h
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/Buffer.h"
-#include "qpid/framing/AMQDataBlock.h"
-#include "qpid/framing/ProtocolVersion.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/Buffer.h>
+#include <qpid/framing/AMQDataBlock.h>
+#include <qpid/framing/ProtocolVersion.h>
 
 #ifndef _ProtocolInitiation_
 #define _ProtocolInitiation_
diff --git a/cpp/src/qpid/framing/ProtocolVersion.cpp b/cpp/src/qpid/framing/ProtocolVersion.cpp
index 62fb11590e..c537ac46af 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.cpp
+++ b/cpp/src/qpid/framing/ProtocolVersion.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/ProtocolVersion.h"
+#include <qpid/framing/ProtocolVersion.h>
 #include <sstream>
 
 using namespace qpid::framing;
diff --git a/cpp/src/qpid/framing/ProtocolVersion.h b/cpp/src/qpid/framing/ProtocolVersion.h
index 25cf469943..6d6a4f6c4c 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.h
+++ b/cpp/src/qpid/framing/ProtocolVersion.h
@@ -18,7 +18,7 @@
 #ifndef _ProtocolVersion_
 #define _ProtocolVersion_
 
-#include "qpid/framing/amqp_types.h"
+#include <qpid/framing/amqp_types.h>
 
 namespace qpid
 {
diff --git a/cpp/src/qpid/framing/ProtocolVersionException.cpp b/cpp/src/qpid/framing/ProtocolVersionException.cpp
index 0ba500aad8..af31c6fbbb 100644
--- a/cpp/src/qpid/framing/ProtocolVersionException.cpp
+++ b/cpp/src/qpid/framing/ProtocolVersionException.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/ProtocolVersionException.h"
+#include <qpid/framing/ProtocolVersionException.h>
 #include <sstream>
 
 using namespace qpid::framing;
diff --git a/cpp/src/qpid/framing/ProtocolVersionException.h b/cpp/src/qpid/framing/ProtocolVersionException.h
index 7decd8bcc6..66c4ea3e91 100644
--- a/cpp/src/qpid/framing/ProtocolVersionException.h
+++ b/cpp/src/qpid/framing/ProtocolVersionException.h
@@ -19,8 +19,8 @@
 #ifndef _ProtocolVersionException_
 #define _ProtocolVersionException_
 
-#include "qpid/Exception.h"
-#include "qpid/framing/ProtocolVersion.h"
+#include <qpid/Exception.h>
+#include <qpid/framing/ProtocolVersion.h>
 #include <string>
 #include <vector>
 
diff --git a/cpp/src/qpid/framing/Value.cpp b/cpp/src/qpid/framing/Value.cpp
index 4a24ab4147..bcd5ff9c19 100644
--- a/cpp/src/qpid/framing/Value.cpp
+++ b/cpp/src/qpid/framing/Value.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/Value.h"
-#include "qpid/framing/Buffer.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/QpidError.h"
+#include <qpid/framing/Value.h>
+#include <qpid/framing/Buffer.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/QpidError.h>
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/qpid/framing/Value.h b/cpp/src/qpid/framing/Value.h
index 3c538719db..843745943a 100644
--- a/cpp/src/qpid/framing/Value.h
+++ b/cpp/src/qpid/framing/Value.h
@@ -17,8 +17,8 @@
  */
 #include <iostream>
 #include <vector>
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/FieldTable.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/FieldTable.h>
 
 #ifndef _Value_
 #define _Value_
diff --git a/cpp/src/qpid/framing/amqp_framing.h b/cpp/src/qpid/framing/amqp_framing.h
index 34ebf665e7..605b341277 100644
--- a/cpp/src/qpid/framing/amqp_framing.h
+++ b/cpp/src/qpid/framing/amqp_framing.h
@@ -15,17 +15,17 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/AMQBody.h"
-#include "qpid/framing/BodyHandler.h"
-#include "qpid/framing/AMQMethodBody.h"
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/framing/AMQContentBody.h"
-#include "qpid/framing/AMQHeartbeatBody.h"
-#include "qpid/framing/amqp_methods.h"
-#include "qpid/framing/InputHandler.h"
-#include "qpid/framing/OutputHandler.h"
-#include "qpid/framing/InitiationHandler.h"
-#include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/framing/BasicHeaderProperties.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/framing/AMQFrame.h>
+#include <qpid/framing/AMQBody.h>
+#include <qpid/framing/BodyHandler.h>
+#include <qpid/framing/AMQMethodBody.h>
+#include <qpid/framing/AMQHeaderBody.h>
+#include <qpid/framing/AMQContentBody.h>
+#include <qpid/framing/AMQHeartbeatBody.h>
+#include <qpid/framing/amqp_methods.h>
+#include <qpid/framing/InputHandler.h>
+#include <qpid/framing/OutputHandler.h>
+#include <qpid/framing/InitiationHandler.h>
+#include <qpid/framing/ProtocolInitiation.h>
+#include <qpid/framing/BasicHeaderProperties.h>