From ca7bf18fe8a0f7d10d3a92a39130e1c99fa14290 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <ralf@openldap.org>
Date: Tue, 10 Oct 2006 14:25:00 +0000
Subject: [PATCH] reworked #includes

---
 contrib/ldapc++/src/LDAPAsynConnection.cpp | 1 -
 contrib/ldapc++/src/LDAPAsynConnection.h   | 5 ++---
 contrib/ldapc++/src/LDAPEntry.cpp          | 1 +
 contrib/ldapc++/src/LDAPEntry.h            | 3 ++-
 contrib/ldapc++/src/LDAPMessageQueue.cpp   | 1 -
 contrib/ldapc++/src/LDAPMessageQueue.h     | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/contrib/ldapc++/src/LDAPAsynConnection.cpp b/contrib/ldapc++/src/LDAPAsynConnection.cpp
index 4b2eb53601..7774a674d5 100644
--- a/contrib/ldapc++/src/LDAPAsynConnection.cpp
+++ b/contrib/ldapc++/src/LDAPAsynConnection.cpp
@@ -12,7 +12,6 @@
 #include "LDAPBindRequest.h"
 #include "LDAPCompareRequest.h"
 #include "LDAPDeleteRequest.h"
-#include "LDAPException.h"
 #include "LDAPExtRequest.h"
 #include "LDAPEntry.h"
 #include "LDAPModDNRequest.h"
diff --git a/contrib/ldapc++/src/LDAPAsynConnection.h b/contrib/ldapc++/src/LDAPAsynConnection.h
index dd8a72026d..fe00df9c2d 100644
--- a/contrib/ldapc++/src/LDAPAsynConnection.h
+++ b/contrib/ldapc++/src/LDAPAsynConnection.h
@@ -13,6 +13,8 @@
 #include<ldap.h>
 #include<lber.h>
 
+#include <LDAPEntry.h>
+#include <LDAPException.h>
 #include <LDAPMessageQueue.h>
 #include <LDAPConstraints.h>
 #include <LDAPModification.h>
@@ -20,9 +22,6 @@
 #include <LDAPUrl.h>
 #include <LDAPUrlList.h>
 
-class LDAPEntry;
-class LDAPAttribute;
-
 //* Main class for an asynchronous LDAP connection 
 /**
  * This class represents an asynchronous connection to an LDAP-Server. It 
diff --git a/contrib/ldapc++/src/LDAPEntry.cpp b/contrib/ldapc++/src/LDAPEntry.cpp
index eb3dd5d6ab..a4dbb79a3b 100644
--- a/contrib/ldapc++/src/LDAPEntry.cpp
+++ b/contrib/ldapc++/src/LDAPEntry.cpp
@@ -7,6 +7,7 @@
 #include "debug.h"
 #include "LDAPEntry.h"
 
+#include "LDAPAsynConnection.h"
 #include "LDAPException.h"
 
 using namespace std;
diff --git a/contrib/ldapc++/src/LDAPEntry.h b/contrib/ldapc++/src/LDAPEntry.h
index c49e26d722..03c35138e4 100644
--- a/contrib/ldapc++/src/LDAPEntry.h
+++ b/contrib/ldapc++/src/LDAPEntry.h
@@ -8,9 +8,10 @@
 #define LDAP_ENTRY_H
 #include <ldap.h>
 
-#include <LDAPAsynConnection.h>
 #include <LDAPAttributeList.h>
 
+class LDAPAsynConnection;
+
 /**
  * This class is used to store every kind of LDAP Entry.
  */
diff --git a/contrib/ldapc++/src/LDAPMessageQueue.cpp b/contrib/ldapc++/src/LDAPMessageQueue.cpp
index 2668609e87..0da7d9c0e7 100644
--- a/contrib/ldapc++/src/LDAPMessageQueue.cpp
+++ b/contrib/ldapc++/src/LDAPMessageQueue.cpp
@@ -10,7 +10,6 @@
 #include "LDAPMessageQueue.h"
 #include "LDAPRequest.h"
 #include "LDAPAsynConnection.h"
-#include "LDAPMessage.h"
 #include "LDAPResult.h"
 #include "LDAPSearchReference.h"
 #include "LDAPSearchRequest.h"
diff --git a/contrib/ldapc++/src/LDAPMessageQueue.h b/contrib/ldapc++/src/LDAPMessageQueue.h
index bf5d86b8e7..b9ee78a50d 100644
--- a/contrib/ldapc++/src/LDAPMessageQueue.h
+++ b/contrib/ldapc++/src/LDAPMessageQueue.h
@@ -10,9 +10,9 @@
 #include <stack>
 
 #include <LDAPUrlList.h>
+#include <LDAPMessage.h>
 
 class LDAPAsynConnection;
-class LDAPMsg;
 class LDAPRequest;
 class LDAPSearchRequest;
 class LDAPUrl;
-- 
2.39.5