QPID-3921: Don't leak use qpid/Options.h header unnecessarily.

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

7 files changed, 18 insertions, 8 deletions

diff --git a/qpid/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h
index b70adb1503..5583d6cf29 100644
--- a/qpid/cpp/src/qpid/broker/Broker.h
+++ b/qpid/cpp/src/qpid/broker/Broker.h
@@ -25,6 +25,7 @@
 #include "qpid/broker/BrokerImportExport.h"
 
 #include "qpid/DataDir.h"
+#include "qpid/Options.h"
 #include "qpid/Plugin.h"
 #include "qpid/broker/DtxManager.h"
 #include "qpid/broker/ExchangeRegistry.h"
diff --git a/qpid/cpp/src/qpid/broker/MessageStore.h b/qpid/cpp/src/qpid/broker/MessageStore.h
index 68b5da7852..4f7e9f3d5f 100644
--- a/qpid/cpp/src/qpid/broker/MessageStore.h
+++ b/qpid/cpp/src/qpid/broker/MessageStore.h
@@ -29,8 +29,6 @@
 #include "qpid/broker/TransactionalStore.h"
 #include "qpid/framing/FieldTable.h"
 
-#include <qpid/Options.h>
-
 #include <boost/shared_ptr.hpp>
 #include <boost/intrusive_ptr.hpp>
 
diff --git a/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp b/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
index 32fbff1e96..b2627e756e 100644
--- a/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
@@ -18,7 +18,10 @@
  * under the License.
  *
  */
+
 #include "qpid/Plugin.h"
+
+#include "qpid/Options.h"
 #include "qpid/SaslFactory.h"
 #include "qpid/NullSaslServer.h"
 #include "qpid/broker/Broker.h"
diff --git a/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp b/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
index f141e6ad1a..42b8af077b 100644
--- a/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
+++ b/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
@@ -21,6 +21,7 @@
 
 #include "qpid/sys/TransportFactory.h"
 
+#include "qpid/Options.h"
 #include "qpid/Plugin.h"
 #include "qpid/broker/Broker.h"
 #include "qpid/log/Statement.h"
diff --git a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
index 68aceedfbb..f6fa68e481 100644
--- a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
@@ -22,20 +22,23 @@
 #ifndef QPID_LEGACYSTORE_MESSAGESTOREIMPL_H
 #define QPID_LEGACYSTORE_MESSAGESTOREIMPL_H
 
-#include <string>
+#include "qpid/broker/MessageStore.h"
 
-#include "db-inc.h"
+#include "qpid/Options.h"
+#include "qpid/broker/Broker.h"
 #include "qpid/legacystore/Cursor.h"
 #include "qpid/legacystore/IdDbt.h"
 #include "qpid/legacystore/IdSequence.h"
 #include "qpid/legacystore/JournalImpl.h"
 #include "qpid/legacystore/jrnl/jcfg.h"
 #include "qpid/legacystore/PreparedTransaction.h"
-#include "qpid/broker/Broker.h"
-#include "qpid/broker/MessageStore.h"
+#include "qpid/legacystore/TxnCtxt.h"
 #include "qpid/management/Manageable.h"
 #include "qmf/org/apache/qpid/legacystore/Store.h"
-#include "qpid/legacystore/TxnCtxt.h"
+
+#include <string>
+
+#include "db-inc.h"
 
 // Assume DB_VERSION_MAJOR == 4
 #if (DB_VERSION_MINOR == 2)
diff --git a/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
index c2eb0deab0..7fd1b89660 100644
--- a/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
@@ -22,8 +22,9 @@
 #ifndef QPID_LINEARSTORE_MESSAGESTOREIMPL_H
 #define QPID_LINEARSTORE_MESSAGESTOREIMPL_H
 
-#include <iomanip>
 #include "qpid/broker/MessageStore.h"
+
+#include "qpid/Options.h"
 #include "qpid/linearstore/IdSequence.h"
 #include "qpid/linearstore/JournalLogImpl.h"
 #include "qpid/linearstore/journal/jcfg.h"
@@ -32,6 +33,8 @@
 
 #include "qmf/org/apache/qpid/linearstore/Store.h"
 
+#include <iomanip>
+
 // Assume DB_VERSION_MAJOR == 4
 #if (DB_VERSION_MINOR == 2)
 #include <errno.h>
diff --git a/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
index 31efd6753f..0e95b6571c 100644
--- a/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
@@ -32,6 +32,7 @@
 #include "qpid/sys/SecuritySettings.h"
 
 #include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
 #include <memory>
 
 #include <netdb.h>