- cleanup includes

diff --git a/server/Background.cc b/server/Background.cc
index 7220abc1ffbdf844c85db8aca253c3dc0700515a..a114c116a2f58ed045179f066a74fb934cce6a8e 100644 (file)
--- a/server/Background.cc
+++ b/server/Background.cc
@@ -25,7 +25,9 @@
 #include <sys/resource.h>
 
 #include <snapper/Log.h>
+#include <snapper/Comparison.h>
 
+#include "MetaSnapper.h"
 #include "Background.h"
 
 

diff --git a/server/Background.h b/server/Background.h
index 68591f6a250186d2b7ee2c51a7227b63a89b7996..739ce8422dfd6369ef5a0a6cec64cf36ab5a93eb 100644 (file)
--- a/server/Background.h
+++ b/server/Background.h
@@ -26,8 +26,6 @@
 
 #include <boost/thread.hpp>
 
-#include <snapper/Comparison.h>
-
 #include "MetaSnapper.h"
 
 

diff --git a/server/Client.h b/server/Client.h
index 70b563457cc5514beeee34eba8f0cdb3677a72b9..1ed8697fcd7662d44355d23ba8d9e3bb2a5872ab 100644 (file)
--- a/server/Client.h
+++ b/server/Client.h
@@ -37,6 +37,8 @@
 #include <dbus/DBusConnection.h>
 #include <dbus/DBusMessage.h>
 
+#include "MetaSnapper.h"
+
 
 using namespace std;
 using namespace snapper;
@@ -50,9 +52,6 @@ using namespace snapper;
 extern boost::shared_mutex big_mutex;
 
 
-class MetaSnapper;
-
-
 struct NoComparison : public std::exception
 {
     explicit NoComparison() throw() {}

diff --git a/server/MetaSnapper.h b/server/MetaSnapper.h
index 9c5ae2a7deeee2856f176f30368a9241a9281023..41d2c1e6af56c21a1d5bc8ec21c2b69d20b409cf 100644 (file)
--- a/server/MetaSnapper.h
+++ b/server/MetaSnapper.h
@@ -27,8 +27,6 @@
 #include <boost/thread.hpp>
 
 #include <snapper/Snapper.h>
-#include <snapper/Snapshot.h>
-#include <snapper/Comparison.h>
 
 
 using namespace std;