diff --git a/ChangeLog b/ChangeLog
index ebdb92994..8c21310cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoProductLoader.m: moved from Main/ to here.
+
 2010-02-18  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* UI/MailerUI/UIxMailFolderActions.m: Modified the
diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index c169325f0..2540897e2 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -20,7 +20,6 @@ $(SOGOD)_OBJC_FILES += \
 	sogod.m			\
 	SOGo.m			\
 	SOGo+DAV.m		\
-	SOGoProductLoader.m	\
 	build.m
 
 -include GNUmakefile.preamble
diff --git a/Main/GNUmakefile.preamble b/Main/GNUmakefile.preamble
index 89fd3d01a..bb97c25bf 100644
--- a/Main/GNUmakefile.preamble
+++ b/Main/GNUmakefile.preamble
@@ -2,11 +2,13 @@
 
 BUILD_DATE = $(shell echo $$USER@$$HOSTNAME; date +"%Y%m%d%H%M")
 ADDITIONAL_CPPFLAGS += \
+        -D_GNU_SOURCE \
         -DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
         -DSOGO_MINOR_VERSION=$(MINOR_VERSION) \
         -DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
 
 ADDITIONAL_INCLUDE_DIRS += \
+        -I../SOPE/ \
 	-I../SoObjects/	\
 	-I.. -DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\""
 
diff --git a/Main/SOGo.m b/Main/SOGo.m
index 91bce24a9..4b642e31f 100644
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -47,6 +47,7 @@
 #import <SOGo/SOGoCache.h>
 #import <SOGo/SOGoDAVAuthenticator.h>
 #import <SOGo/SOGoPermissions.h>
+#import <SOGo/SOGoProductLoader.h>
 #import <SOGo/SOGoProxyAuthenticator.h>
 #import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoUser.h>
@@ -57,7 +58,6 @@
 #import <SOGo/NSObject+DAV.h>
 
 #import "build.h"
-#import "SOGoProductLoader.h"
 #import "NSException+Stacktrace.h"
 
 #import "SOGo.h"
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index bd8261152..ec948ddb5 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -15,6 +15,8 @@ SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 # 	SOGoGroupsFolder.h		\
 # 	SOGoGroupFolder.h		
 SOGo_HEADER_FILES = \
+	SOGoProductLoader.h		\
+	\
 	SOGoCache.h			\
 	SOGoObject.h			\
 	SOGoContentObject.h		\
@@ -69,6 +71,8 @@ SOGo_HEADER_FILES = \
 # 	SOGoGroupsFolder.m		\
 # 	SOGoGroupFolder.m		
 SOGo_OBJC_FILES = \
+	SOGoProductLoader.m		\
+	\
 	SOGoCache.m			\
 	SOGoObject.m			\
 	SOGoContentObject.m		\
diff --git a/Main/SOGoProductLoader.h b/SoObjects/SOGo/SOGoProductLoader.h
similarity index 100%
rename from Main/SOGoProductLoader.h
rename to SoObjects/SOGo/SOGoProductLoader.h
diff --git a/Main/SOGoProductLoader.m b/SoObjects/SOGo/SOGoProductLoader.m
similarity index 100%
rename from Main/SOGoProductLoader.m
rename to SoObjects/SOGo/SOGoProductLoader.m