diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.h b/SoObjects/Appointments/SOGoAppointmentFolders.h
index 0953f072f..617674b60 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolders.h
+++ b/SoObjects/Appointments/SOGoAppointmentFolders.h
@@ -23,7 +23,7 @@
 #ifndef SOGOAPPOINTMENTFOLDERS_H
 #define SOGOAPPOINTMENTFOLDERS_H
 
-#import <SoObjects/SOGo/SOGoParentFolder.h>
+#import <SOGo/SOGoParentFolder.h>
 
 @interface SOGoAppointmentFolders : SOGoParentFolder
 
diff --git a/SoObjects/Appointments/iCalPerson+SOGo.h b/SoObjects/Appointments/iCalPerson+SOGo.h
index 3467ff538..9b9b4bf7b 100644
--- a/SoObjects/Appointments/iCalPerson+SOGo.h
+++ b/SoObjects/Appointments/iCalPerson+SOGo.h
@@ -25,7 +25,7 @@
 
 #import <NGCards/iCalPerson.h>
 
-#import <SoObjects/SOGo/LDAPUserManager.h>
+#import <SOGo/LDAPUserManager.h>
 
 @class NSString;
 
diff --git a/SoObjects/Contacts/SOGoContactFolder.h b/SoObjects/Contacts/SOGoContactFolder.h
index 0b6f4a6ce..cb643ddbc 100644
--- a/SoObjects/Contacts/SOGoContactFolder.h
+++ b/SoObjects/Contacts/SOGoContactFolder.h
@@ -33,7 +33,7 @@
 
 #import <Foundation/NSObject.h>
 
-#import <SoObjects/SOGo/SOGoFolder.h>
+#import <SOGo/SOGoFolder.h>
 
 @class NSArray;
 @class NSDictionary;
diff --git a/SoObjects/Contacts/SOGoContactFolders.h b/SoObjects/Contacts/SOGoContactFolders.h
index 7aabf179f..169046b67 100644
--- a/SoObjects/Contacts/SOGoContactFolders.h
+++ b/SoObjects/Contacts/SOGoContactFolders.h
@@ -23,7 +23,7 @@
 #ifndef SOGOCONTACTFOLDERS_H
 #define SOGOCONTACTFOLDERS_H
 
-#import <SoObjects/SOGo/SOGoParentFolder.h>
+#import <SOGo/SOGoParentFolder.h>
 
 @interface SOGoContactFolders : SOGoParentFolder
 
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.h b/SoObjects/Contacts/SOGoContactGCSFolder.h
index 377cc5700..b6d4d1df1 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.h
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.h
@@ -22,7 +22,7 @@
 #ifndef __Contacts_SOGoContactGCSFolder_H__
 #define __Contacts_SOGoContactGCSFolder_H__
 
-#import <SoObjects/SOGo/SOGoGCSFolder.h>
+#import <SOGo/SOGoGCSFolder.h>
 
 #import "SOGoContactFolder.h"
 #import "SOGoFolder+CardDAV.h"
diff --git a/UI/SOGoUI/SOGoFolderAdvisory.h b/UI/SOGoUI/SOGoFolderAdvisory.h
index c0b21273b..110af9a74 100644
--- a/UI/SOGoUI/SOGoFolderAdvisory.h
+++ b/UI/SOGoUI/SOGoFolderAdvisory.h
@@ -24,7 +24,7 @@
 #define SOGOFOLDERADVISORY_H
 
 #import "UIxComponent.h"
-#import "../../SoObjects/SOGo/SOGoFolder.h"
+#import <SOGo/SOGoFolder.h>
 
 @interface SOGoFolderAdvisory : UIxComponent
 {