diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index da53c5370..d8d1b3398 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -20,7 +20,6 @@ $(SOGOD)_OBJC_FILES += \
 	sogod.m			\
 	SOGo.m			\
 	SOGoProductLoader.m	\
-	SOGoStartupLogger.m	\
 	build.m
 
 -include GNUmakefile.preamble
diff --git a/Main/GNUmakefile.preamble b/Main/GNUmakefile.preamble
index 5686586b3..89fd3d01a 100644
--- a/Main/GNUmakefile.preamble
+++ b/Main/GNUmakefile.preamble
@@ -4,8 +4,7 @@ BUILD_DATE = $(shell echo $$USER@$$HOSTNAME; date +"%Y%m%d%H%M")
 ADDITIONAL_CPPFLAGS += \
         -DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
         -DSOGO_MINOR_VERSION=$(MINOR_VERSION) \
-        -DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION) \
-	-DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\""
+        -DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-I../SoObjects/	\
diff --git a/Main/SOGoStartupLogger.h b/SoObjects/SOGo/SOGoStartupLogger.h
similarity index 100%
rename from Main/SOGoStartupLogger.h
rename to SoObjects/SOGo/SOGoStartupLogger.h
diff --git a/Main/SOGoStartupLogger.m b/SoObjects/SOGo/SOGoStartupLogger.m
similarity index 100%
rename from Main/SOGoStartupLogger.m
rename to SoObjects/SOGo/SOGoStartupLogger.m