5 files changed, 9 insertions, 18 deletions
diff --git a/cpp/src/qpid/SaslFactory.cpp b/cpp/src/qpid/SaslFactory.cpp
index 4d81a793ee..97e1d6e18a 100644
--- a/cpp/src/qpid/SaslFactory.cpp
+++ b/cpp/src/qpid/SaslFactory.cpp
@@ -24,9 +24,7 @@
 #include <map>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #ifndef HAVE_SASL
 
diff --git a/cpp/src/qpid/Version.h b/cpp/src/qpid/Version.h
index b4805a3757..6a06566907 100755
--- a/cpp/src/qpid/Version.h
+++ b/cpp/src/qpid/Version.h
@@ -21,11 +21,7 @@
 
 #include <string>
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#else
-#  error "config.h not generated"
-#endif
+#include "config.h"
 
 namespace qpid {
   const std::string product  = PACKAGE_NAME;
diff --git a/cpp/src/qpid/broker/SaslAuthenticator.cpp b/cpp/src/qpid/broker/SaslAuthenticator.cpp
index 7ab0f7f21d..1d8b117b84 100644
--- a/cpp/src/qpid/broker/SaslAuthenticator.cpp
+++ b/cpp/src/qpid/broker/SaslAuthenticator.cpp
@@ -19,10 +19,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include "qpid/broker/AclModule.h"
 #include "qpid/broker/Broker.h"
 #include "qpid/broker/Connection.h"
@@ -30,8 +26,11 @@
 #include "qpid/framing/reply_exceptions.h"
 #include "qpid/framing/FieldValue.h"
 #include "qpid/sys/SecuritySettings.h"
+
 #include <boost/format.hpp>
 
+#include "config.h"
+
 #if HAVE_SASL
 #include <sys/stat.h>
 #include <sasl/sasl.h>
diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
index 056a53f263..ad8f21e7cd 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -42,9 +42,7 @@
 #include <limits>
 #include <vector>
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/LoadPlugins.cpp b/cpp/src/qpid/client/LoadPlugins.cpp
index c5d8924014..65a43c4012 100644
--- a/cpp/src/qpid/client/LoadPlugins.cpp
+++ b/cpp/src/qpid/client/LoadPlugins.cpp
@@ -21,14 +21,14 @@
 
 #include "LoadPlugins.h"
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "qpid/Modules.h"
 #include "qpid/sys/Shlib.h"
+
 #include <string>
 #include <vector>
 
+#include "config.h"
+
 using std::vector;
 using std::string;