diff --git a/SoObjects/Mailer/SOGoMailAccounts.h b/SoObjects/Mailer/SOGoMailAccounts.h
index 74ab6d16f..acf179dc9 100644
--- a/SoObjects/Mailer/SOGoMailAccounts.h
+++ b/SoObjects/Mailer/SOGoMailAccounts.h
@@ -22,7 +22,7 @@
 #ifndef __Mailer_SOGoMailAccounts_H__
 #define __Mailer_SOGoMailAccounts_H__
 
-#import <SoObjects/SOGo/SOGoFolder.h>
+#import <SOGo/SOGoFolder.h>
 
 /*
   SOGoMailAccounts
diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble
index 7a088517f..8b77a61b0 100644
--- a/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SoObjects/SOGo/GNUmakefile.preamble
@@ -1,6 +1,6 @@
 # compilation settings
 
-SOGo_INCLUDE_DIRS += -I.. -I../.. -DSOGO_MAJOR_VERSION="\"$(MAJOR_VERSION)\"" -DSOGO_MINOR_VERSION="\"$(MINOR_VERSION)\""
+SOGo_INCLUDE_DIRS += -I.. -I../../UI -DSOGO_MAJOR_VERSION="\"$(MAJOR_VERSION)\"" -DSOGO_MINOR_VERSION="\"$(MINOR_VERSION)\""
 
 ADDITIONAL_CPPFLAGS += \
 	-DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\""
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 7c488531c..bcb9efc3b 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -52,7 +52,7 @@
 #import <GDLContentStore/GCSFolder.h>
 #import <GDLContentStore/NSURL+GCS.h>
 #import <SaxObjC/XMLNamespaces.h>
-#import <UI/SOGoUI/SOGoFolderAdvisory.h>
+#import <SOGoUI/SOGoFolderAdvisory.h>
 
 #import "NSDictionary+Utilities.h"
 #import "NSArray+Utilities.h"
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index c03dd3ec9..69fccd093 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -49,7 +49,7 @@
 #import <NGCards/NSDictionary+NGCards.h>
 #import <SaxObjC/XMLNamespaces.h>
 
-#import <UI/SOGoUI/SOGoACLAdvisory.h>
+#import <SOGoUI/SOGoACLAdvisory.h>
 
 #import "NSArray+Utilities.h"
 #import "NSCalendarDate+SOGo.h"
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index 1ce18856c..5dee4dc37 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -48,7 +48,7 @@
 #import <Contacts/SOGoContactFolders.h>
 #import <Mailer/SOGoMailAccounts.h>
 
-#import <UI/SOGoUI/UIxComponent.h>
+#import <SOGoUI/UIxComponent.h>
 
 #import "NSArray+Utilities.h"
 #import "NSDictionary+Utilities.h"
diff --git a/UI/MainUI/SOGoRootPage.h b/UI/MainUI/SOGoRootPage.h
index d7955dd4b..f52704717 100644
--- a/UI/MainUI/SOGoRootPage.h
+++ b/UI/MainUI/SOGoRootPage.h
@@ -23,7 +23,7 @@
 #ifndef SOGOROOTPAGE_H
 #define SOGOROOTPAGE_H
 
-#import <UI/SOGoUI/UIxComponent.h>
+#import <SOGoUI/UIxComponent.h>
 
 @interface SOGoRootPage : UIxComponent
 {