diff --git a/PEPObjCAdapterTypes/PublicHeaders/PEPSessionProtocol.h b/PEPObjCAdapterTypes/PublicHeaders/PEPSessionProtocol.h
index 1d840f1f..83f9bcea 100644
--- a/PEPObjCAdapterTypes/PublicHeaders/PEPSessionProtocol.h
+++ b/PEPObjCAdapterTypes/PublicHeaders/PEPSessionProtocol.h
@@ -8,13 +8,13 @@
 
 #import <Foundation/Foundation.h>
 
-#import "PEPTypes.h"
-#import "PEPEngineTypes.h"
-#import "PEPMessage.h"
+#import <PEPObjCAdapterFramework/PEPTypes.h>
+#import <PEPObjCAdapterFramework/PEPEngineTypes.h>
+#import <PEPObjCAdapterFramework/PEPMessage.h>
 
 @class PEPLanguage;
 @class PEPIdentity;
-@class PEPMessage;
+@class PEPMessage; //DIRK: has @class and import. Makes sense?
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/pEpObjCAdapterFramework/PEPSendMessageDelegate.h b/pEpObjCAdapterFramework/PEPSendMessageDelegate.h
index 0e112b94..062c64dc 100644
--- a/pEpObjCAdapterFramework/PEPSendMessageDelegate.h
+++ b/pEpObjCAdapterFramework/PEPSendMessageDelegate.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "PEPEngineTypes.h"
+#import <PEPObjCAdapterFramework/PEPEngineTypes.h>
 
 @class PEPMessage;