diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 37ec674c3..f71093c70 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -19,18 +19,20 @@
   02111-1307, USA.
 */
 
-#import "UIxComponent.h"
 #import "SOGoJSStringFormatter.h"
-#import "NSString+URL.h"
 #import "common.h"
 
 #import <NGObjWeb/SoHTTPAuthenticator.h>
 #import <NGObjWeb/WOResourceManager.h>
 
+#import <SOGo/NSString+URL.h>
+
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoObject.h>
 #import <SOGo/SOGoCustomGroupFolder.h>
 
+#import "UIxComponent.h"
+
 @interface UIxComponent (PrivateAPI)
 - (void)_parseQueryString:(NSString *)_s;
 - (NSMutableDictionary *)_queryParameters;