16 files changed, 41 insertions, 47 deletions
diff --git a/agents/hostmanageragent.cc b/agents/hostmanageragent.cc
index 3cc67c2..d6241d7 100644
--- a/agents/hostmanageragent.cc
+++ b/agents/hostmanageragent.cc
@@ -1,7 +1,7 @@
-#include "sapsocket.h"
-#include "sapconnectionrequest.h"
-#include "sapserviceinfo.h"
-#include "sapchannelinfo.h"
+#include <sap/sapsocket.h>
+#include <sap/sapconnectionrequest.h>
+#include <sap/sapserviceinfo.h>
+#include <sap/sapchannelinfo.h>
 #include "hostmanagerconn.h"
 #include "hostmanageragent.h"
 
diff --git a/agents/hostmanageragent.h b/agents/hostmanageragent.h
index aa9e148..71eb466 100644
--- a/agents/hostmanageragent.h
+++ b/agents/hostmanageragent.h
@@ -2,9 +2,9 @@
 #define HOSTMANAGER_H
 
 #include <QtCore/QObject>
-#include "sappeer.h"
-#include "sapmanager.h"
-#include "sapagent.h"
+#include <sap/sappeer.h>
+#include <sap/sapmanager.h>
+#include <sap/sapagent.h>
 
 class HostManagerAgent : public QObject, public SAPAgent
 {
diff --git a/agents/hostmanagerconn.cc b/agents/hostmanagerconn.cc
index 0e1f7bb..e7441d7 100644
--- a/agents/hostmanagerconn.cc
+++ b/agents/hostmanagerconn.cc
@@ -11,8 +11,8 @@
 static watchfish::WallTimeMonitor *monitor = 0;
 #endif
 
-#include "sapmanager.h"
-#include "sappeer.h"
+#include <sap/sapmanager.h>
+#include <sap/sappeer.h>
 #include "hostmanagerconn.h"
 
 HostManagerConn::HostManagerConn(SAPConnection *conn, QObject *parent)
diff --git a/agents/hostmanagerconn.h b/agents/hostmanagerconn.h
index 3543a6c..5d42980 100644
--- a/agents/hostmanagerconn.h
+++ b/agents/hostmanagerconn.h
@@ -1,9 +1,8 @@
 #ifndef HOSTMANAGERPEER_H
 #define HOSTMANAGERPEER_H
 
-#include <QtCore/QVariant>
-#include "sapconnection.h"
-#include "sapsocket.h"
+#include <sap/sapconnection.h>
+#include <sap/sapsocket.h>
 
 class HostManagerConn : public QObject
 {
diff --git a/agents/musicagent.cc b/agents/musicagent.cc
index f67cc1d..35413c4 100644
--- a/agents/musicagent.cc
+++ b/agents/musicagent.cc
@@ -1,7 +1,7 @@
-#include "sapsocket.h"
-#include "sapconnectionrequest.h"
-#include "sapserviceinfo.h"
-#include "sapchannelinfo.h"
+#include <sap/sapsocket.h>
+#include <sap/sapconnectionrequest.h>
+#include <sap/sapserviceinfo.h>
+#include <sap/sapchannelinfo.h>
 #include "musicconn.h"
 #include "musicagent.h"
 
diff --git a/agents/musicagent.h b/agents/musicagent.h
index 32121d4..b45c984 100644
--- a/agents/musicagent.h
+++ b/agents/musicagent.h
@@ -2,9 +2,9 @@
 #define MUSICAGENT_H
 
 #include <QtCore/QObject>
-#include "sappeer.h"
-#include "sapmanager.h"
-#include "sapagent.h"
+#include <sap/sappeer.h>
+#include <sap/sapmanager.h>
+#include <sap/sapagent.h>
 
 class MusicAgent : public QObject, public SAPAgent
 {
diff --git a/agents/musicconn.cc b/agents/musicconn.cc
index cfc375d..b16c757 100644
--- a/agents/musicconn.cc
+++ b/agents/musicconn.cc
@@ -4,7 +4,6 @@
 #include <QtCore/QJsonObject>
 #include <QtGui/QImage>
 
-#include "sappeer.h"
 #include "musicconn.h"
 
 #if SAILFISH
diff --git a/agents/musicconn.h b/agents/musicconn.h
index 3cee914..72c85dc 100644
--- a/agents/musicconn.h
+++ b/agents/musicconn.h
@@ -1,9 +1,8 @@
 #ifndef MUSICCONN_H
 #define MUSICCONN_H
 
-#include <QtCore/QObject>
-#include "sapconnection.h"
-#include "sapsocket.h"
+#include <sap/sapconnection.h>
+#include <sap/sapsocket.h>
 
 class MusicConn : public QObject
 {
diff --git a/agents/notificationagent.cc b/agents/notificationagent.cc
index 58d27d4..a51a82d 100644
--- a/agents/notificationagent.cc
+++ b/agents/notificationagent.cc
@@ -1,7 +1,7 @@
-#include "sapsocket.h"
-#include "sapconnectionrequest.h"
-#include "sapserviceinfo.h"
-#include "sapchannelinfo.h"
+#include <sap/sapsocket.h>
+#include <sap/sapconnectionrequest.h>
+#include <sap/sapserviceinfo.h>
+#include <sap/sapchannelinfo.h>
 #include "notificationconn.h"
 #include "notificationagent.h"
 
diff --git a/agents/notificationagent.h b/agents/notificationagent.h
index 1b9c9cb..a1eb37c 100644
--- a/agents/notificationagent.h
+++ b/agents/notificationagent.h
@@ -2,9 +2,9 @@
 #define NOTIFICATIONAGENT_H
 
 #include <QtCore/QObject>
-#include "sappeer.h"
-#include "sapmanager.h"
-#include "sapagent.h"
+#include <sap/sappeer.h>
+#include <sap/sapmanager.h>
+#include <sap/sapagent.h>
 
 class NotificationAgent : public QObject, public SAPAgent
 {
diff --git a/agents/notificationconn.cc b/agents/notificationconn.cc
index bfe719b..7183ad4 100644
--- a/agents/notificationconn.cc
+++ b/agents/notificationconn.cc
@@ -2,8 +2,7 @@
 #include <QtCore/QTimer>
 #include <QtCore/QFile>
 
-#include "sappeer.h"
-#include "endianhelpers.h"
+#include <sap/endianhelpers.h>
 #include "notificationconn.h"
 
 #if SAILFISH
diff --git a/agents/notificationconn.h b/agents/notificationconn.h
index 092804a..6a3cd91 100644
--- a/agents/notificationconn.h
+++ b/agents/notificationconn.h
@@ -1,11 +1,10 @@
 #ifndef NOTIFICATIONCONN_H
 #define NOTIFICATIONCONN_H
 
-#include <QtCore/QObject>
 #include <QtCore/QDateTime>
 #include <QtCore/QHash>
-#include "sapconnection.h"
-#include "sapsocket.h"
+#include <sap/sapconnection.h>
+#include <sap/sapsocket.h>
 
 #if SAILFISH
 namespace watchfish
diff --git a/agents/webproxyagent.cc b/agents/webproxyagent.cc
index c9d5580..9a5bfce 100644
--- a/agents/webproxyagent.cc
+++ b/agents/webproxyagent.cc
@@ -1,7 +1,7 @@
-#include "sapsocket.h"
-#include "sapconnectionrequest.h"
-#include "sapserviceinfo.h"
-#include "sapchannelinfo.h"
+#include <sap/sapsocket.h>
+#include <sap/sapconnectionrequest.h>
+#include <sap/sapserviceinfo.h>
+#include <sap/sapchannelinfo.h>
 #include "webproxyconn.h"
 #include "webproxyagent.h"
 
diff --git a/agents/webproxyagent.h b/agents/webproxyagent.h
index e3e7329..c4eea25 100644
--- a/agents/webproxyagent.h
+++ b/agents/webproxyagent.h
@@ -2,9 +2,9 @@
 #define WEBPROXYAGENT_H
 
 #include <QtCore/QObject>
-#include "sappeer.h"
-#include "sapmanager.h"
-#include "sapagent.h"
+#include <sap/sappeer.h>
+#include <sap/sapmanager.h>
+#include <sap/sapagent.h>
 
 class WebProxyAgent : public QObject, public SAPAgent
 {
diff --git a/agents/webproxyconn.cc b/agents/webproxyconn.cc
index 91a9510..3abfad7 100644
--- a/agents/webproxyconn.cc
+++ b/agents/webproxyconn.cc
@@ -1,8 +1,8 @@
 #include <QtCore/QDebug>
 #include <QtCore/QUrl>
 
-#include "sappeer.h"
-#include "endianhelpers.h"
+#include <sap/endianhelpers.h>
+
 #include "webproxytrans.h"
 #include "webproxyconn.h"
 
diff --git a/agents/webproxyconn.h b/agents/webproxyconn.h
index c183462..646ceac 100644
--- a/agents/webproxyconn.h
+++ b/agents/webproxyconn.h
@@ -1,9 +1,8 @@
 #ifndef WEBPROXYCONN_H
 #define WEBPROXYCONN_H
 
-#include <QtCore/QObject>
-#include "sapconnection.h"
-#include "sapsocket.h"
+#include <sap/sapconnection.h>
+#include <sap/sapsocket.h>
 
 class WebProxyTrans;