Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements

internalError/InternalErrorReporter.cpp

@@ -1,10 +1,10 @@
 #include "InternalErrorReporter.h"
 
-#include <framework/datapool/DataSet.h>
-#include <framework/datapool/PoolVariable.h>
-#include <framework/ipc/MutexFactory.h>
+#include "../datapool/DataSet.h"
+#include "../datapool/PoolVariable.h"
+#include "../ipc/MutexFactory.h"
 
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "../serviceinterface/ServiceInterfaceStream.h"
 
 InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId,
 		uint32_t queuePoolId, uint32_t tmPoolId, uint32_t storePoolId) :

internalError/InternalErrorReporter.h

@@ -3,9 +3,9 @@
 
 #include "InternalErrorReporterIF.h"
 
-#include <framework/tasks/ExecutableObjectIF.h>
-#include <framework/objectmanager/SystemObject.h>
-#include <framework/ipc/MutexIF.h>
+#include "../tasks/ExecutableObjectIF.h"
+#include "../objectmanager/SystemObject.h"
+#include "../ipc/MutexIF.h"
 
 class InternalErrorReporter: public SystemObject,
 		public ExecutableObjectIF,