i18n for new buildsystem :)

author: kergoth <kergoth> 2003-01-16 06:18:34 (UTC)
committer: kergoth <kergoth> 2003-01-16 06:18:34 (UTC)
commit: 9a90cb1a9e61d2bc3298f2131671d9f32abbac5a (patch) (unidiff)
tree: 1d2d0eb0372f32e682fe139b3e89882f381dc0db
parent: 216efd1cb2210211816b865b5574866e598bf3bd (diff)
download: opie-9a90cb1a9e61d2bc3298f2131671d9f32abbac5a.zip
opie-9a90cb1a9e61d2bc3298f2131671d9f32abbac5a.tar.gz
opie-9a90cb1a9e61d2bc3298f2131671d9f32abbac5a.tar.bz2
177 files changed, 775 insertions, 18 deletions
diff --git a/Makefile.test b/Makefile.test
index 8418158..5b51f6c 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -6,105 +6,105 @@ export QMAKE:=$(OPIEDIR)/qmake/qmake
 export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
 noconfig_targets := xconfig menuconfig config oldconfig randconfig \
                    defconfig allyesconfig allnoconfig allmodconfig
 configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/todayplugins/config.in
 # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
 # in order to have a full set of config.in files.
 # .depends depends on $(TOPDIR)/.config
 # everything else depends on .depends, to ensure the dependencies are
 # intact.
 #
 # NOTE: The order in which things happen in this makefile is
        # -critical-. Do not rearrange this!
 
 all : $(TOPDIR)/.config
 $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
 all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
 clean-configs : $(TOPDIR)/.depends.cfgs
        @echo "Wiping generated config.in files..."
        @-rm -f $(configs)
 -include $(TOPDIR)/.depends.cfgs
 all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
 $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
        $(call descend,scripts/kconfig,conf)
        @if [ ! -e $@ ]; then \
                cp $(TOPDIR)/def-configs/opie $@; \
        fi;
        @$(MAKE) -C scripts/kconfig conf;
        ./scripts/kconfig/conf -s ./config.in
 # config rules must have the $(configs) var defined
 # at the time that they run. we must ensure that .depends.cfgs
 # is built and included by the time we reach this point.
 xconfig :
        $(call descend,scripts/kconfig,qconf)
        LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
                ./scripts/kconfig/qconf ./config.in
 menuconfig : scripts/lxdialog/lxdialog
        $(call descend,scripts/kconfig,mconf)
        ./scripts/kconfig/mconf ./config.in
 config :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf ./config.in
 
 oldconfig :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf -o ./config.in
 
 randconfig :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf -r ./config.in
 
 allyesconfig :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf -y ./config.in
 
 allnoconfig :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf -n ./config.in
 
 defconfig :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf -d ./config.in
 export
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 export include-config := 1
 -include $(TOPDIR)/.config
 -include $(TOPDIR)/.depends
 endif
 -include $(TOPDIR)/..config.cmd
 export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
 ifdef CONFIG_OPTIMIZATIONS
 export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
 export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
 endif
-all clean: $(subdir-y)
+all clean lupdate lrelease: $(subdir-y)
 $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \
        $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \
        $(TOPDIR)/library/custom.h
 clean : $(TOPDIR)/.config
 include $(TOPDIR)/Rules.make
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index d7e0a92..bded8a7 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -1,27 +1,31 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   battery.h batterystatus.h batteryappletimpl.h
        SOURCES=   battery.cpp batterystatus.cpp batteryappletimpl.cpp
        TARGET  = batteryapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe -lopie
        VERSION         = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libbatteryapplet.ts \
         ../../../i18n/da/libbatteryapplet.ts \
         ../../../i18n/xx/libbatteryapplet.ts \
         ../../../i18n/en/libbatteryapplet.ts \
         ../../../i18n/es/libbatteryapplet.ts \
         ../../../i18n/fr/libbatteryapplet.ts \
         ../../../i18n/hu/libbatteryapplet.ts \
         ../../../i18n/ja/libbatteryapplet.ts \
         ../../../i18n/ko/libbatteryapplet.ts \
         ../../../i18n/no/libbatteryapplet.ts \
         ../../../i18n/pl/libbatteryapplet.ts \
         ../../../i18n/pt/libbatteryapplet.ts \
         ../../../i18n/pt_BR/libbatteryapplet.ts \
         ../../../i18n/sl/libbatteryapplet.ts \
         ../../../i18n/zh_CN/libbatteryapplet.ts \
         ../../../i18n/zh_TW/libbatteryapplet.ts
+include ( ../../../include.pro )
diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro
index b98c0f2..c1ef6b2 100644
--- a/core/applets/cardmon/cardmon.pro
+++ b/core/applets/cardmon/cardmon.pro
@@ -1,27 +1,31 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS         =cardmon.h cardmonimpl.h
        SOURCES         =cardmon.cpp cardmonimpl.cpp
        TARGET  = cardmonapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include ../launcher
 LIBS            += -lqpe -lopie
        VERSION         = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libcardmonapplet.ts \
         ../../../i18n/da/libcardmonapplet.ts \
         ../../../i18n/xx/libcardmonapplet.ts \
         ../../../i18n/en/libcardmonapplet.ts \
         ../../../i18n/es/libcardmonapplet.ts \
         ../../../i18n/fr/libcardmonapplet.ts \
         ../../../i18n/hu/libcardmonapplet.ts \
         ../../../i18n/ja/libcardmonapplet.ts \
         ../../../i18n/ko/libcardmonapplet.ts \
         ../../../i18n/no/libcardmonapplet.ts \
         ../../../i18n/pl/libcardmonapplet.ts \
         ../../../i18n/pt/libcardmonapplet.ts \
         ../../../i18n/pt_BR/libcardmonapplet.ts \
         ../../../i18n/sl/libcardmonapplet.ts \
         ../../../i18n/zh_CN/libcardmonapplet.ts \
         ../../../i18n/zh_TW/libcardmonapplet.ts
+include ( ../../../include.pro )
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index 85b2fe7..535bcc8 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -1,27 +1,31 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   clipboard.h clipboardappletimpl.h
        SOURCES=   clipboard.cpp clipboardappletimpl.cpp
        TARGET  = clipboardapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libclipboardapplet.ts \
         ../../../i18n/da/libclipboardapplet.ts \
         ../../../i18n/xx/libclipboardapplet.ts \
         ../../../i18n/en/libclipboardapplet.ts \
         ../../../i18n/es/libclipboardapplet.ts \
         ../../../i18n/fr/libclipboardapplet.ts \
         ../../../i18n/hu/libclipboardapplet.ts \
         ../../../i18n/ja/libclipboardapplet.ts \
         ../../../i18n/ko/libclipboardapplet.ts \
         ../../../i18n/no/libclipboardapplet.ts \
         ../../../i18n/pl/libclipboardapplet.ts \
         ../../../i18n/pt/libclipboardapplet.ts \
         ../../../i18n/pt_BR/libclipboardapplet.ts \
         ../../../i18n/sl/libclipboardapplet.ts \
         ../../../i18n/zh_CN/libclipboardapplet.ts \
         ../../../i18n/zh_TW/libclipboardapplet.ts
+include ( ../../../include.pro )
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index ff4867d..21591d1 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -1,27 +1,31 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   clock.h clockappletimpl.h
        SOURCES=   clock.cpp clockappletimpl.cpp
        TARGET  = clockapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe
        VERSION         = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libclockapplet.ts \
         ../../../i18n/da/libclockapplet.ts \
         ../../../i18n/xx/libclockapplet.ts \
         ../../../i18n/en/libclockapplet.ts \
         ../../../i18n/es/libclockapplet.ts \
         ../../../i18n/fr/libclockapplet.ts \
         ../../../i18n/hu/libclockapplet.ts \
         ../../../i18n/ja/libclockapplet.ts \
         ../../../i18n/ko/libclockapplet.ts \
         ../../../i18n/no/libclockapplet.ts \
         ../../../i18n/pl/libclockapplet.ts \
         ../../../i18n/pt/libclockapplet.ts \
         ../../../i18n/pt_BR/libclockapplet.ts \
         ../../../i18n/sl/libclockapplet.ts \
         ../../../i18n/zh_CN/libclockapplet.ts \
         ../../../i18n/zh_TW/libclockapplet.ts
+include ( ../../../include.pro )
diff --git a/core/applets/homeapplet/homeapplet.pro b/core/applets/homeapplet/homeapplet.pro
index 420c744..c6c1169 100644
--- a/core/applets/homeapplet/homeapplet.pro
+++ b/core/applets/homeapplet/homeapplet.pro
@@ -1,27 +1,31 @@
 TEMPLATE      = lib
 CONFIG       += qt warn_on release
 HEADERS       = home.h
 SOURCES       = home.cpp
 TARGET        = homeapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libhomeapplet.ts \
         ../../../i18n/da/libhomeapplet.ts \
         ../../../i18n/xx/libhomeapplet.ts \
         ../../../i18n/en/libhomeapplet.ts \
         ../../../i18n/es/libhomeapplet.ts \
         ../../../i18n/fr/libhomeapplet.ts \
         ../../../i18n/hu/libhomeapplet.ts \
         ../../../i18n/ja/libhomeapplet.ts \
         ../../../i18n/ko/libhomeapplet.ts \
         ../../../i18n/no/libhomeapplet.ts \
         ../../../i18n/pl/libhomeapplet.ts \
         ../../../i18n/pt/libhomeapplet.ts \
         ../../../i18n/pt_BR/libhomeapplet.ts \
         ../../../i18n/sl/libhomeapplet.ts \
         ../../../i18n/zh_CN/libhomeapplet.ts \
         ../../../i18n/zh_TW/libhomeapplet.ts
+include ( ../../../include.pro )
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index 38a5d9b..2a5f094 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -1,27 +1,31 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   irda.h irdaappletimpl.h
 SOURCES =   irda.cpp irdaappletimpl.cpp
 TARGET    = irdaapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libirdaapplet.ts \
         ../../../i18n/da/libirdaapplet.ts \
         ../../../i18n/xx/libirdaapplet.ts \
         ../../../i18n/en/libirdaapplet.ts \
         ../../../i18n/es/libirdaapplet.ts \
         ../../../i18n/fr/libirdaapplet.ts \
         ../../../i18n/hu/libirdaapplet.ts \
         ../../../i18n/ja/libirdaapplet.ts \
         ../../../i18n/ko/libirdaapplet.ts \
         ../../../i18n/no/libirdaapplet.ts \
         ../../../i18n/pl/libirdaapplet.ts \
         ../../../i18n/pt/libirdaapplet.ts \
         ../../../i18n/pt_BR/libirdaapplet.ts \
         ../../../i18n/sl/libirdaapplet.ts \
         ../../../i18n/zh_CN/libirdaapplet.ts \
         ../../../i18n/zh_TW/libirdaapplet.ts
+include ( ../../../include.pro )
diff --git a/core/applets/logoutapplet/logoutapplet.pro b/core/applets/logoutapplet/logoutapplet.pro
index 6a5f606..91ef0a9 100644
--- a/core/applets/logoutapplet/logoutapplet.pro
+++ b/core/applets/logoutapplet/logoutapplet.pro
@@ -1,27 +1,31 @@
 TEMPLATE      = lib
 CONFIG       += qt warn_on release
 HEADERS       = logout.h
 SOURCES       = logout.cpp
 TARGET        = logoutapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 TRANSLATIONS = ../../../i18n/de/liblogoutapplet.ts \
         ../../../i18n/da/liblogoutapplet.ts \
         ../../../i18n/xx/liblogoutapplet.ts \
         ../../../i18n/en/liblogoutapplet.ts \
         ../../../i18n/es/liblogoutapplet.ts \
         ../../../i18n/fr/liblogoutapplet.ts \
         ../../../i18n/hu/liblogoutapplet.ts \
         ../../../i18n/ja/liblogoutapplet.ts \
         ../../../i18n/ko/liblogoutapplet.ts \
         ../../../i18n/no/liblogoutapplet.ts \
         ../../../i18n/pl/liblogoutapplet.ts \
         ../../../i18n/pt/liblogoutapplet.ts \
         ../../../i18n/pt_BR/liblogoutapplet.ts \
         ../../../i18n/sl/liblogoutapplet.ts \
         ../../../i18n/zh_CN/liblogoutapplet.ts \
         ../../../i18n/zh_TW/liblogoutapplet.ts
+include ( ../../../include.pro )
diff --git a/core/applets/obex/obex.pro b/core/applets/obex/obex.pro
index c08e52f..8d55241 100644
--- a/core/applets/obex/obex.pro
+++ b/core/applets/obex/obex.pro
@@ -1,28 +1,32 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   obex.h obeximpl.h
        SOURCES=   obex.cc obeximpl.cc
        TARGET  = opieobex
        DESTDIR         = $(OPIEDIR)/plugins/obex
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
 DEPENDPATH      += ../$(OPIEDIR)/include
 INTERFACES      = obexinc.ui obexdlg.ui
 LIBS            += -lqpe -lopie
        VERSION         = 0.0.1
 TRANSLATIONS = ../../../i18n/de/libopieobex.ts \
         ../../../i18n/da/libopieobex.ts \
         ../../../i18n/xx/libopieobex.ts \
         ../../../i18n/en/libopieobex.ts \
         ../../../i18n/es/libopieobex.ts \
         ../../../i18n/fr/libopieobex.ts \
         ../../../i18n/hu/libopieobex.ts \
         ../../../i18n/ja/libopieobex.ts \
         ../../../i18n/ko/libopieobex.ts \
         ../../../i18n/no/libopieobex.ts \
         ../../../i18n/pl/libopieobex.ts \
         ../../../i18n/pt/libopieobex.ts \
         ../../../i18n/pt_BR/libopieobex.ts \
         ../../../i18n/sl/libopieobex.ts \
         ../../../i18n/zh_CN/libopieobex.ts \
         ../../../i18n/zh_TW/libopieobex.ts
+include ( ../../../include.pro )
diff --git a/core/applets/restartapplet/restartapplet.pro b/core/applets/restartapplet/restartapplet.pro
index ca8799d..aeaf400 100644
--- a/core/applets/restartapplet/restartapplet.pro
+++ b/core/applets/restartapplet/restartapplet.pro
@@ -1,12 +1,16 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   restart.h restartappletimpl.h
 SOURCES =   restart.cpp restartappletimpl.cpp
 TARGET    = restartapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
+include ( ../../../include.pro )
diff --git a/core/applets/restartapplet2/restartapplet.pro b/core/applets/restartapplet2/restartapplet.pro
index 19ab381..f1d805c 100644
--- a/core/applets/restartapplet2/restartapplet.pro
+++ b/core/applets/restartapplet2/restartapplet.pro
@@ -1,12 +1,16 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   restart.h
 SOURCES =   restart.cpp
 TARGET    = restartapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
+include ( ../../../include.pro )
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index ffde3cc..337d4ae 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -1,29 +1,33 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   screenshot.h inputDialog.h screenshotappletimpl.h
 SOURCES =   screenshot.cpp inputDialog.cpp screenshotappletimpl.cpp
 TARGET    = screenshotapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 TRANSLATIONS = ../../../i18n/de/libscreenshotapplet.ts \
         ../../../i18n/da/libscreenshotapplet.ts \
         ../../../i18n/xx/libscreenshotapplet.ts \
         ../../../i18n/en/libscreenshotapplet.ts \
         ../../../i18n/es/libscreenshotapplet.ts \
         ../../../i18n/fr/libscreenshotapplet.ts \
         ../../../i18n/hu/libscreenshotapplet.ts \
         ../../../i18n/ja/libscreenshotapplet.ts \
         ../../../i18n/ko/libscreenshotapplet.ts \
         ../../../i18n/no/libscreenshotapplet.ts \
         ../../../i18n/pl/libscreenshotapplet.ts \
         ../../../i18n/pt/libscreenshotapplet.ts \
         ../../../i18n/pt_BR/libscreenshotapplet.ts \
         ../../../i18n/sl/libscreenshotapplet.ts \
         ../../../i18n/zh_CN/libscreenshotapplet.ts \
         ../../../i18n/zh_TW/libscreenshotapplet.ts
+include ( ../../../include.pro )
diff --git a/core/applets/suspendapplet/suspendapplet.pro b/core/applets/suspendapplet/suspendapplet.pro
index c29c44f..d8ad58d 100644
--- a/core/applets/suspendapplet/suspendapplet.pro
+++ b/core/applets/suspendapplet/suspendapplet.pro
@@ -1,27 +1,31 @@
 TEMPLATE      = lib
 CONFIG       += qt warn_on release
 HEADERS       = suspend.h
 SOURCES       = suspend.cpp
 TARGET        = suspendapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
 LIBS         += -lqpe
 VERSION       = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libsuspendapplet.ts \
         ../../../i18n/da/libsuspendapplet.ts \
         ../../../i18n/xx/libsuspendapplet.ts \
         ../../../i18n/en/libsuspendapplet.ts \
         ../../../i18n/es/libsuspendapplet.ts \
         ../../../i18n/fr/libsuspendapplet.ts \
         ../../../i18n/hu/libsuspendapplet.ts \
         ../../../i18n/ja/libsuspendapplet.ts \
         ../../../i18n/ko/libsuspendapplet.ts \
         ../../../i18n/no/libsuspendapplet.ts \
         ../../../i18n/pl/libsuspendapplet.ts \
         ../../../i18n/pt/libsuspendapplet.ts \
         ../../../i18n/pt_BR/libsuspendapplet.ts \
         ../../../i18n/sl/libsuspendapplet.ts \
         ../../../i18n/zh_CN/libsuspendapplet.ts \
         ../../../i18n/zh_TW/libsuspendapplet.ts
+include ( ../../../include.pro )
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro
index 05f2167..bd87aa5 100644
--- a/core/applets/vmemo/vmemo.pro
+++ b/core/applets/vmemo/vmemo.pro
@@ -1,27 +1,31 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   vmemo.h vmemoimpl.h adpcm.h
 SOURCES =   vmemo.cpp vmemoimpl.cpp adpcm.c
 TARGET    = vmemoapplet
 DESTDIR   =$(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libvmemoapplet.ts \
         ../../../i18n/da/libvmemoapplet.ts \
         ../../../i18n/xx/libvmemoapplet.ts \
   ../../../i18n/en/libvmemoapplet.ts \
   ../../../i18n/es/libvmemoapplet.ts \
   ../../../i18n/fr/libvmemoapplet.ts \
   ../../../i18n/hu/libvmemoapplet.ts \
   ../../../i18n/ja/libvmemoapplet.ts \
   ../../../i18n/ko/libvmemoapplet.ts \
   ../../../i18n/no/libvmemoapplet.ts \
   ../../../i18n/pl/libvmemoapplet.ts \
   ../../../i18n/pt/libvmemoapplet.ts \
   ../../../i18n/pt_BR/libvmemoapplet.ts \
   ../../../i18n/sl/libvmemoapplet.ts \
   ../../../i18n/zh_CN/libvmemoapplet.ts \
   ../../../i18n/zh_TW/libvmemoapplet.ts
+include ( ../../../include.pro )
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index 73a1715..bae4b43 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -1,27 +1,31 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   volume.h volumeappletimpl.h oledbox.h
        SOURCES=   volume.cpp volumeappletimpl.cpp oledbox.cpp
        TARGET  = volumeapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libvolumeapplet.ts \
         ../../../i18n/da/libvolumeapplet.ts \
         ../../../i18n/xx/libvolumeapplet.ts \
         ../../../i18n/en/libvolumeapplet.ts \
         ../../../i18n/es/libvolumeapplet.ts \
         ../../../i18n/fr/libvolumeapplet.ts \
         ../../../i18n/hu/libvolumeapplet.ts \
         ../../../i18n/ja/libvolumeapplet.ts \
         ../../../i18n/ko/libvolumeapplet.ts \
         ../../../i18n/no/libvolumeapplet.ts \
         ../../../i18n/pl/libvolumeapplet.ts \
         ../../../i18n/pt/libvolumeapplet.ts \
         ../../../i18n/pt_BR/libvolumeapplet.ts \
         ../../../i18n/sl/libvolumeapplet.ts \
         ../../../i18n/zh_CN/libvolumeapplet.ts \
         ../../../i18n/zh_TW/libvolumeapplet.ts
+include ( ../../../include.pro )
diff --git a/core/apps/calibrate/calibrate.pro b/core/apps/calibrate/calibrate.pro
index 7e37cb4..f7f8849 100644
--- a/core/apps/calibrate/calibrate.pro
+++ b/core/apps/calibrate/calibrate.pro
@@ -1,19 +1,23 @@
 # This is part of the taskbar
 TRANSLATIONS = ../../../i18n/de/calibrate.pro.in.ts \
         ../../../i18n/da/calibrate.pro.in.ts \
         ../../../i18n/xx/calibrate.pro.in.ts \
         ../../../i18n/en/calibrate.pro.in.ts \
         ../../../i18n/es/calibrate.pro.in.ts \
         ../../../i18n/fr/calibrate.pro.in.ts \
         ../../../i18n/hu/calibrate.pro.in.ts \
         ../../../i18n/ja/calibrate.pro.in.ts \
         ../../../i18n/ko/calibrate.pro.in.ts \
         ../../../i18n/no/calibrate.pro.in.ts \
         ../../../i18n/pl/calibrate.pro.in.ts \
         ../../../i18n/pt/calibrate.pro.in.ts \
         ../../../i18n/pt_BR/calibrate.pro.in.ts \
         ../../../i18n/sl/calibrate.pro.in.ts \
         ../../../i18n/zh_CN/calibrate.pro.in.ts \
         ../../../i18n/it/calibrate.pro.in.ts \
         ../../../i18n/zh_TW/calibrate.pro.in.ts
+include ( ../../../include.pro )
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index 5720d21..8c58efb 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -1,55 +1,59 @@
 QMAKE_CFLAGS = -DHAVE_OPENPTY
 QMAKE_LIBS = -lutil
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = TEWidget.h \
      TEScreen.h \
      TECommon.h \
      TEHistory.h \
      TEmulation.h \
      TEmuVt102.h \
      session.h \
      keytrans.h \
      konsole.h \
      commandeditdialog.h \
      commandeditwidget.h \
      playlistselection.h \
      MyPty.h
 SOURCES   = TEScreen.cpp \
      TEWidget.cpp \
      TEHistory.cpp \
      TEmulation.cpp \
      TEmuVt102.cpp \
      session.cpp \
      keytrans.cpp \
      konsole.cpp \
      commandeditdialog.cpp \
      commandeditwidget.cpp \
      playlistselection.cpp \
      MyPty.cpp \
      main.cpp 
 INTERFACES =  commandeditdialogbase.ui smallcommandeditdialogbase.ui
 TARGET    = embeddedkonsole
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TMAKE_CXXFLAGS += -DQT_QWS_OPIE -DHAVE_OPENPTY
 TRANSLATIONS = ../../../i18n/de/embeddedkonsole.ts \
        ../../../i18n/xx/embeddedkonsole.ts \
        ../../../i18n/en/embeddedkonsole.ts \
        ../../../i18n/es/embeddedkonsole.ts \
        ../../../i18n/fr/embeddedkonsole.ts \
        ../../../i18n/hu/embeddedkonsole.ts \
        ../../../i18n/ja/embeddedkonsole.ts \
        ../../../i18n/ko/embeddedkonsole.ts \
        ../../../i18n/no/embeddedkonsole.ts \
        ../../../i18n/pl/embeddedkonsole.ts \
        ../../../i18n/pt/embeddedkonsole.ts \
        ../../../i18n/pt_BR/embeddedkonsole.ts \
        ../../../i18n/sl/embeddedkonsole.ts \
        ../../../i18n/zh_CN/embeddedkonsole.ts \
        ../../../i18n/zh_TW/embeddedkonsole.ts \
        ../../../i18n/it/embeddedkonsole.ts \
        ../../../i18n/da/embeddedkonsole.ts
+include ( ../../../include.pro )
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro
index d13638c..222a408 100644
--- a/core/apps/helpbrowser/helpbrowser.pro
+++ b/core/apps/helpbrowser/helpbrowser.pro
@@ -1,28 +1,32 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = helpbrowser.h
        SOURCES         = helpbrowser.cpp \
                  main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES=
 TRANSLATIONS = ../../../i18n/de/helpbrowser.ts \
         ../../../i18n/xx/helpbrowser.ts \
         ../../../i18n/en/helpbrowser.ts \
         ../../../i18n/es/helpbrowser.ts \
         ../../../i18n/fr/helpbrowser.ts \
         ../../../i18n/hu/helpbrowser.ts \
         ../../../i18n/ja/helpbrowser.ts \
         ../../../i18n/ko/helpbrowser.ts \
         ../../../i18n/no/helpbrowser.ts \
         ../../../i18n/pl/helpbrowser.ts \
         ../../../i18n/pt/helpbrowser.ts \
         ../../../i18n/pt_BR/helpbrowser.ts \
         ../../../i18n/sl/helpbrowser.ts \
         ../../../i18n/zh_CN/helpbrowser.ts \
         ../../../i18n/it/helpbrowser.ts \
         ../../../i18n/zh_TW/helpbrowser.ts \
         ../../../i18n/da/helpbrowser.ts
+include ( ../../../include.pro )
diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro
index 9e9f6dc..4ca0ceb 100644
--- a/core/apps/qcop/qcop.pro
+++ b/core/apps/qcop/qcop.pro
@@ -1,27 +1,31 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = 
        SOURCES         = main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= 
        TARGET  = qcop
 TRANSLATIONS = ../../../i18n/de/qcop.ts \
         ../../../i18n/da/qcop.ts \
         ../../../i18n/xx/qcop.ts \
         ../../../i18n/en/qcop.ts \
         ../../../i18n/es/qcop.ts \
         ../../../i18n/fr/qcop.ts \
         ../../../i18n/hu/qcop.ts \
         ../../../i18n/ja/qcop.ts \
         ../../../i18n/ko/qcop.ts \
         ../../../i18n/no/qcop.ts \
         ../../../i18n/pl/qcop.ts \
         ../../../i18n/pt/qcop.ts \
         ../../../i18n/pt_BR/qcop.ts \
         ../../../i18n/sl/qcop.ts \
         ../../../i18n/zh_CN/qcop.ts \
         ../../../i18n/zh_TW/qcop.ts
+include ( ../../../include.pro )
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index c8df9f3..f90b914 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,26 +1,30 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS = textedit.h filePermissions.h 
 SOURCES = main.cpp textedit.cpp filePermissions.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET    = textedit
 TRANSLATIONS = ../../../i18n/de/textedit.ts \
         ../../../i18n/da/textedit.ts \
         ../../../i18n/xx/textedit.ts \
         ../../../i18n/en/textedit.ts \
         ../../../i18n/es/textedit.ts \
         ../../../i18n/fr/textedit.ts \
         ../../../i18n/hu/textedit.ts \
         ../../../i18n/ja/textedit.ts \
         ../../../i18n/ko/textedit.ts \
         ../../../i18n/no/textedit.ts \
         ../../../i18n/pl/textedit.ts \
         ../../../i18n/pt/textedit.ts \
         ../../../i18n/pt_BR/textedit.ts \
         ../../../i18n/sl/textedit.ts \
         ../../../i18n/zh_CN/textedit.ts \
         ../../../i18n/zh_TW/textedit.ts
+include ( ../../../include.pro )
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 21f8374..729b182 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -25,96 +25,100 @@ HEADERS		= background.h \
                irserver.h \
        ../../rsync/buf.h \
        ../../rsync/checksum.h \
        ../../rsync/command.h \
        ../../rsync/emit.h \
        ../../rsync/job.h \
        ../../rsync/netint.h \
        ../../rsync/protocol.h \
        ../../rsync/prototab.h \
        ../../rsync/rsync.h \
        ../../rsync/search.h \
        ../../rsync/stream.h \
        ../../rsync/sumset.h \
        ../../rsync/trace.h \
        ../../rsync/types.h \
        ../../rsync/util.h \
        ../../rsync/whole.h \
        ../../rsync/config_rsync.h \
        ../../rsync/qrsync.h \
                  quicklauncher.h 
        SOURCES         = background.cpp \
                  desktop.cpp \
                  screensaver.cpp \
                  mediummountgui.cpp \
                  info.cpp \
                  appicons.cpp \
                  taskbar.cpp \
                  sidething.cpp \
                   runningappbar.cpp \
                  stabmon.cpp \
                  inputmethods.cpp \
                  systray.cpp \
                  wait.cpp \
                  shutdownimpl.cpp \
                  launcher.cpp \
                  launcherview.cpp \
                  ../../core/apps/calibrate/calibrate.cpp \
                  transferserver.cpp \
                  packageslave.cpp \
                irserver.cpp \
                  qcopbridge.cpp \
                  startmenu.cpp \
                  main.cpp \
        ../../rsync/base64.c \
        ../../rsync/buf.c \
        ../../rsync/checksum.c \
        ../../rsync/command.c \
        ../../rsync/delta.c \
        ../../rsync/emit.c \
        ../../rsync/hex.c \
        ../../rsync/job.c \
        ../../rsync/mdfour.c \
        ../../rsync/mksum.c \
        ../../rsync/msg.c \
        ../../rsync/netint.c \
        ../../rsync/patch.c \
        ../../rsync/prototab.c \
        ../../rsync/readsums.c \
        ../../rsync/scoop.c \
        ../../rsync/search.c \
        ../../rsync/stats.c \
        ../../rsync/stream.c \
        ../../rsync/sumset.c \
        ../../rsync/trace.c \
        ../../rsync/tube.c \
        ../../rsync/util.c \
        ../../rsync/version.c \
        ../../rsync/whole.c \
        ../../rsync/qrsync.cpp
        INTERFACES= syncdialog.ui
 INCLUDEPATH += ../../include
        DEPENDPATH+= ../../include .
 INCLUDEPATH += ../../core/apps/calibrate
        DEPENDPATH+= ../../core/apps/calibrate
 INCLUDEPATH += ../../rsync
        DEPENDPATH+= ../../rsync
        TARGET  = qpe
        LIBS    += -lqpe -lcrypt -lopie 
 TRANSLATIONS = ../../i18n/de/qpe.ts \
         ../../i18n/xx/qpe.ts \
         ../../i18n/en/qpe.ts \
         ../../i18n/es/qpe.ts \
         ../../i18n/fr/qpe.ts \
         ../../i18n/hu/qpe.ts \
         ../../i18n/ja/qpe.ts \
         ../../i18n/ko/qpe.ts \
         ../../i18n/no/qpe.ts \
         ../../i18n/pl/qpe.ts \
         ../../i18n/pt/qpe.ts \
         ../../i18n/pt_BR/qpe.ts \
         ../../i18n/sl/qpe.ts \
         ../../i18n/zh_CN/qpe.ts \
         ../../i18n/it/qpe.ts \
         ../../i18n/zh_TW/qpe.ts \
         ../../i18n/da/qpe.ts
+include ( ../../include.pro )
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro
index c10929c..5ffb9a5 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -1,31 +1,35 @@
        TEMPLATE=   lib
        CONFIG  +=  qt warn_on release
        HEADERS         =   libflashplugin.h   libflashpluginimpl.h
        SOURCES         =   libflashplugin.cpp libflashpluginimpl.cpp \
                    adpcm.cc character.cc flash.cc graphic16.cc matrix.cc script.cc \
                    sprite.cc bitmap.cc cxform.cc font.cc graphic24.cc movie.cc \
                    shape.cc sqrt.cc button.cc displaylist.cc graphic.cc graphic32.cc \
                    program.cc sound.cc text.cc
        TARGET  =   flashplugin
        DESTDIR         =   ../../plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe
        VERSION         =   1.0.0
 TRANSLATIONS = ../../../../i18n/de/libflashplugin.ts \
         ../../../../i18n/da/libflashplugin.ts \
         ../../../../i18n/xx/libflashplugin.ts \
         ../../../../i18n/en/libflashplugin.ts \
         ../../../../i18n/es/libflashplugin.ts \
         ../../../../i18n/fr/libflashplugin.ts \
         ../../../../i18n/hu/libflashplugin.ts \
         ../../../../i18n/ja/libflashplugin.ts \
         ../../../../i18n/ko/libflashplugin.ts \
         ../../../../i18n/no/libflashplugin.ts \
         ../../../../i18n/pl/libflashplugin.ts \
         ../../../../i18n/pt/libflashplugin.ts \
         ../../../../i18n/pt_BR/libflashplugin.ts \
         ../../../../i18n/sl/libflashplugin.ts \
         ../../../../i18n/zh_CN/libflashplugin.ts \
         ../../../../i18n/zh_TW/libflashplugin.ts
+include ( ../../../../include.pro )
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index 1e7f597..edcc22c 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -1,35 +1,39 @@
 QMAKE_CFLAGS += $(if $(CONFIG_TARGET_X86),-DFPM_INTEL) \
                $(if $(CONFIG_TARGET_IPAQ),-DFPM_ARM) \
                $(if $(CONFIG_TARGET_SHARP),-DFPM_ARM)
 QMAKE_CXXFLAGS += $(if $(CONFIG_TARGET_X86),-DFPM_INTEL) \
                $(if $(CONFIG_TARGET_IPAQ),-DFPM_ARM) \
                $(if $(CONFIG_TARGET_SHARP),-DFPM_ARM)
        TEMPLATE = lib
        CONFIG   +=  qt warn_on release
        HEADERS   = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
                layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
        SOURCES   = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
                layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
        TARGET   = madplugin
        DESTDIR   = $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe -lm
 VERSION   =   1.0.0
 TRANSLATIONS = ../../../../i18n/de/libmadplugin.ts \
         ../../../../i18n/da/libmadplugin.ts \
         ../../../../i18n/xx/libmadplugin.ts \
         ../../../../i18n/en/libmadplugin.ts \
         ../../../../i18n/es/libmadplugin.ts \
         ../../../../i18n/fr/libmadplugin.ts \
         ../../../../i18n/hu/libmadplugin.ts \
         ../../../../i18n/ja/libmadplugin.ts \
         ../../../../i18n/ko/libmadplugin.ts \
         ../../../../i18n/no/libmadplugin.ts \
         ../../../../i18n/pl/libmadplugin.ts \
         ../../../../i18n/pt/libmadplugin.ts \
         ../../../../i18n/pt_BR/libmadplugin.ts \
         ../../../../i18n/sl/libmadplugin.ts \
         ../../../../i18n/zh_CN/libmadplugin.ts \
         ../../../../i18n/zh_TW/libmadplugin.ts
+include ( ../../../../include.pro )
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index 0f8f396..17d289a 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -1,64 +1,68 @@
 QMAKE_CFLAGS += $(if $(CONFIG_TARGET_X86),-DHAVE_MMX -DHAVE_CSS) \
        $(if $(CONFIG_TARGET_IPAQ),-DUSE_FIXED_POINT) \
        $(if $(CONFIG_TARGET_SHARP),-DUSE_FIXED_POINT)
 QMAKE_CC = $(CXX)
 TEMPLATE  =   lib
 CONFIG    +=  qt warn_on release
 HEADERS   =   libmpeg3plugin.h   libmpeg3pluginimpl.h
 SOURCES   =   libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
        bitstream.c \
        libmpeg3.c \
        mpeg3atrack.c \
        mpeg3css.c \
        mpeg3demux.c \
        mpeg3io.c \
        mpeg3title.c \
        mpeg3vtrack.c \
        audio/ac3.c \
        audio/bit_allocation.c \
        audio/dct.c \
        audio/exponents.c \
        audio/header.c \
        audio/layer2.c \
        audio/layer3.c \
        audio/mantissa.c \
        audio/mpeg3audio.c \
        audio/pcm.c \
        audio/synthesizers.c \
        audio/tables.c \
        video/getpicture.c \
        video/headers.c \
        video/idct.c \
        video/macroblocks.c \
        video/mmxtest.c \
        video/motion.c \
        video/mpeg3video.c \
        video/output.c \
        video/reconstruct.c \
        video/seek.c \
        video/slice.c \
        video/vlc.c
 TARGET    =   mpeg3plugin
 TMAKE_CC=$(CXX)
 DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe -lpthread -lm
 VERSION   =   1.0.0
 TRANSLATIONS = ../../../../i18n/de/libmpeg3plugin.ts \
         ../../../../i18n/da/libmpeg3plugin.ts \
         ../../../../i18n/xx/libmpeg3plugin.ts \
         ../../../../i18n/en/libmpeg3plugin.ts \
         ../../../../i18n/es/libmpeg3plugin.ts \
         ../../../../i18n/fr/libmpeg3plugin.ts \
         ../../../../i18n/hu/libmpeg3plugin.ts \
         ../../../../i18n/ja/libmpeg3plugin.ts \
         ../../../../i18n/ko/libmpeg3plugin.ts \
         ../../../../i18n/no/libmpeg3plugin.ts \
         ../../../../i18n/pl/libmpeg3plugin.ts \
         ../../../../i18n/pt/libmpeg3plugin.ts \
         ../../../../i18n/pt_BR/libmpeg3plugin.ts \
         ../../../../i18n/sl/libmpeg3plugin.ts \
         ../../../../i18n/zh_CN/libmpeg3plugin.ts \
         ../../../../i18n/zh_TW/libmpeg3plugin.ts
+include ( ../../../../include.pro )
diff --git a/core/multimedia/opieplayer/modplug/modplug.pro b/core/multimedia/opieplayer/modplug/modplug.pro
index 13b8927..84b8eef 100644
--- a/core/multimedia/opieplayer/modplug/modplug.pro
+++ b/core/multimedia/opieplayer/modplug/modplug.pro
@@ -1,19 +1,23 @@
        TEMPLATE=   lib
        CONFIG  +=  qt warn_on release
        HEADERS         =   it_defs.h modplugin.h modpluginimpl.h sndfile.h stdafx.h memfile.h
        SOURCES        =   fastmix.cpp load_669.cpp load_amf.cpp load_ams.cpp \
                    load_dbm.cpp load_dmf.cpp load_dsm.cpp load_far.cpp \
                    load_it.cpp load_j2b.cpp load_mdl.cpp load_med.cpp \
                    load_mod.cpp load_mt2.cpp load_mtm.cpp load_okt.cpp \ 
                    load_psm.cpp load_ptm.cpp load_s3m.cpp load_stm.cpp \
                    load_ult.cpp load_umx.cpp load_xm.cpp \
                    mmcmp.cpp modplugin.cpp modpluginimpl.cpp snd_dsp.cpp \
                    snd_flt.cpp snd_fx.cpp sndfile.cpp sndmix.cpp tables.cpp \
                    memfile.cpp
        TARGET  =   modplugin
        DESTDIR         =   $(OPIEDIR)/plugins/codecs
        INCLUDEPATH +=  $(OPIEDIR)/include
 DEPENDPATH      +=  $(OPIEDIR)/include
 LIBS            +=  -lqpe -lm 
        VERSION         =   1.0.0
+include ( ../../../../include.pro )
diff --git a/core/multimedia/opieplayer/opieplayer.pro b/core/multimedia/opieplayer/opieplayer.pro
index 5c8272d..9489fd5 100644
--- a/core/multimedia/opieplayer/opieplayer.pro
+++ b/core/multimedia/opieplayer/opieplayer.pro
@@ -1,36 +1,40 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 #release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = loopcontrol.h mediaplayerplugininterface.h \
        playlistselection.h mediaplayerstate.h \
        videowidget.h audiowidget.h playlistwidget.h \
        mediaplayer.h audiodevice.h inputDialog.h om3u.h
 SOURCES   = main.cpp \
      loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
      videowidget.cpp audiowidget.cpp playlistwidget.cpp \
      mediaplayer.cpp audiodevice.cpp inputDialog.cpp om3u.cpp
 TARGET    = opieplayer
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lpthread -lopie
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 TRANSLATIONS = ../../../i18n/de/opieplayer.ts \
        ../../../i18n/da/opieplayer.ts \
        ../../../i18n/xx/opieplayer.ts \
        ../../../i18n/en/opieplayer.ts \
        ../../../i18n/es/opieplayer.ts \
        ../../../i18n/fr/opieplayer.ts \
        ../../../i18n/hu/opieplayer.ts \
        ../../../i18n/ja/opieplayer.ts \
        ../../../i18n/ko/opieplayer.ts \
        ../../../i18n/no/opieplayer.ts \
        ../../../i18n/pl/opieplayer.ts \
        ../../../i18n/pt/opieplayer.ts \
        ../../../i18n/pt_BR/opieplayer.ts \
        ../../../i18n/sl/opieplayer.ts \
        ../../../i18n/zh_CN/opieplayer.ts \
        ../../../i18n/zh_TW/opieplayer.ts
+include ( ../../../include.pro )
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
index b0f37a8..d1ac78a 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -1,27 +1,31 @@
        TEMPLATE=   lib
        CONFIG  +=  qt warn_on release
        HEADERS         =   wavplugin.h wavpluginimpl.h
        SOURCES        =   wavplugin.cpp wavpluginimpl.cpp
        TARGET  =   wavplugin
        DESTDIR         =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe
        VERSION         =   1.0.0
 TRANSLATIONS = ../../../../i18n/de/libwavplugin.ts \
         ../../../../i18n/da/libwavplugin.ts \
         ../../../../i18n/xx/libwavplugin.ts \
         ../../../../i18n/en/libwavplugin.ts \
         ../../../../i18n/es/libwavplugin.ts \
         ../../../../i18n/fr/libwavplugin.ts \
         ../../../../i18n/hu/libwavplugin.ts \
         ../../../../i18n/ja/libwavplugin.ts \
         ../../../../i18n/ko/libwavplugin.ts \
         ../../../../i18n/no/libwavplugin.ts \
         ../../../../i18n/pl/libwavplugin.ts \
         ../../../../i18n/pt/libwavplugin.ts \
         ../../../../i18n/pt_BR/libwavplugin.ts \
         ../../../../i18n/sl/libwavplugin.ts \
         ../../../../i18n/zh_CN/libwavplugin.ts \
         ../../../../i18n/zh_TW/libwavplugin.ts
+include ( ../../../../include.pro )
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index bda33dd..d628cbb 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -1,45 +1,49 @@
 TEMPLATE    = app
 CONFIG      = qt warn_on debug usepam
 HEADERS     = loginwindowimpl.h \
              loginapplication.h \
              ../launcher/inputmethods.h \
              ../apps/calibrate/calibrate.h
 SOURCES     = loginwindowimpl.cpp \
              loginapplication.cpp \
              ../launcher/inputmethods.cpp \
              ../apps/calibrate/calibrate.cpp \
              main.cpp
 INTERFACES  = loginwindow.ui
 INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
 DEPENDPATH  += $(OPIEDIR)/include ../launcher ../apps/calibrate
 LIBS        += -lqpe -lopie
 usepam:LIBS += -lpam
 usepam:DEFINES += USEPAM
 DESTDIR     = $(OPIEDIR)/bin
 TARGET      = opie-login
 TRANSLATIONS = ../../i18n/de/opie-login.ts \
        ../../i18n/xx/opie-login.ts \
        ../../i18n/en/opie-login.ts \
        ../../i18n/es/opie-login.ts \
        ../../i18n/fr/opie-login.ts \
        ../../i18n/hu/opie-login.ts \
        ../../i18n/ja/opie-login.ts \
        ../../i18n/ko/opie-login.ts \
        ../../i18n/no/opie-login.ts \
        ../../i18n/pl/opie-login.ts \
        ../../i18n/pt/opie-login.ts \
        ../../i18n/pt_BR/opie-login.ts \
        ../../i18n/sl/opie-login.ts \
        ../../i18n/zh_CN/opie-login.ts \
        ../../i18n/zh_TW/opie-login.ts \
        ../../i18n/it/opie-login.ts \
        ../../i18n/da/opie-login.ts
+include ( ../../include.pro )
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 742eb69..5003b35 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -1,48 +1,52 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on release
        CONFIG  = qt warn_on debug
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS= addressbook.h \
                  contacteditor.h \
                  ocontactfields.h \
                  ablabel.h \
                  abtable.h \
                  picker.h \
                  ofloatbar.h \
                  configdlg.h \
                  abconfig.h \
                  abview.h
        SOURCES= main.cpp \
                  addressbook.cpp \
                  contacteditor.cpp \
                  ocontactfields.cpp \
                  ablabel.cpp \
                  abtable.cpp \
                  picker.cpp \
                  configdlg.cpp \
                  abconfig.cpp \
                  abview.cpp
        INTERFACES= configdlg_base.ui
        TARGET  = addressbook
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TRANSLATIONS = ../../../i18n/de/addressbook.ts \
         ../../../i18n/da/addressbook.ts \
         ../../../i18n/xx/addressbook.ts \
         ../../../i18n/en/addressbook.ts \
         ../../../i18n/es/addressbook.ts \
         ../../../i18n/fr/addressbook.ts \
         ../../../i18n/hu/addressbook.ts \
         ../../../i18n/ja/addressbook.ts \
         ../../../i18n/ko/addressbook.ts \
         ../../../i18n/no/addressbook.ts \
         ../../../i18n/pl/addressbook.ts \
         ../../../i18n/pt/addressbook.ts \
         ../../../i18n/pt_BR/addressbook.ts \
         ../../../i18n/sl/addressbook.ts \
         ../../../i18n/zh_CN/addressbook.ts \
         ../../../i18n/it/addressbook.ts \
         ../../../i18n/zh_TW/addressbook.ts
+include ( ../../../include.pro )
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index f61e19a..da33bfe 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -1,58 +1,62 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS= datebookday.h \
                  datebook.h \
          dateentryimpl.h \
          datebookdayheaderimpl.h \
          datebooksettings.h \
          datebookweek.h \
          datebookweeklst.h \
          datebookweekheaderimpl.h \
          repeatentry.h \
          timepicker.h \
          noteentryimpl.h \
          onoteedit.h
        SOURCES= main.cpp \
          datebookday.cpp \
          datebook.cpp \
          dateentryimpl.cpp \
          datebookdayheaderimpl.cpp \
          datebooksettings.cpp \
          datebookweek.cpp \
          datebookweeklst.cpp \
          datebookweekheaderimpl.cpp \
          repeatentry.cpp \
          timepicker.cpp \
          noteentryimpl.cpp \
          onoteedit.cpp
        INTERFACES= dateentry.ui \
                  datebookdayheader.ui \
                  datebookweekheader.ui \
                          datebookweeklstheader.ui \      
                          datebookweeklstdayhdr.ui \      
                  repeatentrybase.ui \
                  datebooksettingsbase.ui \
                  noteentry.ui
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
        TARGET  = datebook
 TRANSLATIONS = ../../../i18n/de/datebook.ts \
         ../../../i18n/xx/datebook.ts \
         ../../../i18n/en/datebook.ts \
         ../../../i18n/es/datebook.ts \
         ../../../i18n/fr/datebook.ts \
         ../../../i18n/hu/datebook.ts \
         ../../../i18n/ja/datebook.ts \
         ../../../i18n/ko/datebook.ts \
         ../../../i18n/no/datebook.ts \
         ../../../i18n/pl/datebook.ts \
         ../../../i18n/pt/datebook.ts \
         ../../../i18n/pt_BR/datebook.ts \
         ../../../i18n/sl/datebook.ts \
         ../../../i18n/zh_CN/datebook.ts \
         ../../../i18n/it/datebook.ts \
         ../../../i18n/zh_TW/datebook.ts \
         ../../../i18n/da/datebook.ts
+include ( ../../../include.pro )
diff --git a/core/pim/today/plugins/addressbook/addressbook.pro b/core/pim/today/plugins/addressbook/addressbook.pro
index 5d971e8..abe5a50 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -1,19 +1,23 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 # Input
 HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h  \
        addresspluginwidget.h
 SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
        addresspluginwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayaddressbookplugin
+include ( ../../../../../include.pro )
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro
index 0bbdb77..d093ac1 100644
--- a/core/pim/today/plugins/datebook/datebook.pro
+++ b/core/pim/today/plugins/datebook/datebook.pro
@@ -1,18 +1,21 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 # Input
 HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \
        datebookevent.h datebookpluginwidget.h
 SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \
        datebookevent.cpp datebookpluginwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopie 
 DESTDIR = $(OPIEDIR)/plugins/today
-TARGET = todaydatebookplugin
-\ No newline at end of file
+TARGET = todaydatebookplugin
+include ( ../../../../../include.pro )
diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro
index 467e1d8..ef00c41 100644
--- a/core/pim/today/plugins/mail/mail.pro
+++ b/core/pim/today/plugins/mail/mail.pro
@@ -1,17 +1,20 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 # Input
 HEADERS = mailplugin.h mailpluginimpl.h mailpluginwidget.h
 SOURCES = mailplugin.cpp mailpluginimpl.cpp mailpluginwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/plugins/today
-TARGET = todaymailplugin
-\ No newline at end of file
+TARGET = todaymailplugin
+include ( ../../../../../include.pro )
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro
index 38db406..f3aeb52 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -1,19 +1,22 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 # Input
 HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h  \
        todopluginwidget.h
 SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \
        todopluginwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/plugins/today
-TARGET = todaytodolistplugin
-\ No newline at end of file
+TARGET = todaytodolistplugin
+include ( ../../../../../include.pro )
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index 1fa8c94..12807eb 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -1,29 +1,33 @@
        TEMPLATE= app
        CONFIG  = qt warn_on debug
        #CONFIG         = qt warn_on release
        HEADERS         = today.h todaybase.h todayconfig.h
        SOURCES         = main.cpp today.cpp todaybase.cpp todayconfig.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
        INTERFACES=
        TARGET  = today
        DESTDIR         = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/today.ts \
         ../../../i18n/xx/today.ts \
         ../../../i18n/en/today.ts \
         ../../../i18n/es/today.ts \
         ../../../i18n/fr/today.ts \
         ../../../i18n/hu/today.ts \
         ../../../i18n/ja/today.ts \
         ../../../i18n/ko/today.ts \
         ../../../i18n/no/today.ts \
         ../../../i18n/pl/today.ts \
         ../../../i18n/pt/today.ts \
         ../../../i18n/pt_BR/today.ts \
         ../../../i18n/sl/today.ts \
         ../../../i18n/zh_CN/today.ts \
         ../../../i18n/zh_TW/today.ts \
            ../../../i18n/it/today.ts \
            ../../../i18n/da/today.ts
+include ( ../../../include.pro )
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index 7f47b06..12b6a48 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -1,64 +1,68 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS= smalltodo.h \
          todomanager.h \
          mainwindow.h \
          todoview.h \
          tableview.h \
          todotemplatemanager.h \
          todoeditor.h \
          todoshow.h \
          textviewshow.h \
          templateeditor.h \
          templatedialog.h \
          templatedialogimpl.h \
          quickedit.h \
          quickeditimpl.h \
          otaskeditor.h \
          taskeditoroverview.h \
          taskeditorstatus.h \
          taskeditoralarms.h
        SOURCES= smalltodo.cpp \
          todomanager.cpp \
          mainwindow.cpp \
          main.cpp \
          tableview.cpp \
          todoview.cpp \
          todotemplatemanager.cpp \
          todoeditor.cpp   \
          todoshow.cpp \
          textviewshow.cpp \
          templateeditor.cpp \
          templatedialog.cpp  \
          templatedialogimpl.cpp \
          quickeditimpl.cpp \
          quickedit.cpp \
          otaskeditor.cpp \
          taskeditoroverview.cpp \
          taskeditorstatus.cpp \
          taskeditoralarms.cpp
        TARGET  = todolist
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie 
 TRANSLATIONS = ../../../i18n/de/todolist.ts \
         ../../../i18n/da/todolist.ts \
         ../../../i18n/xx/todolist.ts \
         ../../../i18n/en/todolist.ts \
         ../../../i18n/es/todolist.ts \
         ../../../i18n/fr/todolist.ts \
         ../../../i18n/hu/todolist.ts \
         ../../../i18n/ja/todolist.ts \
         ../../../i18n/ko/todolist.ts \
         ../../../i18n/no/todolist.ts \
         ../../../i18n/pl/todolist.ts \
         ../../../i18n/pt/todolist.ts \
         ../../../i18n/pt_BR/todolist.ts \
         ../../../i18n/sl/todolist.ts \
         ../../../i18n/zh_CN/todolist.ts \
         ../../../i18n/zh_TW/todolist.ts
+include ( ../../../include.pro )
diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro
index 389695c..95a5c91 100644
--- a/core/settings/button/button.pro
+++ b/core/settings/button/button.pro
@@ -1,35 +1,39 @@
 TEMPLATE     = app
 CONFIG      += qt warn_on release
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = buttonsettings.h \
               buttonutils.h \
               remapdlg.h
 SOURCES      = main.cpp \
               buttonsettings.cpp \
               buttonutils.cpp \
               remapdlg.cpp
 INTERFACES   = remapdlgbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
 TARGET       = buttonsettings
 TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \
         ../../../i18n/xx/buttonsettings.ts \
         ../../../i18n/en/buttonsettings.ts \
         ../../../i18n/es/buttonsettings.ts \
         ../../../i18n/fr/buttonsettings.ts \
         ../../../i18n/hu/buttonsettings.ts \
         ../../../i18n/ja/buttonsettings.ts \
         ../../../i18n/ko/buttonsettings.ts \
         ../../../i18n/no/buttonsettings.ts \
         ../../../i18n/pl/buttonsettings.ts \
         ../../../i18n/pt/buttonsettings.ts \
         ../../../i18n/pt_BR/buttonsettings.ts \
         ../../../i18n/sl/buttonsettings.ts \
         ../../../i18n/zh_CN/buttonsettings.ts \
         ../../../i18n/zh_TW/buttonsettings.ts \
         ../../../i18n/da/buttonsettings.ts
+include ( ../../../include.pro )
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index 4113a75..a189a2b 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -1,27 +1,31 @@
 CONFIG += qt warn_on release
 TEMPLATE = app
 DESTDIR         = $(OPIEDIR)/bin
 #INTERFACES = citytimebase.ui
 HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h
 SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
 TARGET = citytime
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/citytime.ts \
         ../../../i18n/xx/citytime.ts \
         ../../../i18n/en/citytime.ts \
         ../../../i18n/es/citytime.ts \
         ../../../i18n/fr/citytime.ts \
         ../../../i18n/hu/citytime.ts \
         ../../../i18n/ja/citytime.ts \
         ../../../i18n/ko/citytime.ts \
         ../../../i18n/no/citytime.ts \
         ../../../i18n/pl/citytime.ts \
         ../../../i18n/pt/citytime.ts \
         ../../../i18n/pt_BR/citytime.ts \
         ../../../i18n/sl/citytime.ts \
         ../../../i18n/zh_CN/citytime.ts \
         ../../../i18n/zh_TW/citytime.ts \
         ../../../i18n/da/citytime.ts
+include ( ../../../include.pro )
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro
index 1c72126..1c17eff 100644
--- a/core/settings/launcher/launcher.pro
+++ b/core/settings/launcher/launcher.pro
@@ -1,22 +1,26 @@
 TEMPLATE     = app
 CONFIG      += qt warn_on release
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = launchersettings.h \
               tabssettings.h \
               taskbarsettings.h \
               menusettings.h \
               tabconfig.h \
               tabdialog.h
 SOURCES      = main.cpp \
               launchersettings.cpp \
               tabssettings.cpp \
               taskbarsettings.cpp \
               menusettings.cpp \
               tabdialog.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
 TARGET       = launchersettings
+include ( ../../../include.pro )
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index a7ce88a..95e7632 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,28 +1,32 @@
        TEMPLATE= app
        CONFIG  += qt warn_on debug
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = light.h sensor.h calibration.h
        SOURCES         = light.cpp main.cpp sensor.cpp calibration.cpp
        INTERFACES= lightsettingsbase.ui sensorbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe -lopie
        TARGET  = light-and-power
 TRANSLATIONS = ../../../i18n/de/light-and-power.ts \
         ../../../i18n/xx/light-and-power.ts \
         ../../../i18n/en/light-and-power.ts \
         ../../../i18n/es/light-and-power.ts \
         ../../../i18n/fr/light-and-power.ts \
         ../../../i18n/hu/light-and-power.ts \
         ../../../i18n/ja/light-and-power.ts \
         ../../../i18n/ko/light-and-power.ts \
         ../../../i18n/no/light-and-power.ts \
         ../../../i18n/pl/light-and-power.ts \
         ../../../i18n/pt/light-and-power.ts \
         ../../../i18n/pt_BR/light-and-power.ts \
         ../../../i18n/sl/light-and-power.ts \
         ../../../i18n/zh_CN/light-and-power.ts \
         ../../../i18n/zh_TW/light-and-power.ts \
         ../../../i18n/it/light-and-power.ts \
         ../../../i18n/da/light-and-power.ts
+include ( ../../../include.pro )
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index d7cfba4..4564522 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,27 +1,31 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = security.h
        SOURCES         = security.cpp main.cpp
        INTERFACES= securitybase.ui
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = security
 TRANSLATIONS = ../../../i18n/de/security.ts \
         ../../../i18n/xx/security.ts \
         ../../../i18n/en/security.ts \
         ../../../i18n/es/security.ts \
         ../../../i18n/fr/security.ts \
         ../../../i18n/hu/security.ts \
         ../../../i18n/ja/security.ts \
         ../../../i18n/ko/security.ts \
         ../../../i18n/no/security.ts \
         ../../../i18n/pl/security.ts \
         ../../../i18n/pt/security.ts \
         ../../../i18n/pt_BR/security.ts \
         ../../../i18n/sl/security.ts \
         ../../../i18n/zh_CN/security.ts \
         ../../../i18n/zh_TW/security.ts \
         ../../../i18n/da/security.ts
+include ( ../../../include.pro )
diff --git a/development/keyview/keyview.pro b/development/keyview/keyview.pro
index ab9f57a..ecdc64b 100644
--- a/development/keyview/keyview.pro
+++ b/development/keyview/keyview.pro
@@ -1,28 +1,32 @@
        TEMPLATE= lib
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = keyview.h keyboardimpl.h
        SOURCES         = keyview.cpp keyboardimpl.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
        INTERFACES= 
        TARGET  = keyview
 DESTDIR     = $(OPIEDIR)/plugins/inputmethods
 TRANSLATIONS = ../i18n/de/keyview.ts \
         ../i18n/da/keyview.ts \
         ../i18n/xx/keyview.ts \
         ../i18n/en/keyview.ts \
         ../i18n/es/keyview.ts \
         ../i18n/fr/keyview.ts \
         ../i18n/hu/keyview.ts \
         ../i18n/ja/keyview.ts \
         ../i18n/ko/keyview.ts \
         ../i18n/no/keyview.ts \
         ../i18n/pl/keyview.ts \
         ../i18n/pt/keyview.ts \
         ../i18n/pt_BR/keyview.ts \
         ../i18n/sl/keyview.ts \
         ../i18n/zh_CN/keyview.ts \
         ../i18n/zh_TW/keyview.ts
+include ( ../../include.pro )
diff --git a/example/example.pro b/example/example.pro
index 7bcd7ac..d23a1d8 100644
--- a/example/example.pro
+++ b/example/example.pro
@@ -1,27 +1,31 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = example.h
        SOURCES         = main.cpp example.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= examplebase.ui
        TARGET  = example
 TRANSLATIONS = ../i18n/de/example.ts \
         ../i18n/da/example.ts \
         ../i18n/xx/example.ts \
         ../i18n/en/example.ts \
         ../i18n/es/example.ts \
         ../i18n/fr/example.ts \
         ../i18n/hu/example.ts \
         ../i18n/ja/example.ts \
         ../i18n/ko/example.ts \
         ../i18n/no/example.ts \
         ../i18n/pl/example.ts \
         ../i18n/pt/example.ts \
         ../i18n/pt_BR/example.ts \
         ../i18n/sl/example.ts \
         ../i18n/zh_CN/example.ts \
         ../i18n/zh_TW/example.ts
+include ( ../include.pro )
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index ca7edd3..19451d7 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -1,11 +1,15 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS         = fontfactoryttf_qws.h freetypefactoryimpl.h
        SOURCES         = fontfactoryttf_qws.cpp freetypefactoryimpl.cpp
        qt2:HEADERS+= qfontdata_p.h
        TARGET  = freetypefactory
        DESTDIR         = $(OPIEDIR)/plugins/fontfactories
        INCLUDEPATH+= $(QTDIR)/src/3rdparty/freetype/include $(QTDIR)/src/3rdparty/freetype/include/freetype/config $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lfreetype
        VERSION         = 1.0.0
+include ( ../include.pro )
diff --git a/i18n/da/libopie.ts b/i18n/da/libopie.ts
index 429a0d9..d63d5f6 100644
--- a/i18n/da/libopie.ts
+++ b/i18n/da/libopie.ts
@@ -1,96 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation>Gentagende begivenhed</translation>
    </message>
    <message>
        <source>None</source>
        <translation>Ingen</translation>
    </message>
    <message>
        <source>Day</source>
        <translation>Dag</translation>
    </message>
    <message>
        <source>Week</source>
        <translation>Uge</translation>
    </message>
    <message>
        <source>Month</source>
        <translation>Måned</translation>
    </message>
    <message>
        <source>Year</source>
        <translation>År</translation>
    </message>
    <message>
        <source>Every:</source>
        <translation>Hver:</translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation>Hyppighed</translation>
    </message>
    <message>
        <source>End On:</source>
        <translation>Afslut den:</translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation>Ingen slut dato</translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation>Gentagelse aktiv</translation>
    </message>
    <message>
        <source>Mon</source>
        <translation>Man</translation>
    </message>
    <message>
        <source>Tue</source>
        <translation>Tir</translation>
    </message>
    <message>
        <source>Wed</source>
        <translation>Ons</translation>
    </message>
    <message>
        <source>Thu</source>
        <translation>Tor</translation>
    </message>
    <message>
        <source>Fri</source>
        <translation>Fre</translation>
    </message>
    <message>
        <source>Sat</source>
        <translation>Lør</translation>
    </message>
    <message>
        <source>Sun</source>
        <translation>Søn</translation>
    </message>
    <message>
        <source>Every</source>
        <translation>Hver</translation>
    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
        <source>Time:</source>
        <translation>Tid:</translation>
    </message>
    <message>
        <source>:</source>
        <translation>:</translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation>Vælg tid:</translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/de/libopie.ts b/i18n/de/libopie.ts
index 0fe265a..e94d2a7 100644
--- a/i18n/de/libopie.ts
+++ b/i18n/de/libopie.ts
@@ -1,96 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation>Wiederholendes Ereignis</translation>
    </message>
    <message>
        <source>None</source>
        <translation>Keines</translation>
    </message>
    <message>
        <source>Day</source>
        <translation>Tag</translation>
    </message>
    <message>
        <source>Week</source>
        <translation>Woche</translation>
    </message>
    <message>
        <source>Month</source>
        <translation>Monat</translation>
    </message>
    <message>
        <source>Year</source>
        <translation>Jahr</translation>
    </message>
    <message>
        <source>Every:</source>
        <translation>Jeden:</translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation>Häufigkeit</translation>
    </message>
    <message>
        <source>End On:</source>
        <translation>Endet am:</translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation>Kein Enddatum</translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation>Wiederholung an</translation>
    </message>
    <message>
        <source>Mon</source>
        <translation>Mon</translation>
    </message>
    <message>
        <source>Tue</source>
        <translation>Di</translation>
    </message>
    <message>
        <source>Wed</source>
        <translation>Mi</translation>
    </message>
    <message>
        <source>Thu</source>
        <translation>Do</translation>
    </message>
    <message>
        <source>Fri</source>
        <translation>Fr</translation>
    </message>
    <message>
        <source>Sat</source>
        <translation>Sa</translation>
    </message>
    <message>
        <source>Sun</source>
        <translation>So</translation>
    </message>
    <message>
        <source>Every</source>
        <translation>Jeden</translation>
    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
        <source>Time:</source>
        <translation>Zeit:</translation>
    </message>
    <message>
        <source>:</source>
        <translation>:</translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation>Zeit auswählen:</translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/en/libopie.ts b/i18n/en/libopie.ts
index a66d265..b78f90c 100644
--- a/i18n/en/libopie.ts
+++ b/i18n/en/libopie.ts
@@ -1,96 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>None</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Day</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Week</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Month</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Year</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>End On:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Mon</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Tue</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Wed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Thu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Fri</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sat</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sun</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
        <source>Time:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/es/libopie.ts b/i18n/es/libopie.ts
index eeee05b..c69514a 100644
--- a/i18n/es/libopie.ts
+++ b/i18n/es/libopie.ts
@@ -1,96 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation>Cita repetitiva </translation>
    </message>
    <message>
        <source>None</source>
        <translation>Ninguno</translation>
    </message>
    <message>
        <source>Day</source>
        <translation>Día</translation>
    </message>
    <message>
        <source>Week</source>
        <translation>Semana</translation>
    </message>
    <message>
        <source>Month</source>
        <translation>Mes</translation>
    </message>
    <message>
        <source>Year</source>
        <translation>Año</translation>
    </message>
    <message>
        <source>Every:</source>
        <translation>Cada:</translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation>Frecuencia</translation>
    </message>
    <message>
        <source>End On:</source>
        <translation>Finalizar el:</translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation>Sin fecha final</translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation>Repetir el</translation>
    </message>
    <message>
        <source>Mon</source>
        <translation>Lun</translation>
    </message>
    <message>
        <source>Tue</source>
        <translation>Mar</translation>
    </message>
    <message>
        <source>Wed</source>
        <translation>Mie</translation>
    </message>
    <message>
        <source>Thu</source>
        <translation>Jue</translation>
    </message>
    <message>
        <source>Fri</source>
        <translation>Vie</translation>
    </message>
    <message>
        <source>Sat</source>
        <translation>Sáb</translation>
    </message>
    <message>
        <source>Sun</source>
        <translation>Dom</translation>
    </message>
    <message>
        <source>Every</source>
        <translation>Cada</translation>
    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
        <source>Time:</source>
        <translation>Hora:</translation>
    </message>
    <message>
        <source>:</source>
        <translation>:</translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation>Tomar hora:</translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopie.ts b/i18n/fr/libopie.ts
index 0691ea4..c0bcb51 100644
--- a/i18n/fr/libopie.ts
+++ b/i18n/fr/libopie.ts
@@ -1,97 +1,109 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation>Répéter Evènement</translation>
    </message>
    <message>
        <source>None</source>
        <translation>Sans</translation>
    </message>
    <message>
        <source>Day</source>
        <translation>Jour</translation>
    </message>
    <message>
        <source>Week</source>
        <translation>Semaine</translation>
    </message>
    <message>
        <source>Month</source>
        <translation>Mois</translation>
    </message>
    <message>
        <source>Year</source>
        <translation>Année</translation>
    </message>
    <message>
        <source>Every:</source>
        <translation>Tous les:</translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation>Fréquence</translation>
    </message>
    <message>
        <source>End On:</source>
        <translation>Fin:</translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation>Sans</translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation>Répéter</translation>
    </message>
    <message>
        <source>Mon</source>
        <translation>Lu</translation>
    </message>
    <message>
        <source>Tue</source>
        <translation>Ma</translation>
    </message>
    <message>
        <source>Wed</source>
        <translation>Me</translation>
    </message>
    <message>
        <source>Thu</source>
        <translation>Je</translation>
    </message>
    <message>
        <source>Fri</source>
        <translation>Ve</translation>
    </message>
    <message>
        <source>Sat</source>
        <translation>Sa</translation>
    </message>
    <message>
        <source>Sun</source>
        <translation>Di</translation>
    </message>
    <message>
        <source>Every</source>
        <translation>Tous</translation>
    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
        <source>Time:</source>
        <translation>Heure:</translation>
    </message>
    <message>
        <source>:</source>
        <translation>:</translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopie.ts b/i18n/pl/libopie.ts
index a66d265..b78f90c 100644
--- a/i18n/pl/libopie.ts
+++ b/i18n/pl/libopie.ts
@@ -1,96 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>None</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Day</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Week</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Month</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Year</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>End On:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Mon</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Tue</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Wed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Thu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Fri</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sat</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sun</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
        <source>Time:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/pt/libopie.ts b/i18n/pt/libopie.ts
index a66d265..b78f90c 100644
--- a/i18n/pt/libopie.ts
+++ b/i18n/pt/libopie.ts
@@ -1,96 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>None</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Day</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Week</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Month</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Year</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>End On:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Mon</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Tue</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Wed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Thu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Fri</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sat</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sun</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
        <source>Time:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libopie.ts b/i18n/pt_BR/libopie.ts
index a66d265..b78f90c 100644
--- a/i18n/pt_BR/libopie.ts
+++ b/i18n/pt_BR/libopie.ts
@@ -1,96 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>None</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Day</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Week</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Month</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Year</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>End On:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Mon</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Tue</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Wed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Thu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Fri</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sat</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sun</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
        <source>Time:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/sl/libopie.ts b/i18n/sl/libopie.ts
index 3431b45..efdf58b 100644
--- a/i18n/sl/libopie.ts
+++ b/i18n/sl/libopie.ts
@@ -1,96 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>None</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Day</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Week</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Month</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Year</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>End On:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Mon</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Tue</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Wed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Thu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Fri</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sat</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sun</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
        <source>Time:</source>
        <translation>Čas:</translation>
    </message>
    <message>
        <source>:</source>
        <translation>:</translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation>Izberi čas:</translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopie.ts b/i18n/xx/libopie.ts
index a66d265..b78f90c 100644
--- a/i18n/xx/libopie.ts
+++ b/i18n/xx/libopie.ts
@@ -1,96 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>None</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Day</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Week</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Month</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Year</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>End On:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Mon</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Tue</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Wed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Thu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Fri</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sat</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Sun</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Every</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
        <source>Time:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 63f6d5d..c417209 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -141,152 +141,160 @@
        <source>Properties</source>
        <translation>內容</translation>
    </message>
    <message>
        <source>Beam File</source>
        <translation>傳輸檔案</translation>
    </message>
    <message>
        <source>Copy </source>
        <translation>複製 </translation>
    </message>
    <message>
        <source> As</source>
        <translation> 為</translation>
    </message>
    <message>
        <source>Copy Same Dir</source>
        <translation>複製相同的目錄</translation>
    </message>
    <message>
        <source>Could not copy
 </source>
        <translation>無法複製</translation>
    </message>
    <message>
        <source>to
 </source>
        <translation>至</translation>
    </message>
    <message>
        <source>Could not move
 </source>
        <translation>無法移動</translation>
    </message>
    <message>
        <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
        <translation>進階型檔案管理程式
 版權 2002 
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 ,授權為 GPL</translation>
    </message>
    <message>
        <source>Add To Documents</source>
        <translation>新增至文件</translation>
    </message>
    <message>
        <source>Actions</source>
        <translation>動作</translation>
    </message>
    <message>
        <source>Select All</source>
        <translation>選擇全部</translation>
    </message>
    <message>
        <source>Really delete
 %1 files?</source>
        <translation>確定要刪除
 %1 個檔案?</translation>
    </message>
    <message>
        <source>Delete Directory?</source>
        <translation>刪除目錄?</translation>
    </message>
    <message>
        <source>Really delete
 </source>
        <translation>確定刪除</translation>
    </message>
    <message>
        <source>Delete Directory</source>
        <translation>刪除目錄</translation>
    </message>
    <message>
        <source>Really copy
 %1 files?</source>
        <translation>確定要複製
 %1 個檔案?</translation>
    </message>
    <message>
        <source>File Exists!</source>
        <translation>檔案已存在!</translation>
    </message>
    <message>
        <source>
 exists. Ok to overwrite?</source>
        <translation> 已存在. 要覆蓋嗎?</translation>
    </message>
    <message>
        <source> already exists.
 Do you really want to delete it?</source>
        <translation> 已經存在.
 您確定要刪除它?</translation>
    </message>
+    <message>
+        <source>%1 exists. Ok to overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not copy %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Output</name>
    <message>
        <source>Save output to file (name only)</source>
        <translation>將輸出存為檔案(只有名稱)</translation>
    </message>
    <message>
        <source>Output</source>
        <translation>輸出</translation>
    </message>
 </context>
 <context>
    <name>filePermissions</name>
    <message>
        <source>Set File Permissions</source>
        <translation>設定檔案權限</translation>
    </message>
    <message>
        <source>Set file permissions for:</source>
        <translation>設定這個檔案的權限:</translation>
    </message>
    <message>
        <source>owner</source>
        <translation>所有者</translation>
    </message>
    <message>
        <source>group</source>
        <translation>群組</translation>
    </message>
    <message>
        <source>others</source>
        <translation>其他</translation>
    </message>
    <message>
        <source>Owner</source>
        <translation>所有者</translation>
    </message>
    <message>
        <source>Group</source>
        <translation>群組</translation>
    </message>
    <message>
        <source>read</source>
        <translation>讀</translation>
    </message>
    <message>
        <source>write</source>
        <translation>寫</translation>
    </message>
    <message>
        <source>execute</source>
        <translation>執行</translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index c9a7e3c..fc96fdd 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -1,281 +1,281 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>Appearance</name>
    <message>
        <source>Settings...</source>
        <translation>設定...</translation>
    </message>
    <message>
        <source>Current scheme</source>
        <translation>目前的主題</translation>
    </message>
    <message>
        <source>Edit...</source>
        <translation>編輯...</translation>
    </message>
    <message>
        <source>Delete</source>
        <translation>刪除</translation>
    </message>
    <message>
        <source>Save</source>
        <translation>儲存</translation>
    </message>
    <message>
        <source>Force styling for all applications.</source>
        <translation>強制將樣式套用到所有的應用程式.</translation>
    </message>
    <message>
        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
        <translation>停用這些應用程式的樣式(可以用 &lt;b&gt;*&lt;/b&gt; 當作萬用字元):</translation>
    </message>
    <message>
        <source>Binary file(s)</source>
        <translation>二元檔</translation>
    </message>
    <message>
        <source>Tab style:</source>
        <translation>標籤頁樣式:</translation>
    </message>
    <message>
        <source>Tabs</source>
        <translation>索引標籤</translation>
    </message>
    <message>
        <source>Tabs w/icons</source>
        <translation>有圖示的索引標籤</translation>
    </message>
    <message>
        <source>Drop down list</source>
        <translation>直式索引標籤</translation>
    </message>
    <message>
        <source>Drop down list w/icons</source>
        <translation>有圖示的直式索引標籤</translation>
    </message>
    <message>
        <source>Top</source>
        <translation>頂端</translation>
    </message>
    <message>
        <source>Bottom</source>
        <translation>底部</translation>
    </message>
    <message>
-        <source>Appearance</source>
-        <translation>外觀</translation>
-    </message>
-    <message>
        <source>Style</source>
        <translation>樣式</translation>
    </message>
    <message>
        <source>Font</source>
        <translation>字型</translation>
    </message>
    <message>
        <source>Colors</source>
        <translation>顏色</translation>
    </message>
    <message>
        <source>Windows</source>
        <translation>視窗</translation>
    </message>
    <message>
        <source>Advanced</source>
        <translation>進階</translation>
    </message>
    <message>
        <source>Restart</source>
        <translation>重新啟動</translation>
    </message>
    <message>
        <source>Do you want to restart %1 now?</source>
        <translation>您現在想要重新啟動 %1 ?</translation>
    </message>
    <message>
        <source>Yes</source>
        <translation>是</translation>
    </message>
    <message>
        <source>No</source>
        <translation>否</translation>
    </message>
    <message>
        <source>Save Scheme</source>
        <translation>儲存主題</translation>
    </message>
    <message>
        <source>Save scheme</source>
        <translation>儲存主題</translation>
    </message>
    <message>
        <source>Scheme does already exist.</source>
        <translation>主題已經存在.</translation>
    </message>
    <message>
        <source>Delete scheme</source>
        <translation>刪除主題</translation>
    </message>
    <message>
        <source>Unable to delete current scheme.</source>
        <translation>無法刪除目前的主題.</translation>
    </message>
    <message>
        <source>&lt;new&gt;</source>
        <translation>&lt;新增&gt;</translation>
    </message>
    <message>
        <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 Click here to select an available style.</source>
        <translation>樣式控制了按鈕, 捲動軸等項目在所有應用程式中的顯示方式.
 請按這裡以選擇可以使用的樣式.</translation>
    </message>
    <message>
        <source>Click here to configure the currently selected style.
 Note:  This option is not available for all styles.</source>
        <translation>請按這裡以設定目前選擇的樣式.
 注意: 並非所有的樣式都有這個選項.</translation>
    </message>
    <message>
        <source>Window decorations control the way the application title bar and its buttons appear.
 Click here to select an available decoration.</source>
        <translation>視窗裝飾控制了應用程式的標題列與其按鈕的顯示方式.
 請按這裡以選擇可以使用的裝飾.</translation>
    </message>
    <message>
        <source>Select the desired name, style and size of the default font applications will use.</source>
        <translation>選擇想要的名稱, 樣式和應用程式所使用的預設字型大小.</translation>
    </message>
    <message>
        <source>Color schemes are a collection of colors which are used for various parts of the display.
 Click here to select an available scheme.</source>
        <translation>色彩主題是用在顯示時各個部份的顏色的集合.
 請按這裡以選擇可以使用的主題.</translation>
    </message>
    <message>
        <source>Click here to change the colors in the current color scheme.</source>
        <translation>按這裡以改變目前的色彩主題中的顏色.</translation>
    </message>
    <message>
        <source>Click here to delete the color scheme selected in the list to the left.</source>
        <translation>按這裡以刪除在左方清單中所選擇的色彩主題.</translation>
    </message>
    <message>
        <source>Click here to name and save the current color scheme.</source>
        <translation>按這裡以命名並儲存目前的色彩主題.</translation>
    </message>
    <message>
        <source>Click here to allow all applications to use global appearance settings.</source>
        <translation>按這裡讓所有的應用程式使用全域外觀設定值.</translation>
    </message>
    <message>
        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 This area allows you to select an application and which settings you wish to disable.</source>
        <translation>如果某些應用程式無法正確地以全域外觀設定值顯示, 您可以關閉用於該應用程式的某些功能.
 這個區域允許您選擇要那些程式停用設定值.</translation>
    </message>
    <message>
        <source>Click here to add an application to the list above.</source>
        <translation>按這裡來將應用程式加入上面的清單.</translation>
    </message>
    <message>
        <source>Click here to delete the currently selected application.</source>
        <translation>按這裡以刪除目前選擇的應用程式.</translation>
    </message>
    <message>
        <source>Click here to move the currently selected application up in the list.</source>
        <translation>按這裡讓目前選擇的應用程式在清單中向上移動.</translation>
    </message>
    <message>
        <source>Click here to move the currently selected application down in the list.</source>
        <translation>按這裡讓目前選擇的應用程式在清單中向下移動.</translation>
    </message>
    <message>
        <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
        <translation>按這裡以選擇想要的索引標籤對話盒(本應用程式屬之)樣式. 可用的樣式有:
 1. 索引標籤 - 普通, 只有文字標籤的索引標籤
 2. 有圖示的索引標籤 - 每個索引標籤都有圖示, 文字標籤只出現在目前的索引標籤
 3. 直式索引標籤 - 垂直排列的索引標籤
 4. 有圖示的直式索引標籤 - 垂直排列且有圖示的索引標籤</translation>
    </message>
    <message>
        <source>Click here so that tabs appear at the top of the window.</source>
        <translation>按這裡讓索引標籤出現在視窗的頂端.</translation>
    </message>
    <message>
        <source>Click here so that tabs appear at the bottom of the window.</source>
        <translation>按這裡讓索引標籤出現在視窗的底部.</translation>
    </message>
    <message>
        <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
        <translation>這是一個預覽視窗. 在這裡可以看到在改變選項之後的新外觀.</translation>
    </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditScheme</name>
    <message>
        <source>Edit scheme</source>
        <translation>編輯主題</translation>
    </message>
    <message>
        <source>Click here to select a color for: </source>
        <translation>按這裡來選擇顏色: </translation>
    </message>
 </context>
 <context>
    <name>SampleWindow</name>
    <message>
        <source>Sample</source>
        <translation>範例</translation>
    </message>
    <message>
        <source>Normal Item</source>
        <translation>一般項目</translation>
    </message>
    <message>
        <source>Disabled Item</source>
        <translation>停用的項目</translation>
    </message>
    <message>
        <source>Menu</source>
        <translation>選單</translation>
    </message>
    <message>
        <source>Normal Text</source>
        <translation>一般文字</translation>
    </message>
    <message>
        <source>Highlighted Text</source>
        <translation>突顯的文字</translation>
    </message>
    <message>
        <source>Button</source>
        <translation>按鈕</translation>
    </message>
    <message>
        <source>Check Box</source>
        <translation>核取方塊</translation>
    </message>
    <message>
        <source>Sample window using the selected settings.</source>
        <translation>範例視窗使用選擇的設定值.</translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/buzzword.ts b/i18n/zh_TW/buzzword.ts
index 4d1bc18..a71309b 100644
--- a/i18n/zh_TW/buzzword.ts
+++ b/i18n/zh_TW/buzzword.ts
@@ -1,21 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>BuzzWord</name>
    <message>
        <source>buZzword</source>
-        <translation >buZzword</translation>
+        <translation>buZzword</translation>
    </message>
    <message>
        <source>&amp;New game</source>
        <translation>&amp;新遊戲</translation>
    </message>
    <message>
        <source>&amp;Game</source>
        <translation>遊戲</translation>
    </message>
    <message>
        <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation >&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
+        <translation>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libcardmonapplet.ts b/i18n/zh_TW/libcardmonapplet.ts
index 0b5ef8d..28c4368 100644
--- a/i18n/zh_TW/libcardmonapplet.ts
+++ b/i18n/zh_TW/libcardmonapplet.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>CardMonitor</name>
    <message>
        <source>CF/PCMCIA card eject failed!</source>
        <translation>CF/PCMCIA 移除失敗!</translation>
    </message>
    <message>
        <source>SD/MMC card eject failed!</source>
        <translation>SD/MMC 移除失敗!</translation>
    </message>
    <message>
        <source>New card: </source>
-        <translation >新卡片:</translation>
+        <translation>新卡片:</translation>
    </message>
    <message>
        <source>Ejected: </source>
        <translation>移除:</translation>
    </message>
    <message>
        <source>Eject SD/MMC card</source>
        <translation>移除 SD/MMC card</translation>
    </message>
    <message>
        <source>Eject card 0: %1</source>
        <translation>移除 card 0: %1</translation>
    </message>
    <message>
        <source>Eject card 1: %1</source>
        <translation>移除 card 1: %1</translation>
    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopie.ts b/i18n/zh_TW/libopie.ts
index 7cf93a1..5651af8 100644
--- a/i18n/zh_TW/libopie.ts
+++ b/i18n/zh_TW/libopie.ts
@@ -1,112 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
    <name>ORecurranceBase</name>
    <message>
        <source>Repeating Event </source>
        <translation>Repeating Event</translation>
    </message>
    <message>
        <source>None</source>
        <translation>無</translation>
    </message>
    <message>
        <source>Day</source>
        <translation>日</translation>
    </message>
    <message>
        <source>Week</source>
        <translation>星期</translation>
    </message>
    <message>
        <source>Month</source>
        <translation>月份</translation>
    </message>
    <message>
        <source>Year</source>
        <translation>年份</translation>
    </message>
    <message>
        <source>Every:</source>
        <translation>每:</translation>
    </message>
    <message>
        <source>Frequency</source>
        <translation>重復的</translation>
    </message>
    <message>
        <source>End On:</source>
        <translation>End On:</translation>
    </message>
    <message>
        <source>No End Date</source>
        <translation>No End Date</translation>
    </message>
    <message>
        <source>Repeat On</source>
        <translation>在某天重復</translation>
    </message>
    <message>
        <source>Mon</source>
        <translation>星期一</translation>
    </message>
    <message>
        <source>Tue</source>
        <translation>星期二</translation>
    </message>
    <message>
        <source>Wed</source>
        <translation>星期三</translation>
    </message>
    <message>
        <source>Thu</source>
        <translation>星期四</translation>
    </message>
    <message>
        <source>Fri</source>
        <translation>星期五</translation>
    </message>
    <message>
        <source>Sat</source>
        <translation>星期六</translation>
    </message>
    <message>
        <source>Sun</source>
        <translation>星期日</translation>
    </message>
    <message>
        <source>Every</source>
        <translation>每</translation>
    </message>
    <message>
        <source>Var1</source>
        <translation></translation>
    </message>
    <message>
        <source>Var 2</source>
        <translation>Var 2</translation>
    </message>
    <message>
        <source>WeekVar</source>
        <translation>WeekVar</translation>
    </message>
 </context>
 <context>
    <name>OTimePickerDialogBase</name>
    <message>
-        <source>TimePicker</source>
-        <translation>TimePicker</translation>
-    </message>
-    <message>
        <source>Time:</source>
        <translation>Time:</translation>
    </message>
    <message>
        <source>:</source>
        <translation>:</translation>
    </message>
    <message>
        <source>Pick Time:</source>
        <translation>Pick Time:</translation>
    </message>
 </context>
 </TS>
diff --git a/include.pro b/include.pro
index 625fb70..fb27a6d 100644
--- a/include.pro
+++ b/include.pro
@@ -1,44 +1,45 @@
 # make install
 # base opie install path
 outdir = /opt/QtPalmtop
 # ipkg control files
 control.path = /CONTROL
 control.files = control postinst prerm postrm preinst conffiles
 INSTALLS += control
 # images, default is $$outdir/pics/$$TARGET
 pics.path = $$outdir/pics/$$TARGET
 pics.files = pics/*
 INSTALLS += pics
 # sounds, default path is $$outdir/sounds/$$TARGET
 sounds.path = $$outdir/sounds/$$TARGET
 sounds.files = sounds/*
 INSTALLS += sounds
 # init scripts, default path is /etc/init.d
 init.path = /etc/init.d
 init.files = init
 INSTALLS += init
 # data, default path is /usr/share/$$TARGET
 data.path = /usr/share/$$TARGET
 data.files = share/*
 INSTALLS += data
 # sounds, default path is $$outdir/sounds/$$TARGET
 sounds.path = $$outdir/sounds/$$TARGET
 sounds.files = sounds/*
 INSTALLS += sounds
 # new targets
 lupdate.target = lupdate
-lupdate.commands = lupdate -noobselete $(DIST)
+lupdate.commands = lupdate -noobsolete $(PRO)
 lrelease.target = lrelease
-lrelease.commands = lrelease $(DIST)
+lrelease.commands = lrelease $(PRO)
 QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease
diff --git a/inputmethods/dvorak/dvorak.pro b/inputmethods/dvorak/dvorak.pro
index dc02e55..751fe52 100644
--- a/inputmethods/dvorak/dvorak.pro
+++ b/inputmethods/dvorak/dvorak.pro
@@ -1,30 +1,34 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   dvorak.h \
            dvorakimpl.h 
        SOURCES=   dvorak.cpp \
            dvorakimpl.cpp
        TARGET  = qdvorak
        DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
        QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
        VERSION         = 1.0.0
 TRANSLATIONS = ../../i18n/de/libqdvorak.ts \
         ../../i18n/da/libqdvorak.ts \
         ../../i18n/xx/libqdvorak.ts \
         ../../i18n/en/libqdvorak.ts \
         ../../i18n/es/libqdvorak.ts \
         ../../i18n/fr/libqdvorak.ts \
         ../../i18n/hu/libqdvorak.ts \
         ../../i18n/ja/libqdvorak.ts \
         ../../i18n/ko/libqdvorak.ts \
         ../../i18n/no/libqdvorak.ts \
         ../../i18n/pl/libqdvorak.ts \
         ../../i18n/pt/libqdvorak.ts \
         ../../i18n/pt_BR/libqdvorak.ts \
         ../../i18n/sl/libqdvorak.ts \
         ../../i18n/zh_CN/libqdvorak.ts \
         ../../i18n/zh_TW/libqdvorak.ts
+include ( ../../include.pro )
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index dd661fe..8c7a5de 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -1,48 +1,52 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   qimpenchar.h \
            qimpenprofile.h \
            qimpencombining.h \
            qimpenhelp.h \
            qimpeninput.h \
            qimpenmatch.h \
            qimpensetup.h \
            qimpenstroke.h \
            qimpenwidget.h \
            qimpenwordpick.h \
            handwritingimpl.h
        SOURCES=   qimpenchar.cpp \
            qimpenprofile.cpp \
            qimpencombining.cpp \
            qimpenhelp.cpp \
            qimpeninput.cpp \
            qimpenmatch.cpp \
            qimpensetup.cpp \
            qimpenstroke.cpp \
            qimpenwidget.cpp \
            qimpenwordpick.cpp \
            handwritingimpl.cpp
 INTERFACES = qimpenprefbase.ui
        TARGET  = qhandwriting
        DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
        VERSION         = 1.0.0
 TRANSLATIONS = ../../i18n/de/libqhandwriting.ts \
         ../../i18n/da/libqhandwriting.ts \
         ../../i18n/xx/libqhandwriting.ts \
         ../../i18n/en/libqhandwriting.ts \
         ../../i18n/es/libqhandwriting.ts \
         ../../i18n/fr/libqhandwriting.ts \
         ../../i18n/hu/libqhandwriting.ts \
         ../../i18n/ja/libqhandwriting.ts \
         ../../i18n/ko/libqhandwriting.ts \
         ../../i18n/no/libqhandwriting.ts \
         ../../i18n/pl/libqhandwriting.ts \
         ../../i18n/pt/libqhandwriting.ts \
         ../../i18n/pt_BR/libqhandwriting.ts \
         ../../i18n/sl/libqhandwriting.ts \
         ../../i18n/zh_CN/libqhandwriting.ts \
         ../../i18n/zh_TW/libqhandwriting.ts
+include ( ../../include.pro )
diff --git a/inputmethods/jumpx/jumpx.pro b/inputmethods/jumpx/jumpx.pro
index b706856..647e59b 100644
--- a/inputmethods/jumpx/jumpx.pro
+++ b/inputmethods/jumpx/jumpx.pro
@@ -1,29 +1,33 @@
 TEMPLATE        = lib
 CONFIG         += qt warn_on release
 HEADERS         = keyboard.h \
                  keyboardimpl.h
 SOURCES         = keyboard.cpp \
                  keyboardimpl.cpp
 TARGET          = qjumpx
 DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS           += -lqpe
 VERSION         = 1.0.0
 TRANSLATIONS = ../../i18n/de/libqjumpx.ts \
         ../../i18n/da/libqjumpx.ts \
         ../../i18n/xx/libqjumpx.ts \
         ../../i18n/en/libqjumpx.ts \
         ../../i18n/es/libqjumpx.ts \
         ../../i18n/fr/libqjumpx.ts \
         ../../i18n/hu/libqjumpx.ts \
         ../../i18n/ja/libqjumpx.ts \
         ../../i18n/ko/libqjumpx.ts \
         ../../i18n/no/libqjumpx.ts \
         ../../i18n/pl/libqjumpx.ts \
         ../../i18n/pt/libqjumpx.ts \
         ../../i18n/pt_BR/libqjumpx.ts \
         ../../i18n/sl/libqjumpx.ts \
         ../../i18n/zh_CN/libqjumpx.ts \
         ../../i18n/zh_TW/libqjumpx.ts
+include ( ../../include.pro )
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index 8890c12..5d51806 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -1,30 +1,34 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   keyboard.h \
            keyboardimpl.h 
        SOURCES=   keyboard.cpp \
            keyboardimpl.cpp
        TARGET  = qkeyboard
        DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
        QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
        VERSION         = 1.0.0
 TRANSLATIONS = ../../i18n/de/libqkeyboard.ts \
         ../../i18n/da/libqkeyboard.ts \
         ../../i18n/xx/libqkeyboard.ts \
         ../../i18n/en/libqkeyboard.ts \
         ../../i18n/es/libqkeyboard.ts \
         ../../i18n/fr/libqkeyboard.ts \
         ../../i18n/hu/libqkeyboard.ts \
         ../../i18n/ja/libqkeyboard.ts \
         ../../i18n/ko/libqkeyboard.ts \
         ../../i18n/no/libqkeyboard.ts \
         ../../i18n/pl/libqkeyboard.ts \
         ../../i18n/pt/libqkeyboard.ts \
         ../../i18n/pt_BR/libqkeyboard.ts \
         ../../i18n/sl/libqkeyboard.ts \
         ../../i18n/zh_CN/libqkeyboard.ts \
         ../../i18n/zh_TW/libqkeyboard.ts
+include ( ../../include.pro )
diff --git a/inputmethods/kjumpx/kjumpx.pro b/inputmethods/kjumpx/kjumpx.pro
index 55bbf78..0074824 100644
--- a/inputmethods/kjumpx/kjumpx.pro
+++ b/inputmethods/kjumpx/kjumpx.pro
@@ -1,29 +1,33 @@
 TEMPLATE        = lib
 CONFIG         += qt warn_on release
 HEADERS         = keyboard.h \
                  keyboardimpl.h
 SOURCES         = keyboard.cpp \
                  keyboardimpl.cpp
 TARGET          = qkjumpx
 DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS           += -lqpe
 VERSION         = 1.0.0
 TRANSLATIONS = ../../i18n/de/libqkjumpx.ts \
         ../../i18n/da/libqkjumpx.ts \
         ../../i18n/xx/libqkjumpx.ts \
         ../../i18n/en/libqkjumpx.ts \
         ../../i18n/es/libqkjumpx.ts \
         ../../i18n/fr/libqkjumpx.ts \
         ../../i18n/hu/libqkjumpx.ts \
         ../../i18n/ja/libqkjumpx.ts \
         ../../i18n/ko/libqkjumpx.ts \
         ../../i18n/no/libqkjumpx.ts \
         ../../i18n/pl/libqkjumpx.ts \
         ../../i18n/pt/libqkjumpx.ts \
         ../../i18n/pt_BR/libqkjumpx.ts \
         ../../i18n/sl/libqkjumpx.ts \
         ../../i18n/zh_CN/libqkjumpx.ts \
         ../../i18n/zh_TW/libqkjumpx.ts
+include ( ../../include.pro )
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro
index 9afed06..8b06c69 100644
--- a/inputmethods/multikey/multikey.pro
+++ b/inputmethods/multikey/multikey.pro
@@ -1,30 +1,34 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   keyboard.h \
            configdlg.h \
            keyboardimpl.h 
        SOURCES=   keyboard.cpp \
            configdlg.cpp \
            keyboardimpl.cpp
        TARGET  = qmultikey
        DESTDIR         = $(OPIEDIR)/plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
        QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
        VERSION         = 1.0.0
 TRANSLATIONS    = ../../i18n/pt_BR/libqmultikey.ts \
 ../../i18n/de/libqmultikey.ts \
 ../../i18n/xx/libqmultikey.ts \
 ../../i18n/en/libqmultikey.ts \
 ../../i18n/hu/libqmultikey.ts \
 ../../i18n/sl/libqmultikey.ts \
 ../../i18n/ja/libqmultikey.ts \
 ../../i18n/ko/libqmultikey.ts \
 ../../i18n/pl/libqmultikey.ts \
 ../../i18n/no/libqmultikey.ts \
 ../../i18n/zh_CN/libqmultikey.ts \
 ../../i18n/zh_TW/libqmultikey.ts \
 ../../i18n/fr/libqmultikey.ts \
 ../../i18n/da/libqmultikey.ts
+include ( ../../include.pro )
diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro
index f7da15b..9b5c46c 100644
--- a/inputmethods/pickboard/pickboard.pro
+++ b/inputmethods/pickboard/pickboard.pro
@@ -1,27 +1,31 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h
        SOURCES=   pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp
        TARGET  = qpickboard
        DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
        VERSION         = 1.0.0
 TRANSLATIONS = ../../i18n/de/libqpickboard.ts \
         ../../i18n/da/libqpickboard.ts \
         ../../i18n/xx/libqpickboard.ts \
         ../../i18n/en/libqpickboard.ts \
         ../../i18n/es/libqpickboard.ts \
         ../../i18n/fr/libqpickboard.ts \
         ../../i18n/hu/libqpickboard.ts \
         ../../i18n/ja/libqpickboard.ts \
         ../../i18n/ko/libqpickboard.ts \
         ../../i18n/no/libqpickboard.ts \
         ../../i18n/pl/libqpickboard.ts \
         ../../i18n/pt/libqpickboard.ts \
         ../../i18n/pt_BR/libqpickboard.ts \
         ../../i18n/sl/libqpickboard.ts \
         ../../i18n/zh_CN/libqpickboard.ts \
         ../../i18n/zh_TW/libqpickboard.ts
+include ( ../../include.pro )
diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro
index 849da32..1e3f00b 100644
--- a/inputmethods/unikeyboard/unikeyboard.pro
+++ b/inputmethods/unikeyboard/unikeyboard.pro
@@ -1,27 +1,31 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS=   unikeyboard.h unikeyboardimpl.h
        SOURCES=   unikeyboard.cpp unikeyboardimpl.cpp
        TARGET  = qunikeyboard
        DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
        VERSION         = 1.0.0
 TRANSLATIONS = ../../i18n/de/libqunikeyboard.ts \
         ../../i18n/da/libqunikeyboard.ts \
         ../../i18n/xx/libqunikeyboard.ts \
         ../../i18n/en/libqunikeyboard.ts \
         ../../i18n/es/libqunikeyboard.ts \
         ../../i18n/fr/libqunikeyboard.ts \
         ../../i18n/hu/libqunikeyboard.ts \
         ../../i18n/ja/libqunikeyboard.ts \
         ../../i18n/ko/libqunikeyboard.ts \
         ../../i18n/no/libqunikeyboard.ts \
         ../../i18n/pl/libqunikeyboard.ts \
         ../../i18n/pt/libqunikeyboard.ts \
         ../../i18n/pt_BR/libqunikeyboard.ts \
         ../../i18n/sl/libqunikeyboard.ts \
         ../../i18n/zh_CN/libqunikeyboard.ts \
         ../../i18n/zh_TW/libqunikeyboard.ts
+include ( ../../include.pro )
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index 58a7489..a2d8faa 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -9,96 +9,100 @@ HEADERS   = ofontmenu.h \
    oclickablelabel.h oprocctrl.h \
    oprocess.h odevice.h odevicebutton.h \
    otimepicker.h otabwidget.h \
    otabbar.h otabinfo.h \
    ofontselector.h \
    pim/opimrecord.h \
    pim/otodo.h \
    pim/orecordlist.h \
    pim/opimaccesstemplate.h \
    pim/opimaccessbackend.h \
    pim/otodoaccess.h \
    pim/otodoaccessbackend.h \
    pim/ocontact.h \
    pim/ocontactaccess.h \
    pim/ocontactaccessbackend.h \
    pim/ocontactaccessbackend_xml.h \
    pim/ocontactaccessbackend_vcard.h \
    pim/obackendfactory.h \
    pim/opimcache.h \ 
    pim/otodoaccessvcal.h \
    pim/orecur.h \
    pim/opimstate.h \
    pim/opimxrefpartner.h \
    pim/opimxref.h \
    pim/opimxrefmanager.h \
    pim/opimmaintainer.h \
    pim/opimnotify.h \
    pim/opimnotifymanager.h \
    pim/opimmainwindow.h \
    pim/opimresolver.h \
    orecurrancewidget.h \
    oticker.h 
 #    pim/otodoaccesssql.h \
 SOURCES   = ofontmenu.cc  \
        ocolorbutton.cpp \
        sharp_compat.cpp \
      xmltree.cc \
      ofiledialog.cc ofileselector.cc \
            ocheckitem.cpp tododb.cpp todoevent.cpp \
      todovcalresource.cpp  colordialog.cpp \
      colorpopupmenu.cpp oclickablelabel.cpp \
      oprocctrl.cpp oprocess.cpp \
      odevice.cpp odevicebutton.cpp otimepicker.cpp \
       otabwidget.cpp otabbar.cpp \
             ofontselector.cpp \
             pim/otodo.cpp \
             pim/opimrecord.cpp \
       pim/otodoaccess.cpp \
       pim/otodoaccessbackend.cpp \
             pim/otodoaccessxml.cpp \
             pim/ocontact.cpp \
             pim/ocontactaccess.cpp \
             pim/ocontactaccessbackend_vcard.cpp \
       pim/otodoaccessvcal.cpp \
       pim/orecur.cpp \
       pim/opimstate.cpp \
       pim/opimxrefpartner.cpp \
       pim/opimxref.cpp \
       pim/opimxrefmanager.cpp \
       pim/opimmaintainer.cpp \
       pim/opimnotify.cpp \
       pim/opimnotifymanager.cpp \
       pim/opimmainwindow.cpp \
       pim/opimresolver.cpp \
       orecurrancewidget.cpp \
       oticker.cpp
 #             pim/otodoaccesssql.cpp \
 TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(QTDIR)/lib$(PROJMAK)
 #VERSION = 1.0.0
 LIBS += -lqpe
 # LIBS            += -lopiesql
 INTERFACES      = otimepickerbase.ui orecurrancebase.ui
 TRANSLATIONS = ../i18n/de/libopie.ts \
         ../i18n/xx/libopie.ts \
   ../i18n/en/libopie.ts \
   ../i18n/es/libopie.ts \
   ../i18n/fr/libopie.ts \
   ../i18n/hu/libopie.ts \
   ../i18n/ja/libopie.ts \
   ../i18n/ko/libopie.ts \
   ../i18n/no/libopie.ts \
   ../i18n/pl/libopie.ts \
   ../i18n/pt/libopie.ts \
   ../i18n/pt_BR/libopie.ts \
   ../i18n/sl/libopie.ts \
   ../i18n/zh_CN/libopie.ts \
   ../i18n/zh_TW/libopie.ts \
   ../i18n/da/libopie.ts
+include ( ../include.pro )
diff --git a/libopie/ofileselector/libopie.pro b/libopie/ofileselector/libopie.pro
index bf8deda..4d1b5cf 100644
--- a/libopie/ofileselector/libopie.pro
+++ b/libopie/ofileselector/libopie.pro
@@ -4,96 +4,100 @@ HEADERS   = ofontmenu.h \
    ocolorbutton.h \
    ofileselector/odefaultfactories.h \
    ofileselector/ofiledialog.h \
    ofileselector/ofilelistview.h \
    ofileselector/ofileselector.h \
    ofileselector/ofileselectoritem.h \
    ofileselector/ofileselectormain.h \
    ofileselector/ofileview.h \
    ofileselector/olister.h \
    ofileselector/olocallister.h \
    ofileselector/opixmapprovider.h \
    tododb.h \
    ocheckitem.h todoevent.h todoresource.h \
    todovcalresource.h xmltree.h \
    colordialog.h colorpopupmenu.h \
    oclickablelabel.h oprocctrl.h \
    oprocess.h odevice.h \
    otimepicker.h otabwidget.h \
    otabbar.h otabinfo.h \
    ofontselector.h \
    pim/opimrecord.h \
    pim/otodo.h \
    pim/orecordlist.h \
    pim/opimaccesstemplate.h \
    pim/opimaccessbackend.h \
    pim/otodoaccess.h \
    pim/otodacessbackend.h \
    pim/ocontact.h \
    pim/ocontactaccess.h \
    pim/ocontactaccessbackend.h \
    pim/ocontactaccessbackend_xml.h \
    pim/obackendfactory.h \
    pim/opimcache.h \ 
    pim/otodoaccessvcal.h \
    pim/orecur.h \
    orecurrancewidget.h
 #    pim/otodoaccesssql.h \
 SOURCES   = ofontmenu.cc  \
        ocolorbutton.cpp \
        ofileselector/odefaultfactories.cpp \
        ofileselector/ofiledialog.cpp \
        ofileselector/ofilefactory.cpp \
        ofileselector/ofilelistview.cpp \
        ofileselector/ofileselector.cpp \
        ofileselector/ofileselectoritem.cpp \
        ofileselector/ofileselectormain.cpp \
        ofileselector/ofileview.cpp \
        ofileselector/olister.cpp \
        ofileselector/olocallister.cpp \
        ofileselector/opixmapprovider.cpp \
            xmltree.cc \
            ocheckitem.cpp tododb.cpp todoevent.cpp \
            todovcalresource.cpp  colordialog.cpp \
            colorpopupmenu.cpp oclickablelabel.cpp \
            oprocctrl.cpp oprocess.cpp \
            odevice.cpp otimepicker.cpp \
             otabwidget.cpp otabbar.cpp \
             ofontselector.cpp \
             pim/otodo.cpp \
             pim/opimrecord.cpp \
             pim/otodoaccess.cpp \
             pim/otodoaccessbackend.cpp \
             pim/otodoaccessxml.cpp \
             pim/ocontact.cpp \
             pim/ocontactaccess.cpp \
             pim/otodoaccessvcal.cpp \
             pim/orecur.cpp \
             orecurrancewidget.cpp
 #             pim/otodoaccesssql.cpp \
 TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(QTDIR)/lib$(PROJMAK)
 #VERSION = 1.0.0
 # LIBS            += -lopiesql
 INTERFACES      = otimepickerbase.ui orecurrancebase.ui
 TRANSLATIONS = ../i18n/de/libopie.ts \
         ../i18n/xx/libopie.ts \
   ../i18n/en/libopie.ts \
   ../i18n/es/libopie.ts \
   ../i18n/fr/libopie.ts \
   ../i18n/hu/libopie.ts \
   ../i18n/ja/libopie.ts \
   ../i18n/ko/libopie.ts \
   ../i18n/no/libopie.ts \
   ../i18n/pl/libopie.ts \
   ../i18n/pt/libopie.ts \
   ../i18n/pt_BR/libopie.ts \
   ../i18n/sl/libopie.ts \
   ../i18n/zh_CN/libopie.ts \
   ../i18n/zh_TW/libopie.ts \
   ../i18n/da/libopie.ts
+include ( ../../include.pro )
diff --git a/libopie/pim/libopie.pro b/libopie/pim/libopie.pro
index 79c3d77..bec595c 100644
--- a/libopie/pim/libopie.pro
+++ b/libopie/pim/libopie.pro
@@ -1,79 +1,83 @@
 TEMPLATE        = lib
 CONFIG          += qte warn_on release
 HEADERS   = ofontmenu.h \
    tododb.h \
    todoevent.h todoresource.h \
    todovcalresource.h xmltree.h \
    colordialog.h colorpopupmenu.h \
    oclickablelabel.h oprocctrl.h \
    oprocess.h odevice.h \
    otimepicker.h otabwidget.h \
    otabbar.h otabinfo.h \
    ofileselector/ofiledialog.h \
    ofileselector/ofilelistview.h \
    ofileselector/ofileselector.h \
    ofileselector/ofileselectoritem.h \
    ofileselector/ofileview.h \
    ofileselector/olister.h \
    ofileselector/olocallister.h \
    ofileselector/ofileselectormain.h \
    pim/opimrecord.h \
    pim/otodo.h \
    pim/orecordlist.h \
    pim/opimaccesstemplate.h \
    pim/opimaccessbackend.h \
    pim/otodoaccess.h \
    pim/otodacessbackend.h \
    pim/ocontact.h \
    pim/ocontactaccess.h \
    pim/ocontactaccessbackend.h \
    pim/ocontactaccessbackend_xml.h \
    pim/orecord.h
    
 SOURCES   = ofontmenu.cc  \
            xmltree.cc \
            tododb.cpp todoevent.cpp \
            todovcalresource.cpp  colordialog.cpp \
            colorpopupmenu.cpp oclickablelabel.cpp \
            oprocctrl.cpp oprocess.cpp \
            odevice.cpp otimepicker.cpp \
             otabwidget.cpp otabbar.cpp \
             ofileselector/ofiledialog.cpp \
             ofileselector/ofilelistview.cpp \
             ofileselector/ofileselector.cpp \
             ofileselector/ofileselectoritem.cpp \
             ofileselector/ofileview.cpp \
             ofileselector/olister.cpp \
             ofileselector/olocallister.cpp \
             ofileselector/ofileselectormain.cpp \
             pim/otodo.cpp \
             pim/opimrecord.cpp \
             pim/otodoaccess.cpp \
             pim/otodoaccessbackend.cpp \
             pim/ocontact.cpp \
             pim/ocontactaccess.cpp \
             pim/orecord.cpp
 TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(QTDIR)/lib$(PROJMAK)
 #VERSION = 1.0.0
 INTERFACES      = otimepickerbase.ui
 TRANSLATIONS = ../i18n/de/libopie.ts \
         ../i18n/xx/libopie.ts \
   ../i18n/en/libopie.ts \
   ../i18n/es/libopie.ts \
   ../i18n/fr/libopie.ts \
   ../i18n/hu/libopie.ts \
   ../i18n/ja/libopie.ts \
   ../i18n/ko/libopie.ts \
   ../i18n/no/libopie.ts \
   ../i18n/pl/libopie.ts \
   ../i18n/pt/libopie.ts \
   ../i18n/pt_BR/libopie.ts \
   ../i18n/sl/libopie.ts \
   ../i18n/zh_CN/libopie.ts \
   ../i18n/zh_TW/libopie.ts \
   ../i18n/da/libopie.ts
+include ( ../../include.pro )
diff --git a/library/library.pro b/library/library.pro
index 8d0fbe0..a04d3f0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -52,96 +52,99 @@ HEADERS	=   calendar.h \
            categorywidget.h \
        ir.h \
        backend/vobject_p.h \
        findwidget_p.h \
        finddialog.h \
        lnkproperties.h \
        windowdecorationinterface.h \
        textcodecinterface.h \
        imagecodecinterface.h \
        qt_override_p.h
        
        SOURCES=   calendar.cpp \
            global.cpp \
            xmlreader.cpp \
            mimetype.cpp \
            menubutton.cpp \
            network.cpp \
            networkinterface.cpp \
            filemanager.cpp \
            fontmanager.cpp \
            qdawg.cpp \
            datebookmonth.cpp \
            fileselector.cpp \
            imageedit.cpp \
            resource.cpp \
            qpedecoration_qws.cpp \
            qcopenvelope_qws.cpp \
            qpeapplication.cpp \
            qpestyle.cpp \
            qpedialog.cpp \
            lightstyle.cpp \
            config.cpp \
            applnk.cpp \
            sound.cpp \
            tzselect.cpp \
            qmath.c \
            datebookdb.cpp \
            alarmserver.cpp \
            password.cpp \
            process.cpp \
            process_unix.cpp \
            timestring.cpp \
            fontdatabase.cpp \
            power.cpp \
            storage.cpp \
            qpemessagebox.cpp \
            backend/timeconversion.cpp \
            qpedebug.cpp \
            qpemenubar.cpp \
            qpetoolbar.cpp \
            backend/categories.cpp \
            backend/stringutil.cpp \
            backend/palmtoprecord.cpp \
            backend/task.cpp \
            backend/event.cpp \
            backend/contact.cpp \
            categorymenu.cpp \
        categoryedit_p.cpp \
        categoryselect.cpp \
        categorywidget.cpp \
        ir.cpp \
        backend/vcc_yacc.cpp \
        backend/vobject.cpp \
        findwidget_p.cpp \
        finddialog.cpp \
        lnkproperties.cpp \
        qt_override.cpp
 # Qt 3 compatibility
 HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
 SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
 INCLUDEPATH += $(OPIEDIR)/include backend
        LIBS    += -ldl -lcrypt -lm
 INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
        TARGET  = qpe
        DESTDIR         = $(QTDIR)/lib$(PROJMAK)
 # This is set by configure$(OPIEDIR).
        VERSION         = 1.5.0.1
 TRANSLATIONS = ../i18n/de/libqpe.ts \
         ../i18n/xx/libqpe.ts \
         ../i18n/en/libqpe.ts \
         ../i18n/es/libqpe.ts \
         ../i18n/fr/libqpe.ts \
         ../i18n/hu/libqpe.ts \
         ../i18n/ja/libqpe.ts \
         ../i18n/ko/libqpe.ts \
         ../i18n/no/libqpe.ts \
         ../i18n/pl/libqpe.ts \
         ../i18n/pt/libqpe.ts \
         ../i18n/pt_BR/libqpe.ts \
         ../i18n/sl/libqpe.ts \
         ../i18n/zh_CN/libqpe.ts \
         ../i18n/it/libqpe.ts \
         ../i18n/zh_TW/libqpe.ts \
         ../i18n/da/libqpe.ts
+include ( ../include.pro )
diff --git a/libsql/libopiesql.pro b/libsql/libopiesql.pro
index cc20ace..a31190e 100644
--- a/libsql/libopiesql.pro
+++ b/libsql/libopiesql.pro
@@ -1,27 +1,31 @@
 TEMPLATE        = lib
 CONFIG          += qte warn_on release
        HEADERS = osqlbackend.h \
                  osqldriver.h \
                  osqlerror.h \
                  osqlmanager.h \
                  osqlquery.h \
                  osqlresult.h \
                  osqltable.h \
                  osqlbackendmanager.h \
                  osqlitedriver.h
        SOURCES         = osqlbackend.cpp \
                  osqldriver.cpp \
                  osqlerror.cpp \
                  osqlmanager.cpp \
                  osqlquery.cpp \
                  osqlresult.cpp \
                  osqltable.cpp \
                  osqlbackendmanager.cpp \
                  osqlitedriver.cpp
        TARGET  = opiesql
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR         = $(QTDIR)/lib$(PROJMAK)
 LIBS += -lsqlite
 #VERSION = 1.0.0
+include ( ../include.pro )
diff --git a/libsql/test/spaltenweise.pro b/libsql/test/spaltenweise.pro
index 5b881c0..af68407 100644
--- a/libsql/test/spaltenweise.pro
+++ b/libsql/test/spaltenweise.pro
@@ -1,9 +1,13 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = 
        SOURCES         = spaltenweise.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiesql
        TARGET  = spaltenweise
+include ( ../../include.pro )
diff --git a/libsql/test/test.pro b/libsql/test/test.pro
index 188c367..d756189 100644
--- a/libsql/test/test.pro
+++ b/libsql/test/test.pro
@@ -1,9 +1,13 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = 
        SOURCES         = main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiesql
        TARGET  = sqltest
+include ( ../../include.pro )
diff --git a/libsql/test/zeilenweise.pro b/libsql/test/zeilenweise.pro
index 516b7c0..3e69897 100644
--- a/libsql/test/zeilenweise.pro
+++ b/libsql/test/zeilenweise.pro
@@ -1,9 +1,13 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = 
        SOURCES         = zeilenweise.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiesql
        TARGET  = zeilenweise
+include ( ../../include.pro )
diff --git a/noncore/applets/notesapplet/notesapplet.pro b/noncore/applets/notesapplet/notesapplet.pro
index 4454e97..6b3d9b2 100644
--- a/noncore/applets/notesapplet/notesapplet.pro
+++ b/noncore/applets/notesapplet/notesapplet.pro
@@ -1,12 +1,16 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   notes.h notesappletimpl.h
 SOURCES =   notes.cpp notesappletimpl.cpp
 TARGET    = notesapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
+include ( ../../../include.pro )
diff --git a/noncore/applets/wirelessapplet/wirelessapplet.pro b/noncore/applets/wirelessapplet/wirelessapplet.pro
index aa673d7..b8c9ef8 100644
--- a/noncore/applets/wirelessapplet/wirelessapplet.pro
+++ b/noncore/applets/wirelessapplet/wirelessapplet.pro
@@ -1,28 +1,32 @@
 TEMPLATE     = lib
 CONFIG      += qt warn_on release
 HEADERS      = wireless.h wirelessappletimpl.h networkinfo.h mgraph.h advancedconfig.h
 SOURCES      = wireless.cpp wirelessappletimpl.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp
 INTERFACES   = advancedconfigbase.ui
 TARGET       = wirelessapplet
 DESTDIR      = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += ../$(OPIEDIR)/include
 LIBS        += -lqpe
 VERSION      = 0.1.0
 TRANSLATIONS = ../../../i18n/de/libwirelessapplet.ts \
         ../../../i18n/da/libwirelessapplet.ts \
         ../../../i18n/xx/libwirelessapplet.ts \
         ../../../i18n/en/libwirelessapplet.ts \
         ../../../i18n/es/libwirelessapplet.ts \
         ../../../i18n/fr/libwirelessapplet.ts \
         ../../../i18n/hu/libwirelessapplet.ts \
         ../../../i18n/ja/libwirelessapplet.ts \
         ../../../i18n/ko/libwirelessapplet.ts \
         ../../../i18n/no/libwirelessapplet.ts \
         ../../../i18n/pl/libwirelessapplet.ts \
         ../../../i18n/pt/libwirelessapplet.ts \
         ../../../i18n/pt_BR/libwirelessapplet.ts \
         ../../../i18n/sl/libwirelessapplet.ts \
         ../../../i18n/zh_CN/libwirelessapplet.ts \
         ../../../i18n/zh_TW/libwirelessapplet.ts
+include ( ../../../include.pro )
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index 960ab62..233fbee 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -1,26 +1,30 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = advancedfm.h filePermissions.h output.h
 SOURCES   = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp
 TARGET    = advancedfm
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 DESTDIR = $(OPIEDIR)/bin
 LIBS            += -lqpe -lopie
 TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
         ../../../i18n/da/advancedfm.ts \
         ../../../i18n/xx/advancedfm.ts \
   ../../../i18n/en/advancedfm.ts \
   ../../../i18n/es/advancedfm.ts \
   ../../../i18n/fr/advancedfm.ts \
   ../../../i18n/hu/advancedfm.ts \
   ../../../i18n/ja/advancedfm.ts \
   ../../../i18n/ko/advancedfm.ts \
   ../../../i18n/no/advancedfm.ts \
   ../../../i18n/pl/advancedfm.ts \
   ../../../i18n/pt/advancedfm.ts \
   ../../../i18n/pt_BR/advancedfm.ts \
   ../../../i18n/sl/advancedfm.ts \
   ../../../i18n/zh_CN/advancedfm.ts \
   ../../../i18n/zh_TW/advancedfm.ts
+include ( ../../../include.pro )
diff --git a/noncore/apps/checkbook/checkbook.pro b/noncore/apps/checkbook/checkbook.pro
index f97cb75..8ac63e3 100644
--- a/noncore/apps/checkbook/checkbook.pro
+++ b/noncore/apps/checkbook/checkbook.pro
@@ -1,44 +1,48 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 HEADERS   = mainwindow.h \
      cbinfo.h        \
      traninfo.h      \
      graphinfo.h     \
      configuration.h \
      password.h      \
      checkbook.h     \
      transaction.h   \
      graph.h
 SOURCES   = main.cpp    \
      mainwindow.cpp    \
      cbinfo.cpp        \
      traninfo.cpp      \
      graphinfo.cpp     \
      configuration.cpp \
      password.cpp      \
      checkbook.cpp     \
      transaction.cpp   \ 
      graph.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS    += -lqpe -lopie
 TARGET    = checkbook
 DESTDIR   = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/checkbook.ts \
         ../../../i18n/da/checkbook.ts \
         ../../../i18n/xx/checkbook.ts \
   ../../../i18n/en/checkbook.ts    \
   ../../../i18n/es/checkbook.ts    \
   ../../../i18n/fr/checkbook.ts    \
   ../../../i18n/hu/checkbook.ts    \
   ../../../i18n/ja/checkbook.ts    \
   ../../../i18n/ko/checkbook.ts    \
   ../../../i18n/no/checkbook.ts    \
   ../../../i18n/pl/checkbook.ts    \
   ../../../i18n/pt/checkbook.ts    \
   ../../../i18n/pt_BR/checkbook.ts \
   ../../../i18n/sl/checkbook.ts    \
   ../../../i18n/zh_CN/checkbook.ts \
   ../../../i18n/zh_TW/checkbook.ts \
   ../../../i18n/it/checkbook.ts
+include ( ../../../include.pro )
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index 2a17a46..05691b4 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -1,28 +1,32 @@
        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        #CONFIG         = qt warn_on release
        CONFIG  = qt warn_on debug
        HEADERS         = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
        SOURCES         = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/ioclude
 LIBS            += -lqpe
        INTERFACES= 
        TARGET  = confedit
 TRANSLATIONS = ../../../i18n/de/confedit.ts \
         ../../../i18n/da/confedit.ts \
         ../../../i18n/xx/confedit.ts \
         ../../../i18n/en/confedit.ts \
         ../../../i18n/es/confedit.ts \
         ../../../i18n/fr/confedit.ts \
         ../../../i18n/hu/confedit.ts \
         ../../../i18n/ja/confedit.ts \
         ../../../i18n/ko/confedit.ts \
         ../../../i18n/no/confedit.ts \
         ../../../i18n/pl/confedit.ts \
         ../../../i18n/pt/confedit.ts \
         ../../../i18n/pt_BR/confedit.ts \
         ../../../i18n/sl/confedit.ts \
         ../../../i18n/zh_CN/confedit.ts \
         ../../../i18n/zh_TW/confedit.ts
+include ( ../../../include.pro )
diff --git a/noncore/apps/odict/odict.pro b/noncore/apps/odict/odict.pro
index 23ef0e0..51f7ca0 100644
--- a/noncore/apps/odict/odict.pro
+++ b/noncore/apps/odict/odict.pro
@@ -1,38 +1,42 @@
        TEMPLATE= app
        CONFIG  = qt warn_on debug
        #CONFIG         = qt warn_on release
        HEADERS         = odict.h \
                                searchmethoddlg.h \
                                configdlg.h \
                                dingwidget.h \
                                dictwidget.h
        SOURCES         = main.cpp \
                  odict.cpp \
                  searchmethoddlg.cpp \
                  configdlg.cpp \
                  dictwidget.cpp \
                  dingwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
        LIBS    += -lqpe -lstdc++ -lopie
        TARGET          = odict
        DESTDIR         = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/odict.ts \
         ../../../i18n/xx/odict.ts \
         ../../../i18n/en/odict.ts \
         ../../../i18n/es/odict.ts \
         ../../../i18n/fr/odict.ts \
         ../../../i18n/hu/odict.ts \
         ../../../i18n/ja/odict.ts \
         ../../../i18n/ko/odict.ts \
         ../../../i18n/no/odict.ts \
         ../../../i18n/pl/odict.ts \
         ../../../i18n/pt/odict.ts \
         ../../../i18n/pt_BR/odict.ts \
         ../../../i18n/sl/odict.ts \
         ../../../i18n/zh_CN/odict.ts \
         ../../../i18n/zh_TW/odict.ts \
            ../../../i18n/it/odict.ts \
            ../../../i18n/da/odict.ts
+include ( ../../../include.pro )
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index c6f3f4d..1bb9f35 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -1,73 +1,77 @@
 TEMPLATE     = app
        TMAKE_CXXFLAGS=-DHAVE_OPENPTY
 CONFIG       = qt warn_on release
        #CONFIG      = qt debug
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
               file_layer.h filetransfer.h \
               metafactory.h \
               session.h \
               mainwindow.h \
               profile.h \
               profileconfig.h \
               profilemanager.h  \
               configwidget.h \
               tabwidget.h \
               configdialog.h \
               keytrans.h \
               transferdialog.h \
               profiledialogwidget.h \
               profileeditordialog.h \
               default.h \
               iolayerbase.h \
               serialconfigwidget.h irdaconfigwidget.h \
               btconfigwidget.h modemconfigwidget.h \
               atconfigdialog.h dialdialog.h \  
               procctl.h \
               function_keyboard.h  \
               receive_layer.h filereceive.h \
               script.h \
               dialer.h \
               terminalwidget.h \
               emulation_handler.h TECommon.h \
               TEHistroy.h TEScreen.h TEWidget.h \
               TEmuVt102.h TEmulation.h MyPty.h \
           consoleconfigwidget.h
 SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
               file_layer.cpp filetransfer.cpp \
               main.cpp \
               metafactory.cpp \
               session.cpp \
               mainwindow.cpp \
               profile.cpp \
               profileconfig.cpp \
               profilemanager.cpp  \
               tabwidget.cpp \
               configdialog.cpp \
               keytrans.cpp \
               transferdialog.cpp \
               profiledialogwidget.cpp \
               profileeditordialog.cpp \
               iolayerbase.cpp \
               serialconfigwidget.cpp irdaconfigwidget.cpp \
               btconfigwidget.cpp modemconfigwidget.cpp \ 
               atconfigdialog.cpp dialdialog.cpp \
               default.cpp  procctl.cpp \
               function_keyboard.cpp  \
               receive_layer.cpp filereceive.cpp \
               script.cpp \
                   dialer.cpp \
               terminalwidget.cpp \
                emulation_handler.cpp TEHistory.cpp \
                TEScreen.cpp TEWidget.cpp \
                TEmuVt102.cpp TEmulation.cpp MyPty.cpp \
        consoleconfigwidget.cpp
                
 INTERFACES   = configurebase.ui editbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie 
 TARGET       = opie-console
+include ( ../../../include.pro )
diff --git a/noncore/apps/opie-console/test/console.pro b/noncore/apps/opie-console/test/console.pro
index 6de2cd0..ec3efbf 100644
--- a/noncore/apps/opie-console/test/console.pro
+++ b/noncore/apps/opie-console/test/console.pro
@@ -1,17 +1,21 @@
 TEMPLATE     = app
 #CONFIG       = qt warn_on release
        CONFIG      = qt debug
 #DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = ../io_layer.h ../io_serial.h ../sz_transfer.h ../file_layer.h\
            senderui.h ../profile.h ../filetransfer.h ../procctl.h \
            ../filereceive.h ../receive_layer.h
 SOURCES      = ../io_layer.cpp ../io_serial.cpp \
               ../profile.cpp ../sz_transfer.cpp ../file_layer.cpp\
               main.cpp senderui.cpp   ../filetransfer.cpp ../procctl.cpp \
               ../filereceive.cpp ../receive_layer.cpp 
 INTERFACES   = sender.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
 TARGET       = test
+include ( ../../../../include.pro )
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index 139c03a..aae9a01 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -1,73 +1,77 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = Aportis.h \
                  Bkmks.h \
                  BuffDoc.h \
                  CAnnoEdit.h \
                  CBuffer.h \
                  CDrawBuffer.h \
                  CEncoding.h \
                  CExpander.h \
                  CFilter.h \
                  Filedata.h \
                  FontControl.h \
                  GraphicWin.h \
                  Markups.h \
                  Navigation.h \
                  Palm2QImage.h \
                  QFloatBar.h \
                  QTReader.h \
                  QTReaderApp.h \
                  QtrListView.h \
                  Queue.h \
                  StateData.h \
                  StyleConsts.h \
                  ZText.h \
                  arith.h \
                  cbkmkselector.h \
                  config.h \
                  fileBrowser.h \
                  infowin.h \
                  my_list.h \
                  name.h \
                  opie.h \
                  pdb.h \
                  plucker.h \
                  ppm.h \
                  ppm_expander.h \
                  ustring.h \
                  utypes.h \
                  version.h \
                  ztxt.h
        SOURCES         = Aportis.cpp \
                  Bkmks.cpp \
                  BuffDoc.cpp \
                  CBuffer.cpp \
                  CDrawBuffer.cpp \
                  CEncoding.cpp \
                  CFilter.cpp \
                  FontControl.cpp \
                  Navigation.cpp \
                  Palm2QImage.cpp \
                  QTReader.cpp \
                  QTReaderApp.cpp \
                  QtrListView.cpp \
                  StyleConsts.cpp \
                  arith_d.cpp \
                  fileBrowser.cpp \
                  infowin.cpp \
                  main.cpp \
                  pdb.cpp \
                  plucker.cpp \
                  ppm.cpp \
                  ppm_expander.cpp \
                  ztxt.cpp
        INTERFACES= 
        DESTDIR         =  $(OPIEDIR)/bin
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        TARGET  =  reader
        LIBS    += -lqpe
+include ( ../../../include.pro )
diff --git a/noncore/apps/opie-sheet/opie-sheet.pro b/noncore/apps/opie-sheet/opie-sheet.pro
index bb8e29f..7256c0c 100644
--- a/noncore/apps/opie-sheet/opie-sheet.pro
+++ b/noncore/apps/opie-sheet/opie-sheet.pro
@@ -1,27 +1,31 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = mainwindow.h sheet.h cellformat.h finddlg.h numberdlg.h sortdlg.h textdlg.h
        SOURCES         = main.cpp mainwindow.cpp sheet.cpp cellformat.cpp finddlg.cpp numberdlg.cpp sortdlg.cpp textdlg.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = sheetqt
 TRANSLATIONS = ../../../i18n/de/opie-sheet.ts \
         ../../../i18n/da/opie-sheet.ts \
         ../../../i18n/xx/opie-sheet.ts \
         ../../../i18n/en/opie-sheet.ts \
         ../../../i18n/es/opie-sheet.ts \
         ../../../i18n/fr/opie-sheet.ts \
         ../../../i18n/hu/opie-sheet.ts \
         ../../../i18n/ja/opie-sheet.ts \
         ../../../i18n/ko/opie-sheet.ts \
         ../../../i18n/no/opie-sheet.ts \
         ../../../i18n/pl/opie-sheet.ts \
         ../../../i18n/pt/opie-sheet.ts \
         ../../../i18n/pt_BR/opie-sheet.ts \
         ../../../i18n/sl/opie-sheet.ts \
         ../../../i18n/zh_CN/opie-sheet.ts \
         ../../../i18n/zh_TW/opie-sheet.ts \
            ../../../i18n/it/opie-sheet.ts
+include ( ../../../include.pro )
diff --git a/noncore/apps/opie-write/opie-write.pro b/noncore/apps/opie-write/opie-write.pro
index e2ce3a9..6a9d96d 100644
--- a/noncore/apps/opie-write/opie-write.pro
+++ b/noncore/apps/opie-write/opie-write.pro
@@ -1,25 +1,29 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         =qcleanuphandler.h \
                qcomplextext_p.h \
                qrichtext_p.h \
                qstylesheet.h \
                qtextedit.h \
                mainwindow.h
        SOURCES         =qcomplextext.cpp \
                qstylesheet.cpp \
                qrichtext_p.cpp \
                qrichtext.cpp \
                qtextedit.cpp \
                main.cpp \
                mainwindow.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = opie-write
+include ( ../../../include.pro )
diff --git a/noncore/apps/oxygen/oxygen.pro b/noncore/apps/oxygen/oxygen.pro
index 5381e10..84ae7c5 100644
--- a/noncore/apps/oxygen/oxygen.pro
+++ b/noncore/apps/oxygen/oxygen.pro
@@ -1,44 +1,48 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = oxygen.h \
            kmolcalc.h \
            kmolelements.h \
            calcdlgui.h \
            dataTable.h \
            psewidget.h \
            oxyframe.h \
            datawidgetui.h
        SOURCES         = main.cpp \
                  oxygen.cpp \
          kmolcalc.cpp \
          calcdlgui.cpp \
          kmolelements.cpp \
          dataTable.cpp \
          psewidget.cpp \
          oxyframe.cpp \
          datawidgetui.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
        LIBS    += -lqpe -lstdc++
        INTERFACES= calcdlg.ui 
        TARGET          = oxygen
        DESTDIR         = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/oxygen.ts \
         ../../../i18n/xx/oxygen.ts \
         ../../../i18n/en/oxygen.ts \
         ../../../i18n/es/oxygen.ts \
         ../../../i18n/fr/oxygen.ts \
         ../../../i18n/hu/oxygen.ts \
         ../../../i18n/ja/oxygen.ts \
         ../../../i18n/ko/oxygen.ts \
         ../../../i18n/no/oxygen.ts \
         ../../../i18n/pl/oxygen.ts \
         ../../../i18n/pt/oxygen.ts \
         ../../../i18n/pt_BR/oxygen.ts \
         ../../../i18n/sl/oxygen.ts \
         ../../../i18n/zh_CN/oxygen.ts \
         ../../../i18n/zh_TW/oxygen.ts \
            ../../../i18n/it/oxygen.ts \
            ../../../i18n/da/oxygen.ts
+include ( ../../../include.pro )
diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro
index 18fa7b3..91222d2 100644
--- a/noncore/apps/tableviewer/tableviewer.pro
+++ b/noncore/apps/tableviewer/tableviewer.pro
@@ -1,53 +1,57 @@
        TEMPLATE= app
        CONFIG  = qt warn_on debug
        DESTDIR         = $(OPIEDIR)/bin
        SUBDIRS         = db ui
        HEADERS         = tableviewer.h \
                  ui/commonwidgets.h \
                  ui/tvbrowseview.h \
                  ui/tvlistview.h \
                  ui/tvfilterview.h \
                  ui/tveditview.h \
                  ui/browsekeyentry.h \
                  ui/filterkeyentry.h \
                  ui/tvkeyedit.h \
                  db/datacache.h \
                  db/common.h \
                  db/xmlsource.h \
                  db/csvsource.h
        SOURCES         = main.cpp \
                  tableviewer.cpp \
                  ui/commonwidgets.cpp \
                  ui/tvbrowseview.cpp \
                  ui/tvfilterview.cpp \
                  ui/browsekeyentry.cpp \
                  ui/filterkeyentry.cpp \
                  ui/tvlistview.cpp \
                  ui/tveditview.cpp \
                  ui/tvkeyedit.cpp \
                  db/datacache.cpp \
                  db/xmlsource.cpp \
                  db/csvsource.cpp \
                  db/common.cpp
        INTERFACES= ui/tvkeyedit_gen.ui
        TARGET  = tableviewer
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH     += $(OPIEDIR)/include
        LIBS       += -lqpe
 TRANSLATIONS = ../../../i18n/de/tableviewer.ts \
         ../../../i18n/da/tableviewer.ts \
         ../../../i18n/xx/tableviewer.ts \
         ../../../i18n/en/tableviewer.ts \
         ../../../i18n/es/tableviewer.ts \
         ../../../i18n/fr/tableviewer.ts \
         ../../../i18n/hu/tableviewer.ts \
         ../../../i18n/ja/tableviewer.ts \
         ../../../i18n/ko/tableviewer.ts \
         ../../../i18n/no/tableviewer.ts \
         ../../../i18n/pl/tableviewer.ts \
         ../../../i18n/pt/tableviewer.ts \
         ../../../i18n/pt_BR/tableviewer.ts \
         ../../../i18n/sl/tableviewer.ts \
         ../../../i18n/zh_CN/tableviewer.ts \
         ../../../i18n/zh_TW/tableviewer.ts
+include ( ../../../include.pro )
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro
index a504abf..fdae834 100644
--- a/noncore/apps/tinykate/libkate/libkate.pro
+++ b/noncore/apps/tinykate/libkate/libkate.pro
@@ -1,90 +1,94 @@
        TEMPLATE= lib
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = microkde/kapplication.h \
                  microkde/kconfig.h \
                  microkde/kdebug.h \
                  microkde/kdialog.h \
                  microkde/kdialogbase.h \
                  microkde/kfiledialog.h \
                  microkde/kglobal.h \
                  microkde/kiconloader.h \
                  microkde/klineedit.h \
                  microkde/klocale.h \
                  microkde/kmessagebox.h \
                  microkde/kprinter.h \
                  microkde/krestrictedline.h \
                  microkde/kseparator.h \
                  microkde/ksimpleconfig.h \
                  microkde/kstandarddirs.h \
                  microkde/ktempfile.h \
                  microkde/kunload.h \
                  microkde/kurlrequester.h \
                  microkde/kfontdialog.h \
                  microkde/krun.h \
                  microkde/knumvalidator.h \
                  microkde/kstaticdeleter.h \
                  microkde/klistview.h \
                  microkde/kglobalsettings.h \
                  microkde/kcolorbtn.h \
                  \
                  \
                  qt3back/qregexp3.h \
                  kde/ksharedptr.h \
                  document/katebuffer.h  document/katedialogs.h \
                  document/katetextline.h \
                  document/katecmd.h \
                  document/katehighlight.h \
                  document/katecmds.h    document/katedocument.h  \
                  document/katesyntaxdocument.h \
                  view/kateundohistory.h  \
                  view/kateview.h  \
                  view/kateviewdialog.h \
                  interfaces/view.h \
                  interfaces/document.h \
                  ktexteditor/ktexteditor.h
        SOURCES         = microkde/kapplication.cpp \
                  microkde/kdialogbase.cpp \
                  microkde/kconfig.cpp \
                  microkde/klocale.cpp \
                  microkde/kmessagebox.cpp \
                  microkde/kprocess.cpp \
                  microkde/kstandarddirs.cpp \
                  microkde/ktempfile.cpp \
                  microkde/kurlrequester.cpp \
                  microkde/kcolordialog.cpp \
                  microkde/kfontdialog.cpp \
                  microkde/krun.cpp \
                  microkde/knumvalidator.cpp \
                  microkde/kglobal.cpp \
                  microkde/kglobalsettings.cpp \
                  microkde/kcolorbtn.cpp \
                  \
                  \
                  qt3back/qregexp3.cpp \
                  ktexteditor/ktexteditor.cpp \
                  document/katebuffer.cpp  document/katedialogs.cpp \
                  document/katehighlight.cpp  \
                  document/katecmd.cpp   \
                  document/katesyntaxdocument.cpp document/katecmds.cpp \
                  document/katedocument.cpp    document/katetextline.cpp \
                  view/kateundohistory.cpp \
                  view/kateview.cpp \
                  view/kateviewdialog.cpp \
                  interfaces/interfaces.cpp
        INTERFACES= 
        INCLUDEPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
        TARGET  = tinykate
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(QTDIR)/lib$(PROJMAK)
+include ( ../../../../include.pro )
diff --git a/noncore/apps/tinykate/tinykate.pro b/noncore/apps/tinykate/tinykate.pro
index 2079041..11b4e5d 100644
--- a/noncore/apps/tinykate/tinykate.pro
+++ b/noncore/apps/tinykate/tinykate.pro
@@ -1,16 +1,20 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = tinykate.h
        SOURCES         = tinykate.cpp main.cpp
        INTERFACES= 
        INCLUDEPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -ltinykate -lopie
        TARGET  = tinykate
+include ( ../../../include.pro )
diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index 2c4ddbb..83171ba 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -1,51 +1,55 @@
 TEMPLATE        = app
 CONFIG          += qt warn_on release
 DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = d3des.h \
                  krfbbuffer.h \
                  krfbcanvas.h \
                  krfbconnection.h \
                  krfbdecoder.h \
                  krfblogin.h \
                  krfbserver.h \
                  krfbserverinfo.h \
                  kvnc.h \
                  kvncconndlg.h \
                  kvncbookmarkdlg.h \
                  version.h \
                  vncauth.h
        SOURCES         = d3des.c \
                  vncauth.c \
                  krfbbuffer.cpp \
                  krfbcanvas.cpp \
                  krfbconnection.cpp \
                  krfbdecoder.cpp \
                  krfblogin.cpp \
                  krfbserver.cpp \
                  kvnc.cpp \
                  kvncconndlg.cpp \
                  kvncbookmarkdlg.cpp \
                  main.cpp
        INTERFACES= kvncconndlgbase.ui \
                                                kvncbookmarkdlgbase.ui
 TARGET          = keypebble
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/keypebble.ts \
         ../../../i18n/da/keypebble.ts \
         ../../../i18n/xx/keypebble.ts \
         ../../../i18n/en/keypebble.ts \
         ../../../i18n/es/keypebble.ts \
         ../../../i18n/fr/keypebble.ts \
         ../../../i18n/hu/keypebble.ts \
         ../../../i18n/ja/keypebble.ts \
         ../../../i18n/ko/keypebble.ts \
         ../../../i18n/no/keypebble.ts \
         ../../../i18n/pl/keypebble.ts \
         ../../../i18n/pt/keypebble.ts \
         ../../../i18n/pt_BR/keypebble.ts \
         ../../../i18n/sl/keypebble.ts \
         ../../../i18n/zh_CN/keypebble.ts \
         ../../../i18n/zh_TW/keypebble.ts
+include ( ../../../include.pro )
diff --git a/noncore/comm/mobilemsg/mobilemsg.pro b/noncore/comm/mobilemsg/mobilemsg.pro
index 8c7a960..62fe70c 100644
--- a/noncore/comm/mobilemsg/mobilemsg.pro
+++ b/noncore/comm/mobilemsg/mobilemsg.pro
@@ -1,28 +1,32 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = mobilemsg.h
        SOURCES         = main.cpp mobilemsg.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = mobilemsg
        DESTDIR         = $(OPIEDIR)/bin
        INTERFACES= mobilemsgbase.ui
 TRANSLATIONS = ../../../i18n/de/mobilemsg.ts \
         ../../../i18n/da/mobilemsg.ts \
         ../../../i18n/xx/mobilemsg.ts \
         ../../../i18n/en/mobilemsg.ts \
         ../../../i18n/es/mobilemsg.ts \
         ../../../i18n/fr/mobilemsg.ts \
         ../../../i18n/hu/mobilemsg.ts \
         ../../../i18n/ja/mobilemsg.ts \
         ../../../i18n/ko/mobilemsg.ts \
         ../../../i18n/no/mobilemsg.ts \
         ../../../i18n/pl/mobilemsg.ts \
         ../../../i18n/pt/mobilemsg.ts \
         ../../../i18n/pt_BR/mobilemsg.ts \
         ../../../i18n/sl/mobilemsg.ts \
         ../../../i18n/zh_CN/mobilemsg.ts \
         ../../../i18n/zh_TW/mobilemsg.ts
+include ( ../../../include.pro )
diff --git a/noncore/decorations/flat/flat.pro b/noncore/decorations/flat/flat.pro
index 32bdb59..96b4b78 100644
--- a/noncore/decorations/flat/flat.pro
+++ b/noncore/decorations/flat/flat.pro
@@ -1,11 +1,15 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS         = flat.h
        SOURCES         = flat.cpp
        TARGET  = flat
        DESTDIR         = $(OPIEDIR)/plugins/decorations
        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
+include ( ../../../include.pro )
diff --git a/noncore/decorations/liquid/liquid.pro b/noncore/decorations/liquid/liquid.pro
index 25b4fd3..d614a64 100644
--- a/noncore/decorations/liquid/liquid.pro
+++ b/noncore/decorations/liquid/liquid.pro
@@ -1,10 +1,14 @@
 TEMPLATE    =  lib
 CONFIG       = qt embedded release warn_on
 SOURCES     =  liquid.cpp               
 HEADERS     =  liquid.h               
 LIBS        += -lqpe 
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/plugins/decorations
 TARGET       = liquid
 VERSION      = 1.0.0
+include ( ../../../include.pro )
diff --git a/noncore/decorations/polished/polished.pro b/noncore/decorations/polished/polished.pro
index 43113ef..e9ee73a 100644
--- a/noncore/decorations/polished/polished.pro
+++ b/noncore/decorations/polished/polished.pro
@@ -1,11 +1,15 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS         = polished.h
        SOURCES         = polished.cpp
        TARGET  = polished
        DESTDIR         = $(OPIEDIR)/plugins/decorations
        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
+include ( ../../../include.pro )
diff --git a/noncore/games/bounce/bounce.pro b/noncore/games/bounce/bounce.pro
index 42203df..bb3e4df 100644
--- a/noncore/games/bounce/bounce.pro
+++ b/noncore/games/bounce/bounce.pro
@@ -1,28 +1,32 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = game.h kbounce.h 
        SOURCES         = game.cpp kbounce.cpp main.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS        += -lqpe
 DESTDIR     = $(OPIEDIR)/bin
        TARGET  = bounce 
 TRANSLATIONS = ../../../i18n/de/bounce.ts \
         ../../../i18n/da/bounce.ts \
         ../../../i18n/xx/bounce.ts \
         ../../../i18n/en/bounce.ts \
         ../../../i18n/es/bounce.ts \
         ../../../i18n/fr/bounce.ts \
         ../../../i18n/hu/bounce.ts \
         ../../../i18n/ja/bounce.ts \
         ../../../i18n/ko/bounce.ts \
         ../../../i18n/no/bounce.ts \
         ../../../i18n/pl/bounce.ts \
         ../../../i18n/pt/bounce.ts \
         ../../../i18n/pt_BR/bounce.ts \
         ../../../i18n/sl/bounce.ts \
         ../../../i18n/zh_CN/bounce.ts \
         ../../../i18n/zh_TW/bounce.ts \
            ../../../i18n/it/bounce.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/buzzword/buzzword.pro b/noncore/games/buzzword/buzzword.pro
index e1d1fcf..61c7085 100644
--- a/noncore/games/buzzword/buzzword.pro
+++ b/noncore/games/buzzword/buzzword.pro
@@ -1,27 +1,31 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = buzzword.h 
        SOURCES         = buzzword.cpp main.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 DESTDIR     = $(OPIEDIR)/bin
 LIBS        += -lqpe
        TARGET  = buzzword 
 TRANSLATIONS = ../../../i18n/de/buzzword.ts \
         ../../../i18n/da/buzzword.ts \
         ../../../i18n/xx/buzzword.ts \
         ../../../i18n/en/buzzword.ts \
         ../../../i18n/es/buzzword.ts \
         ../../../i18n/fr/buzzword.ts \
         ../../../i18n/hu/buzzword.ts \
         ../../../i18n/ja/buzzword.ts \
         ../../../i18n/ko/buzzword.ts \
         ../../../i18n/no/buzzword.ts \
         ../../../i18n/pl/buzzword.ts \
         ../../../i18n/pt/buzzword.ts \
         ../../../i18n/pt_BR/buzzword.ts \
         ../../../i18n/sl/buzzword.ts \
         ../../../i18n/zh_CN/buzzword.ts \
         ../../../i18n/zh_TW/buzzword.ts \
            ../../../i18n/it/buzzword.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/chess/chess.pro b/noncore/games/chess/chess.pro
index a8e9438..a96eb66 100644
--- a/noncore/games/chess/chess.pro
+++ b/noncore/games/chess/chess.pro
@@ -1,31 +1,35 @@
        SOURCES+= chess.cpp main.cpp 
        HEADERS+= chess.h 
 DESTDIR = $(OPIEDIR)/bin
 TARGET = chess
        DEPENDPATH+= $(OPIEDIR)/include
 INTERFACES = mainwindow.ui 
        IMAGES= images/new.png images/repeat.png images/txt.png images/back.png 
        TEMPLATE=app
        CONFIG+= qt warn_on release
 INCLUDEPATH += $(OPIEDIR)/include
        LIBS+= -lqpe
        DBFILE= chess.db
        LANGUAGE= C++
        CPP_ALWAYS_CREATE_SOURCE= TRUE
 TRANSLATIONS = ../../../i18n/de/chess.ts \
         ../../../i18n/da/chess.ts \
         ../../../i18n/xx/chess.ts \
         ../../../i18n/en/chess.ts \
         ../../../i18n/es/chess.ts \
         ../../../i18n/fr/chess.ts \
         ../../../i18n/hu/chess.ts \
         ../../../i18n/ja/chess.ts \
         ../../../i18n/ko/chess.ts \
         ../../../i18n/no/chess.ts \
         ../../../i18n/pl/chess.ts \
         ../../../i18n/pt/chess.ts \
         ../../../i18n/pt_BR/chess.ts \
         ../../../i18n/sl/chess.ts \
         ../../../i18n/zh_CN/chess.ts \
         ../../../i18n/zh_TW/chess.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro
index 14fa7f3..d1c246d 100644
--- a/noncore/games/fifteen/fifteen.pro
+++ b/noncore/games/fifteen/fifteen.pro
@@ -1,27 +1,31 @@
        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = fifteen.h
        SOURCES         = fifteen.cpp \
                main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = fifteen
 TRANSLATIONS = ../../../i18n/de/fifteen.ts \
         ../../../i18n/da/fifteen.ts \
         ../../../i18n/xx/fifteen.ts \
         ../../../i18n/en/fifteen.ts \
         ../../../i18n/es/fifteen.ts \
         ../../../i18n/fr/fifteen.ts \
         ../../../i18n/hu/fifteen.ts \
         ../../../i18n/ja/fifteen.ts \
         ../../../i18n/ko/fifteen.ts \
         ../../../i18n/no/fifteen.ts \
         ../../../i18n/pl/fifteen.ts \
         ../../../i18n/pt/fifteen.ts \
         ../../../i18n/pt_BR/fifteen.ts \
         ../../../i18n/sl/fifteen.ts \
         ../../../i18n/zh_CN/fifteen.ts \
         ../../../i18n/zh_TW/fifteen.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro
index eeb2893..1c98640 100644
--- a/noncore/games/go/go.pro
+++ b/noncore/games/go/go.pro
@@ -1,34 +1,38 @@
        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = amigo.h \
                  go.h \
                  goplayutils.h \
                  gowidget.h
        SOURCES         = amigo.c \
                goplayer.c \
                goplayutils.c \
                killable.c \
                gowidget.cpp \
                main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = go
 TRANSLATIONS = ../../../i18n/de/go.ts \
         ../../../i18n/da/go.ts \
         ../../../i18n/xx/go.ts \
         ../../../i18n/en/go.ts \
         ../../../i18n/es/go.ts \
         ../../../i18n/fr/go.ts \
         ../../../i18n/hu/go.ts \
         ../../../i18n/ja/go.ts \
         ../../../i18n/ko/go.ts \
         ../../../i18n/no/go.ts \
         ../../../i18n/pl/go.ts \
         ../../../i18n/pt/go.ts \
         ../../../i18n/pt_BR/go.ts \
         ../../../i18n/sl/go.ts \
         ../../../i18n/zh_CN/go.ts \
         ../../../i18n/zh_TW/go.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/kbill/kbill.pro b/noncore/games/kbill/kbill.pro
index cc632c8..270fcab 100644
--- a/noncore/games/kbill/kbill.pro
+++ b/noncore/games/kbill/kbill.pro
@@ -1,31 +1,35 @@
        TEMPLATE = app
        CONFIG  = qt warn_on release
        HEADERS = kbill.h field.h Bucket.h Cable.h Computer.h Game.h Horde.h \
 Library.h MCursor.h Monster.h Network.h Picture.h Spark.h Strings.h \
 UI.h  objects.h inputbox.h
        SOURCES         = field.cpp Bucket.cc Cable.cc Computer.cc Game.cc Horde.cc \
 Library.cc MCursor.cc Monster.cc  Network.cc Picture.cc \ 
 Spark.cc UI.cpp inputbox.cpp kbill.cpp
 INTERFACES = helpdialog.ui
        TARGET          = kbill
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe -lstdc++
        DESTDIR =  $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/kbill.ts \
         ../../../i18n/da/kbill.ts \
         ../../../i18n/xx/kbill.ts \
         ../../../i18n/en/kbill.ts \
         ../../../i18n/es/kbill.ts \
         ../../../i18n/fr/kbill.ts \
         ../../../i18n/hu/kbill.ts \
         ../../../i18n/ja/kbill.ts \
         ../../../i18n/ko/kbill.ts \
         ../../../i18n/no/kbill.ts \
         ../../../i18n/pl/kbill.ts \
         ../../../i18n/pt/kbill.ts \
         ../../../i18n/pt_BR/kbill.ts \
         ../../../i18n/sl/kbill.ts \
         ../../../i18n/zh_CN/kbill.ts \
         ../../../i18n/zh_TW/kbill.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/kcheckers/kcheckers.pro b/noncore/games/kcheckers/kcheckers.pro
index 7c094e3..d8b5231 100644
--- a/noncore/games/kcheckers/kcheckers.pro
+++ b/noncore/games/kcheckers/kcheckers.pro
@@ -1,35 +1,39 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = checkers.h \
                  echeckers.h \
                  field.h \
                  kcheckers.h \
                  rcheckers.h
        SOURCES         = checkers.cpp \
                  echeckers.cpp \
                  field.cpp \
                  kcheckers.cpp \
                  main.cpp \
                  rcheckers.cpp
        INTERFACES= 
        INCLUDEPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe
        DESTDIR         = $(OPIEDIR)/bin
        TARGET  = kcheckers
 TRANSLATIONS = ../../../i18n/de/kcheckers.ts \
         ../../../i18n/da/kcheckers.ts \
         ../../../i18n/xx/kcheckers.ts \
         ../../../i18n/en/kcheckers.ts \
         ../../../i18n/es/kcheckers.ts \
         ../../../i18n/fr/kcheckers.ts \
         ../../../i18n/hu/kcheckers.ts \
         ../../../i18n/ja/kcheckers.ts \
         ../../../i18n/ko/kcheckers.ts \
         ../../../i18n/no/kcheckers.ts \
         ../../../i18n/pl/kcheckers.ts \
         ../../../i18n/pt/kcheckers.ts \
         ../../../i18n/pt_BR/kcheckers.ts \
         ../../../i18n/sl/kcheckers.ts \
         ../../../i18n/zh_CN/kcheckers.ts \
         ../../../i18n/zh_TW/kcheckers.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/kpacman/kpacman.pro b/noncore/games/kpacman/kpacman.pro
index aff0ffb..594397a 100644
--- a/noncore/games/kpacman/kpacman.pro
+++ b/noncore/games/kpacman/kpacman.pro
@@ -1,58 +1,62 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        #TMAKE_CXXFLAGS+= 
        HEADERS         = kpacmanwidget.h \
                    referee.h \
                    status.h \
                    painter.h \
                    score.h \
                    pacman.h \
                    monster.h \
                    keys.h \
                    fruit.h \
                    energizer.h \
                    board.h \
                    bitfont.h \
                    kpacman.h \
                    bitmaps.h \
                    colors.h \
                    config.h \
                    portable.h
        SOURCES         = kpacmanwidget.cpp \
                    referee.cpp \
                    status.cpp \
                    painter.cpp \
                    score.cpp \
                    pacman.cpp \
                    monster.cpp \
                    keys.cpp \
                    fruit.cpp \
                    energizer.cpp \
                    board.cpp \
                    bitfont.cpp \
                    kpacman.cpp \
                    config.cpp \
                    main.cpp 
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 DESTDIR         = $(OPIEDIR)/bin
        TARGET  = kpacman
 TRANSLATIONS = ../../../i18n/de/kpacman.ts \
         ../../../i18n/da/kpacman.ts \
         ../../../i18n/xx/kpacman.ts \
         ../../../i18n/en/kpacman.ts \
         ../../../i18n/es/kpacman.ts \
         ../../../i18n/fr/kpacman.ts \
         ../../../i18n/hu/kpacman.ts \
         ../../../i18n/ja/kpacman.ts \
         ../../../i18n/ko/kpacman.ts \
         ../../../i18n/no/kpacman.ts \
         ../../../i18n/pl/kpacman.ts \
         ../../../i18n/pt/kpacman.ts \
         ../../../i18n/pt_BR/kpacman.ts \
         ../../../i18n/sl/kpacman.ts \
         ../../../i18n/zh_CN/kpacman.ts \
         ../../../i18n/zh_TW/kpacman.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/mindbreaker/mindbreaker.pro b/noncore/games/mindbreaker/mindbreaker.pro
index 6991066..5052467 100644
--- a/noncore/games/mindbreaker/mindbreaker.pro
+++ b/noncore/games/mindbreaker/mindbreaker.pro
@@ -1,27 +1,31 @@
 TEMPLATE        = app
 CONFIG          += qt warn_on release
 DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = mindbreaker.h
        SOURCES         = main.cpp \
              mindbreaker.cpp
 TARGET          = mindbreaker
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/mindbreaker.ts \
         ../../../i18n/da/mindbreaker.ts \
         ../../../i18n/xx/mindbreaker.ts \
         ../../../i18n/en/mindbreaker.ts \
         ../../../i18n/es/mindbreaker.ts \
         ../../../i18n/fr/mindbreaker.ts \
         ../../../i18n/hu/mindbreaker.ts \
         ../../../i18n/ja/mindbreaker.ts \
         ../../../i18n/ko/mindbreaker.ts \
         ../../../i18n/no/mindbreaker.ts \
         ../../../i18n/pl/mindbreaker.ts \
         ../../../i18n/pt/mindbreaker.ts \
         ../../../i18n/pt_BR/mindbreaker.ts \
         ../../../i18n/sl/mindbreaker.ts \
         ../../../i18n/zh_CN/mindbreaker.ts \
         ../../../i18n/zh_TW/mindbreaker.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/minesweep/minesweep.pro b/noncore/games/minesweep/minesweep.pro
index 8f350bf..3e234a4 100644
--- a/noncore/games/minesweep/minesweep.pro
+++ b/noncore/games/minesweep/minesweep.pro
@@ -1,31 +1,35 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = minefield.h \
                  minesweep.h
        SOURCES         = main.cpp \
                  minefield.cpp \
                  minesweep.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= 
        TARGET  = minesweep
 TRANSLATIONS = ../../../i18n/de/minesweep.ts \
         ../../../i18n/da/minesweep.ts \
         ../../../i18n/xx/minesweep.ts \
         ../../../i18n/en/minesweep.ts \
         ../../../i18n/es/minesweep.ts \
         ../../../i18n/fr/minesweep.ts \
         ../../../i18n/hu/minesweep.ts \
         ../../../i18n/ja/minesweep.ts \
         ../../../i18n/ko/minesweep.ts \
         ../../../i18n/no/minesweep.ts \
         ../../../i18n/pl/minesweep.ts \
         ../../../i18n/pt/minesweep.ts \
         ../../../i18n/pt_BR/minesweep.ts \
         ../../../i18n/sl/minesweep.ts \
         ../../../i18n/zh_CN/minesweep.ts \
         ../../../i18n/it/minesweep.ts \
         ../../../i18n/zh_TW/minesweep.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/parashoot/parashoot.pro b/noncore/games/parashoot/parashoot.pro
index 864d995..d8e4b1f 100644
--- a/noncore/games/parashoot/parashoot.pro
+++ b/noncore/games/parashoot/parashoot.pro
@@ -1,26 +1,30 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = interface.h man.h cannon.h base.h bullet.h helicopter.h
        SOURCES         = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp
        TARGET  = parashoot 
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/parashoot.ts \
         ../../../i18n/da/parashoot.ts \
         ../../../i18n/xx/parashoot.ts \
         ../../../i18n/en/parashoot.ts \
         ../../../i18n/es/parashoot.ts \
         ../../../i18n/fr/parashoot.ts \
         ../../../i18n/hu/parashoot.ts \
         ../../../i18n/ja/parashoot.ts \
         ../../../i18n/ko/parashoot.ts \
         ../../../i18n/no/parashoot.ts \
         ../../../i18n/pl/parashoot.ts \
         ../../../i18n/pt/parashoot.ts \
         ../../../i18n/pt_BR/parashoot.ts \
         ../../../i18n/sl/parashoot.ts \
         ../../../i18n/zh_CN/parashoot.ts \
         ../../../i18n/zh_TW/parashoot.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/qasteroids/qasteroids.pro b/noncore/games/qasteroids/qasteroids.pro
index 34be552..39b2722 100644
--- a/noncore/games/qasteroids/qasteroids.pro
+++ b/noncore/games/qasteroids/qasteroids.pro
@@ -1,26 +1,30 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = ledmeter.h  sprites.h  toplevel.h  view.h
        SOURCES         = ledmeter.cpp  toplevel.cpp  view.cpp main.cpp
        TARGET  = qasteroids
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/qasteroids.ts \
         ../../../i18n/da/qasteroids.ts \
         ../../../i18n/xx/qasteroids.ts \
         ../../../i18n/en/qasteroids.ts \
         ../../../i18n/es/qasteroids.ts \
         ../../../i18n/fr/qasteroids.ts \
         ../../../i18n/hu/qasteroids.ts \
         ../../../i18n/ja/qasteroids.ts \
         ../../../i18n/ko/qasteroids.ts \
         ../../../i18n/no/qasteroids.ts \
         ../../../i18n/pl/qasteroids.ts \
         ../../../i18n/pt/qasteroids.ts \
         ../../../i18n/pt_BR/qasteroids.ts \
         ../../../i18n/sl/qasteroids.ts \
         ../../../i18n/zh_CN/qasteroids.ts \
         ../../../i18n/zh_TW/qasteroids.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/sfcave/sfcave.pro b/noncore/games/sfcave/sfcave.pro
index 5f49330..5941c20 100644
--- a/noncore/games/sfcave/sfcave.pro
+++ b/noncore/games/sfcave/sfcave.pro
@@ -1,9 +1,13 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        SOURCES = sfcave.cpp helpwindow.cpp random.cpp
        HEADERS = sfcave.h helpwindow.h random.h
        TARGET  = sfcave
        INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
+include ( ../../../include.pro )
diff --git a/noncore/games/snake/snake.pro b/noncore/games/snake/snake.pro
index fe9e739..845c0a5 100644
--- a/noncore/games/snake/snake.pro
+++ b/noncore/games/snake/snake.pro
@@ -1,26 +1,30 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = snake.h target.h obstacle.h interface.h codes.h
        SOURCES         = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp
        TARGET  = snake
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/snake.ts \
         ../../../i18n/da/snake.ts \
         ../../../i18n/xx/snake.ts \
         ../../../i18n/en/snake.ts \
         ../../../i18n/es/snake.ts \
         ../../../i18n/fr/snake.ts \
         ../../../i18n/hu/snake.ts \
         ../../../i18n/ja/snake.ts \
         ../../../i18n/ko/snake.ts \
         ../../../i18n/no/snake.ts \
         ../../../i18n/pl/snake.ts \
         ../../../i18n/pt/snake.ts \
         ../../../i18n/pt_BR/snake.ts \
         ../../../i18n/sl/snake.ts \
         ../../../i18n/zh_CN/snake.ts \
         ../../../i18n/zh_TW/snake.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro
index 51e0106..f86fc13 100755
--- a/noncore/games/solitaire/solitaire.pro
+++ b/noncore/games/solitaire/solitaire.pro
@@ -1,37 +1,41 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h \
    canvascardgame.h freecellcardgame.h chicanecardgame.h harpcardgame.h teeclubcardgame.h \
    patiencecardgame.h canvascardwindow.h
 SOURCES   = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp \
   cardpile.cpp card.cpp carddeck.cpp canvascardgame.cpp freecellcardgame.cpp \
   chicanecardgame.cpp harpcardgame.cpp teeclubcardgame.cpp \
   patiencecardgame.cpp canvascardwindow.cpp main.cpp
 TARGET    = patience
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/patience.ts \
         ../../../i18n/da/patience.ts \
         ../../../i18n/xx/patience.ts \
   ../../../i18n/en/patience.ts \
   ../../../i18n/es/patience.ts \
   ../../../i18n/fr/patience.ts \
   ../../../i18n/hu/patience.ts \
   ../../../i18n/ja/patience.ts \
   ../../../i18n/ko/patience.ts \
   ../../../i18n/no/patience.ts \
   ../../../i18n/pl/patience.ts \
   ../../../i18n/pt/patience.ts \
   ../../../i18n/pt_BR/patience.ts \
   ../../../i18n/sl/patience.ts \
   ../../../i18n/zh_CN/patience.ts \
   ../../../i18n/zh_TW/patience.ts \
     ../../../i18n/it/patience.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/tetrix/tetrix.pro b/noncore/games/tetrix/tetrix.pro
index 5110b05..48c6d93 100644
--- a/noncore/games/tetrix/tetrix.pro
+++ b/noncore/games/tetrix/tetrix.pro
@@ -1,35 +1,39 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = gtetrix.h \
                    qtetrix.h \
                    qtetrixb.h \
                    tpiece.h
        SOURCES         = main.cpp \
                    gtetrix.cpp \
                    qtetrix.cpp \
                    qtetrixb.cpp \
                    tpiece.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= 
        TARGET  = tetrix
 TRANSLATIONS = ../../../i18n/de/tetrix.ts \
         ../../../i18n/da/tetrix.ts \
         ../../../i18n/xx/tetrix.ts \
         ../../../i18n/en/tetrix.ts \
         ../../../i18n/es/tetrix.ts \
         ../../../i18n/fr/tetrix.ts \
         ../../../i18n/hu/tetrix.ts \
         ../../../i18n/ja/tetrix.ts \
         ../../../i18n/ko/tetrix.ts \
         ../../../i18n/no/tetrix.ts \
         ../../../i18n/pl/tetrix.ts \
         ../../../i18n/pt/tetrix.ts \
         ../../../i18n/pt_BR/tetrix.ts \
         ../../../i18n/sl/tetrix.ts \
         ../../../i18n/zh_CN/tetrix.ts \
         ../../../i18n/it/tetrix.ts \
         ../../../i18n/zh_TW/tetrix.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/tictac/tictac.pro b/noncore/games/tictac/tictac.pro
index 33b8453..777bee2 100644
--- a/noncore/games/tictac/tictac.pro
+++ b/noncore/games/tictac/tictac.pro
@@ -1,27 +1,31 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = tictac.h
 SOURCES   = main.cpp \
      tictac.cpp
 TARGET    = tictac
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 DESTDIR   = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/tictac.ts \
         ../../../i18n/da/tictac.ts \
         ../../../i18n/xx/tictac.ts \
         ../../../i18n/en/tictac.ts \
         ../../../i18n/es/tictac.ts \
         ../../../i18n/fr/tictac.ts \
         ../../../i18n/hu/tictac.ts \
         ../../../i18n/ja/tictac.ts \
         ../../../i18n/ko/tictac.ts \
         ../../../i18n/no/tictac.ts \
         ../../../i18n/pl/tictac.ts \
         ../../../i18n/pt/tictac.ts \
         ../../../i18n/pt_BR/tictac.ts \
         ../../../i18n/sl/tictac.ts \
         ../../../i18n/zh_CN/tictac.ts \
         ../../../i18n/zh_TW/tictac.ts
+include ( ../../../include.pro )
diff --git a/noncore/games/wordgame/wordgame.pro b/noncore/games/wordgame/wordgame.pro
index f7f978a..3e330b2 100644
--- a/noncore/games/wordgame/wordgame.pro
+++ b/noncore/games/wordgame/wordgame.pro
@@ -1,28 +1,32 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = wordgame.h
        SOURCES         = main.cpp \
                  wordgame.cpp
        INTERFACES= newgamebase.ui rulesbase.ui
        TARGET  = wordgame
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/wordgame.ts \
         ../../../i18n/da/wordgame.ts \
         ../../../i18n/xx/wordgame.ts \
         ../../../i18n/en/wordgame.ts \
         ../../../i18n/es/wordgame.ts \
         ../../../i18n/fr/wordgame.ts \
         ../../../i18n/hu/wordgame.ts \
         ../../../i18n/ja/wordgame.ts \
         ../../../i18n/ko/wordgame.ts \
         ../../../i18n/no/wordgame.ts \
         ../../../i18n/pl/wordgame.ts \
         ../../../i18n/pt/wordgame.ts \
         ../../../i18n/pt_BR/wordgame.ts \
         ../../../i18n/sl/wordgame.ts \
         ../../../i18n/zh_CN/wordgame.ts \
         ../../../i18n/zh_TW/wordgame.ts
+include ( ../../../include.pro )
diff --git a/noncore/graphics/drawpad/drawpad.pro b/noncore/graphics/drawpad/drawpad.pro
index d25c17a..12d4ed3 100644
--- a/noncore/graphics/drawpad/drawpad.pro
+++ b/noncore/graphics/drawpad/drawpad.pro
@@ -1,64 +1,68 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = drawpad.h \
                  drawpadcanvas.h \
                  ellipsetool.h \
                  erasetool.h \
                  exportdialog.h \
                  filltool.h \
                  filledellipsetool.h \
                  filledrectangletool.h \
                  importdialog.h \
                  linetool.h \
                  newpagedialog.h \
                  page.h \
                  pageinformationdialog.h \
                  pointtool.h \
                  rectangletool.h \
                  shapetool.h \
                  texttool.h \
                  thumbnailview.h \
                  tool.h
        SOURCES         = drawpad.cpp \
                  drawpadcanvas.cpp \
                  ellipsetool.cpp \
                  erasetool.cpp \
                  exportdialog.cpp \
                  filltool.cpp \
                  filledellipsetool.cpp \
                  filledrectangletool.cpp \
                  importdialog.cpp \
                  linetool.cpp \
                  main.cpp \
                  newpagedialog.cpp \
                  page.cpp \
                  pageinformationdialog.cpp \
                  pointtool.cpp \
                  rectangletool.cpp \
                  shapetool.cpp \
                  texttool.cpp \
                  thumbnailview.cpp \
                  tool.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe -lopie
        DESTDIR         = $(OPIEDIR)/bin
        TARGET  = drawpad
 TRANSLATIONS = ../../../i18n/de/drawpad.ts \
         ../../../i18n/da/drawpad.ts \
         ../../../i18n/xx/drawpad.ts \
         ../../../i18n/en/drawpad.ts \
         ../../../i18n/es/drawpad.ts \
         ../../../i18n/fr/drawpad.ts \
         ../../../i18n/hu/drawpad.ts \
         ../../../i18n/ja/drawpad.ts \
         ../../../i18n/ko/drawpad.ts \
         ../../../i18n/no/drawpad.ts \
         ../../../i18n/pl/drawpad.ts \
         ../../../i18n/pt/drawpad.ts \
         ../../../i18n/pt_BR/drawpad.ts \
         ../../../i18n/sl/drawpad.ts \
         ../../../i18n/zh_CN/drawpad.ts \
         ../../../i18n/it/drawpad.ts \
         ../../../i18n/zh_TW/drawpad.ts
+include ( ../../../include.pro )
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index 310d9cb..2b22d31 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -1,26 +1,30 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = playlistselection.h mediaplayerstate.h xinecontrol.h \
               videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \
            frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
            alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \
            skin.h
 SOURCES   = main.cpp \
            playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \
            videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \
            frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \
            playlistwidgetgui.cpp\
            alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \
            threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \
            skin.cpp
 TARGET    = opieplayer2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
 LIBS        += -lqpe -lpthread -lopie -lxine
 MOC_DIR   = qpeobj
 OBJECTS_DIR = qpeobj
 #INCLUDEPATH += $(OPIEDIR)/include
 #DEPENDPATH  += $(OPIEDIR)/include
+include ( ../../../include.pro )
diff --git a/noncore/multimedia/opieplayer2/zeckeplayer.pro b/noncore/multimedia/opieplayer2/zeckeplayer.pro
index 18ee623..be900a2 100644
--- a/noncore/multimedia/opieplayer2/zeckeplayer.pro
+++ b/noncore/multimedia/opieplayer2/zeckeplayer.pro
@@ -1,10 +1,13 @@
        TEMPLATE= app
 DESTDIR         = .
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = frame.h lib.h
        SOURCES         = alphablend.c yuv2rgb.c nullvideo.o frame.cpp lib.cpp mainTest.cpp 
        INCLUDEPATH+= $(OPIEDIR)/include /opt/QtPalmtop/include
        DEPENDPATH+= $(OPIEDIR)/include /opt/QtPalmtop/include
 LIBS            += -L/opt/QtPalmtop/lib -lxine -lxineutils
-TARGET          = zeckeplayer
-\ No newline at end of file
+TARGET          = zeckeplayer
+include ( ../../../include.pro )
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro
index dd9414f..275d0c9 100644
--- a/noncore/multimedia/showimg/showimg.pro
+++ b/noncore/multimedia/showimg/showimg.pro
@@ -1,26 +1,30 @@
 TEMPLATE        = app
 CONFIG          += qt warn_on release
 DESTDIR         = $(OPIEDIR)/bin
 HEADERS   = showimg.h ImageFileSelector.h settingsdialog.h settingsdialogbase.h
 SOURCES   = main.cpp showimg.cpp ImageFileSelector.cpp settingsdialog.cpp settingsdialogbase.cpp
 TARGET          = showimg
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TRANSLATIONS = ../../../i18n/de/showimg.ts \
         ../../../i18n/xx/showimg.ts \
   ../../../i18n/en/showimg.ts \
   ../../../i18n/es/showimg.ts \
   ../../../i18n/fr/showimg.ts \
   ../../../i18n/hu/showimg.ts \
   ../../../i18n/ja/showimg.ts \
   ../../../i18n/ko/showimg.ts \
   ../../../i18n/no/showimg.ts \
   ../../../i18n/pl/showimg.ts \
   ../../../i18n/pt/showimg.ts \
   ../../../i18n/pt_BR/showimg.ts \
   ../../../i18n/sl/showimg.ts \
   ../../../i18n/zh_CN/showimg.ts \
   ../../../i18n/zh_TW/showimg.ts \
   ../../../i18n/da/showimg.ts
+include ( ../../../include.pro )
diff --git a/noncore/net/ftplib/ftplib.pro b/noncore/net/ftplib/ftplib.pro
index 9ee3605..3dd8dbd 100644
--- a/noncore/net/ftplib/ftplib.pro
+++ b/noncore/net/ftplib/ftplib.pro
@@ -1,6 +1,10 @@
 TEMPLATE  = lib
 CONFIG    = qt warn_on release
 HEADERS   = ftplib.h
 SOURCES   = ftplib.c
 DESTDIR      = $(QTDIR)/lib$(PROJMAK)
 INTERFACES  = 
+include ( ../../../include.pro )
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro
index b359f23..f5d2af0 100644
--- a/noncore/net/opieftp/opieftp.pro
+++ b/noncore/net/opieftp/opieftp.pro
@@ -1,26 +1,30 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = opieftp.h inputDialog.h ftplib.h
 SOURCES   = opieftp.cpp inputDialog.cpp main.cpp
 TARGET    = opieftp
 DESTDIR   = $(OPIEDIR)/bin
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lftplib
 TRANSLATIONS = ../../../i18n/de/opieftp.ts \
         ../../../i18n/da/opieftp.ts \
         ../../../i18n/xx/opieftp.ts \
         ../../../i18n/en/opieftp.ts \
         ../../../i18n/es/opieftp.ts \
         ../../../i18n/fr/opieftp.ts \
         ../../../i18n/hu/opieftp.ts \
         ../../../i18n/ja/opieftp.ts \
         ../../../i18n/ko/opieftp.ts \
         ../../../i18n/no/opieftp.ts \
         ../../../i18n/pl/opieftp.ts \
         ../../../i18n/pt/opieftp.ts \
         ../../../i18n/pt_BR/opieftp.ts \
         ../../../i18n/sl/opieftp.ts \
         ../../../i18n/zh_CN/opieftp.ts \
         ../../../i18n/zh_TW/opieftp.ts
+include ( ../../../include.pro )
diff --git a/noncore/net/opieirc/opieirc.pro b/noncore/net/opieirc/opieirc.pro
index 37742f5..3fe1961 100644
--- a/noncore/net/opieirc/opieirc.pro
+++ b/noncore/net/opieirc/opieirc.pro
@@ -1,24 +1,28 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = ircchannel.h ircconnection.h \
              ircmessage.h \
              ircmessageparser.h ircoutput.h \
              ircperson.h ircserver.h ircsession.h \
              mainwindow.h irctab.h ircservertab.h \
              ircchanneltab.h ircchannellist.h \
              ircserverlist.h ircservereditor.h \
              ircquerytab.h ircsettings.h ircmisc.h
        SOURCES         = ircchannel.cpp ircconnection.cpp \
              ircmessage.cpp \
              ircmessageparser.cpp ircoutput.cpp \
              ircperson.cpp ircserver.cpp \
              ircsession.cpp main.cpp mainwindow.cpp \
              irctab.cpp ircservertab.cpp \
              ircchanneltab.cpp ircchannellist.cpp \
              ircserverlist.cpp ircservereditor.cpp \
              ircquerytab.cpp ircsettings.cpp ircmisc.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
+include ( ../../../include.pro )
diff --git a/noncore/net/opietooth/applet/applet.pro b/noncore/net/opietooth/applet/applet.pro
index cbdb148..d713708 100644
--- a/noncore/net/opietooth/applet/applet.pro
+++ b/noncore/net/opietooth/applet/applet.pro
@@ -1,28 +1,32 @@
 TEMPLATE      =  lib
 CONFIG        += qt warn_on release
 HEADERS       =  bluezapplet.h bluezappletimpl.h
 SOURCES       =  bluezapplet.cpp bluezappletimpl.cpp
 TARGET        =  bluetoothapplet
 DESTDIR       =  $(OPIEDIR)/plugins/applets
 INCLUDEPATH   += $(OPIEDIR)/include
 INCLUDEPATH   += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH    += $(OPIEDIR)/include
 LIBS          += -lqpe -lopietooth
 VERSION       = 0.0.3
 TRANSLATIONS = ../../../../i18n/de/libbluetoothapplet.ts \
         ../../../../i18n/da/libbluetoothapplet.ts \
         ../../../../i18n/xx/libbluetoothapplet.ts \
         ../../../../i18n/en/libbluetoothapplet.ts \
         ../../../../i18n/es/libbluetoothapplet.ts \
         ../../../../i18n/fr/libbluetoothapplet.ts \
         ../../../../i18n/hu/libbluetoothapplet.ts \
         ../../../../i18n/ja/libbluetoothapplet.ts \
         ../../../../i18n/ko/libbluetoothapplet.ts \
         ../../../../i18n/no/libbluetoothapplet.ts \
         ../../../../i18n/pl/libbluetoothapplet.ts \
         ../../../../i18n/pt/libbluetoothapplet.ts \
         ../../../../i18n/pt_BR/libbluetoothapplet.ts \
         ../../../../i18n/sl/libbluetoothapplet.ts \
         ../../../../i18n/zh_CN/libbluetoothapplet.ts \
         ../../../../i18n/zh_TW/libbluetoothapplet.ts
+include ( ../../../../include.pro )
diff --git a/noncore/net/opietooth/blue-pin/blue-pin.pro b/noncore/net/opietooth/blue-pin/blue-pin.pro
index 6fc5157..27295da 100644
--- a/noncore/net/opietooth/blue-pin/blue-pin.pro
+++ b/noncore/net/opietooth/blue-pin/blue-pin.pro
@@ -1,29 +1,33 @@
 TEMPLATE        = app
 #CONFIG         = qt warn_on debug
 CONFIG          = qt warn_on release
 HEADERS         = pindlg.h 
 SOURCES         = main.cc pindlg.cc
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH    += $(OPIEDIR)/noncore/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe 
 INTERFACES      = pindlgbase.ui
        DESTDIR         = $(OPIEDIR)/bin
 TARGET          = bluepin
 TRANSLATIONS = ../../../../i18n/de/bluepin.ts \
         ../../../../i18n/da/bluepin.ts \
         ../../../../i18n/xx/bluepin.ts \
         ../../../../i18n/en/bluepin.ts \
         ../../../../i18n/es/bluepin.ts \
         ../../../../i18n/fr/bluepin.ts \
         ../../../../i18n/hu/bluepin.ts \
         ../../../../i18n/ja/bluepin.ts \
         ../../../../i18n/ko/bluepin.ts \
         ../../../../i18n/no/bluepin.ts \
         ../../../../i18n/pl/bluepin.ts \
         ../../../../i18n/pt/bluepin.ts \
         ../../../../i18n/pt_BR/bluepin.ts \
         ../../../../i18n/sl/bluepin.ts \
         ../../../../i18n/zh_CN/bluepin.ts \
         ../../../../i18n/zh_TW/bluepin.ts
+include ( ../../../../include.pro )
diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro
index ca5edd2..d250448 100644
--- a/noncore/net/opietooth/lib/lib.pro
+++ b/noncore/net/opietooth/lib/lib.pro
@@ -1,26 +1,30 @@
 TEMPLATE        = lib
 CONFIG          += qte warn_on release
        HEADERS = connection.h parser.h device.h manager.h remotedevice.h services.h
        SOURCES         = connection.cpp parser.cc device.cc manager.cc remotedevice.cc services.cc
        TARGET  = opietooth
 INCLUDEPATH += $(OPIEDIR)/include .
 DESTDIR         = $(QTDIR)/lib$(PROJMAK)
 LIBS += -lopie
 #VERSION = 0.0.0
 TRANSLATIONS = ../../../../i18n/de/libopietooth.ts \
         ../../../../i18n/da/libopietooth.ts \
         ../../../../i18n/xx/libopietooth.ts \
         ../../../../i18n/en/libopietooth.ts \
         ../../../../i18n/es/libopietooth.ts \
         ../../../../i18n/fr/libopietooth.ts \
         ../../../../i18n/hu/libopietooth.ts \
         ../../../../i18n/ja/libopietooth.ts \
         ../../../../i18n/ko/libopietooth.ts \
         ../../../../i18n/no/libopietooth.ts \
         ../../../../i18n/pl/libopietooth.ts \
         ../../../../i18n/pt/libopietooth.ts \
         ../../../../i18n/pt_BR/libopietooth.ts \
         ../../../../i18n/sl/libopietooth.ts \
         ../../../../i18n/zh_CN/libopietooth.ts \
         ../../../../i18n/zh_TW/libopietooth.ts
+include ( ../../../../include.pro )
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 1c3faf3..f3599bb 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -1,45 +1,49 @@
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG          = qt warn_on release
 HEADERS         = btconnectionitem.h btdeviceitem.h \
                  btserviceitem.h stdpopups.h \ 
                  popuphelper.h bluebase.h \ 
                  scandialog.h btlistitem.h \ 
                  hciconfwrapper.h bticonloader.h \
                  pppdialog.h obexdialog.h \
                  devicehandler.h rfcpopup.h obexpopup.h \
                  rfcommhelper.h
                  
 SOURCES         = btconnectionitem.cpp btdeviceitem.cpp \ 
                  btserviceitem.cpp stdpopups.cpp \
                  popuphelper.cpp main.cpp \
                  bluebase.cpp scandialog.cpp \ 
                  btlistitem.cpp hciconfwrapper.cpp \ 
                  bticonloader.cpp pppdialog.cpp \
                  obexdialog.cpp devicehandler.cpp \
                  rfcpopup.cpp obexpopup.cpp \
                  rfcommhelper.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopietooth -lopie
 INTERFACES      = bluetoothbase.ui  devicedialog.ui  
 DESTDIR         = $(OPIEDIR)/bin
 TARGET          = bluetooth-manager
 TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \
         ../../../../i18n/da/bluetooth-manager.ts \
         ../../../../i18n/xx/bluetooth-manager.ts \
         ../../../../i18n/en/bluetooth-manager.ts \
         ../../../../i18n/es/bluetooth-manager.ts \
         ../../../../i18n/fr/bluetooth-manager.ts \
         ../../../../i18n/hu/bluetooth-manager.ts \
         ../../../../i18n/ja/bluetooth-manager.ts \
         ../../../../i18n/ko/bluetooth-manager.ts \
         ../../../../i18n/no/bluetooth-manager.ts \
         ../../../../i18n/pl/bluetooth-manager.ts \
         ../../../../i18n/pt/bluetooth-manager.ts \
         ../../../../i18n/pt_BR/bluetooth-manager.ts \
         ../../../../i18n/sl/bluetooth-manager.ts \
         ../../../../i18n/zh_CN/bluetooth-manager.ts \
         ../../../../i18n/zh_TW/bluetooth-manager.ts
+include ( ../../../../include.pro )
diff --git a/noncore/net/ubrowser/ubrowser.pro b/noncore/net/ubrowser/ubrowser.pro
index 3704a48..09a2c79 100644
--- a/noncore/net/ubrowser/ubrowser.pro
+++ b/noncore/net/ubrowser/ubrowser.pro
@@ -1,9 +1,13 @@
        TEMPLATE=app
        CONFIG  +=qt warn_on release
        DESTDIR         =../../../bin
        HEADERS         = mainview.h httpfactory.h httpcomm.h
        SOURCES         = main.cpp mainview.cpp httpfactory.cpp httpcomm.cpp
        INCLUDEPATH+=../../../include
        DEPENDPATH+=../../../include
        LIBS    += -lqpe
 TARGET          = ubrowser
+include ( ../../../include.pro )
diff --git a/noncore/net/wellenreiter/contrib/orinoco_hopper/orinoco_hopper.pro b/noncore/net/wellenreiter/contrib/orinoco_hopper/orinoco_hopper.pro
index a85520c..def42c0 100644
--- a/noncore/net/wellenreiter/contrib/orinoco_hopper/orinoco_hopper.pro
+++ b/noncore/net/wellenreiter/contrib/orinoco_hopper/orinoco_hopper.pro
@@ -1,11 +1,15 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = warn_on debug
 #CONFIG         = warn_on release
 HEADERS         = 
 SOURCES         = orinoco_hopper.c
 INCLUDEPATH     +=
 DEPENDPATH      +=
 LIBS            +=
 INTERFACES      = 
 TARGET          = orinoco_hopper
+include ( ../../../../../include.pro )
diff --git a/noncore/net/wellenreiter/daemon/daemon.pro b/noncore/net/wellenreiter/daemon/daemon.pro
index 246e4f9..5f4d09b 100644
--- a/noncore/net/wellenreiter/daemon/daemon.pro
+++ b/noncore/net/wellenreiter/daemon/daemon.pro
@@ -1,11 +1,15 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = warn_on debug
 #CONFIG         = warn_on release
 HEADERS         = source/config.hh source/daemon.hh
 SOURCES         = source/daemon.cc
 INCLUDEPATH     += ../
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lpcap -L$(QTDIR)/lib -lwellenreiter
 INTERFACES      = 
 TARGET          = wellenreiterd
+include ( ../../../../include.pro )
diff --git a/noncore/net/wellenreiter/gui/gui-x11.pro b/noncore/net/wellenreiter/gui/gui-x11.pro
index c2a4394..06b2c06 100644
--- a/noncore/net/wellenreiter/gui/gui-x11.pro
+++ b/noncore/net/wellenreiter/gui/gui-x11.pro
@@ -1,11 +1,15 @@
 DESTDIR         = .
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG         = qt warn_on release
 HEADERS         = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h wlan.h cardconfig.h manufacturers.h
 SOURCES         = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp wlan.cpp cardconfig.cpp manufacturers.cpp
 INCLUDEPATH     += ../
 DEPENDPATH      += ../
 LIBS            += -L. -lwellenreiter
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
+include ( ../../../../include.pro )
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 52ed8c6..397da25 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,11 +1,15 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG         = qt warn_on release
 HEADERS         = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h wlan.h cardconfig.h manufacturers.h
 SOURCES         = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp wlan.cpp cardconfig.cpp manufacturers.h
 INCLUDEPATH     += $(OPIEDIR)/include ../
 DEPENDPATH      += $(OPIEDIR)/include ../
 LIBS            += -lqpe -lopie -L. -lwellenreiter
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
+include ( ../../../../include.pro )
diff --git a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
index 8a6ed36..5a7e20d 100644
--- a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
+++ b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
@@ -1,11 +1,15 @@
 TEMPLATE = lib
 CONFIG = warn_on debug
 VERSION = 0.2
 HEADERS = source/cardmode.hh source/wl_log.hh source/wl_proto.hh source/sniff.hh source/wl_sock.hh source/wl_types.hh
 SOURCES = source/cardmode.cc source/wl_log.cc source/wl_proto.cc source/sniff.cc source/wl_sock.cc
 LIBS =
 TMAKE_CFLAGS += -D__UNIX__
 DESTDIR = $(QTDIR)/lib
 TARGET = wellenreiter
+include ( ../../../../include.pro )
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index 89400d7..229440f 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -1,2 +1,6 @@
 TEMPLATE        = subdirs
 unix:SUBDIRS    = libwellenreiter daemon gui contrib/orinoco_hopper
+include ( ../../../include.pro )
diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro
index 5870d73..26db92b 100644
--- a/noncore/settings/appearance2/appearance2.pro
+++ b/noncore/settings/appearance2/appearance2.pro
@@ -1,28 +1,32 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = appearance.h editScheme.h sample.h
 SOURCES   = appearance.cpp editScheme.cpp main.cpp sample.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += ../$(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET    = appearance
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 TRANSLATIONS = ../../../i18n/de/appearance.ts \
         ../../../i18n/xx/appearance.ts \
         ../../../i18n/en/appearance.ts \
         ../../../i18n/es/appearance.ts \
         ../../../i18n/fr/appearance.ts \
         ../../../i18n/hu/appearance.ts \
         ../../../i18n/ja/appearance.ts \
         ../../../i18n/ko/appearance.ts \
         ../../../i18n/no/appearance.ts \
         ../../../i18n/pl/appearance.ts \
         ../../../i18n/pt/appearance.ts \
         ../../../i18n/pt_BR/appearance.ts \
         ../../../i18n/sl/appearance.ts \
         ../../../i18n/zh_CN/appearance.ts \
         ../../../i18n/zh_TW/appearance.ts \
         ../../../i18n/da/appearance.ts
+include ( ../../../include.pro )
diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index a5d49e7..5fc323a 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -1,47 +1,51 @@
        TEMPLATE= app
        CONFIG  = qt warn_on debug
        HEADERS         = global.h \
                  mainwin.h \
                  datamgr.h \
                  settingsimpl.h \
                  ipkg.h \
                  networkpkgmgr.h \
                  package.h \
                  progresswidget.h \
                  installdlgimpl.h \
                  instoptionsimpl.h \
                  destination.h \
                  utils.h \
                  server.h \
                  helpwindow.h \
                  letterpushbutton.h \
                  inputdlg.h \
                  categoryfilterimpl.h
        SOURCES         = mainwin.cpp \
                  datamgr.cpp \
                  mem.cpp \
                  settingsimpl.cpp \
                  ipkg.cpp \
                  networkpkgmgr.cpp \
                  main.cpp \
                  package.cpp \
                  progresswidget.cpp \
                  installdlgimpl.cpp \
                  instoptionsimpl.cpp \
                  destination.cpp \
                  utils.cpp \
                  server.cpp \
                  helpwindow.cpp \
                  letterpushbutton.cpp \
                  inputdlg.cpp \
                  version.cpp \
                  categoryfilterimpl.cpp
        INTERFACES= settings.ui \
                  install.ui \
                  instoptions.ui \
                  categoryfilter.ui
        TARGET  = aqpkg
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie -lstdc++
 DESTDIR = $(OPIEDIR)/bin
+include ( ../../../include.pro )
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index 0e35a7e..a9bd572 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -1,30 +1,34 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = backuprestore.h
        SOURCES         = main.cpp backuprestore.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= backuprestorebase.ui
        TARGET  = backup
        DESTDIR         = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/backup.ts \
        ../../../i18n/xx/backup.ts \
        ../../../i18n/en/backup.ts \
        ../../../i18n/es/backup.ts \
        ../../../i18n/fr/backup.ts \
        ../../../i18n/hu/backup.ts \
        ../../../i18n/ja/backup.ts \
        ../../../i18n/ko/backup.ts \
        ../../../i18n/no/backup.ts \
        ../../../i18n/pl/backup.ts \
        ../../../i18n/pt/backup.ts \
        ../../../i18n/pt_BR/backup.ts \
        ../../../i18n/sl/backup.ts \
        ../../../i18n/zh_CN/backup.ts \
        ../../../i18n/zh_TW/backup.ts \
        ../../../i18n/it/backup.ts \
        ../../../i18n/da/backup.ts
+include ( ../../../include.pro )
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index cf8b697..49da3ba 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -1,27 +1,31 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = settings.h
        SOURCES         = language.cpp main.cpp
        INTERFACES= languagesettingsbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = language
 TRANSLATIONS = ../../../i18n/de/language.ts \
         ../../../i18n/xx/language.ts \
         ../../../i18n/en/language.ts \
         ../../../i18n/es/language.ts \
         ../../../i18n/fr/language.ts \
         ../../../i18n/hu/language.ts \
         ../../../i18n/ja/language.ts \
         ../../../i18n/ko/language.ts \
         ../../../i18n/no/language.ts \
         ../../../i18n/pl/language.ts \
         ../../../i18n/pt/language.ts \
         ../../../i18n/pt_BR/language.ts \
         ../../../i18n/sl/language.ts \
         ../../../i18n/zh_CN/language.ts \
         ../../../i18n/zh_TW/language.ts \
         ../../../i18n/da/language.ts
+include ( ../../../include.pro )
diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro
index bb2c4ed..8762a1a 100644
--- a/noncore/settings/mediummount/mediummount.pro
+++ b/noncore/settings/mediummount/mediummount.pro
@@ -1,27 +1,31 @@
        TEMPLATE= app
 DESTDIR         = $(OPIEDIR)/bin/
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = mediumwidget.h mediumglobal.h mainwindow.h
        SOURCES         = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET          = mediummount
 TRANSLATIONS = ../../../i18n/de/mediummount.ts \
         ../../../i18n/da/mediummount.ts \
         ../../../i18n/xx/mediummount.ts \
         ../../../i18n/en/mediummount.ts \
         ../../../i18n/es/mediummount.ts \
         ../../../i18n/fr/mediummount.ts \
         ../../../i18n/hu/mediummount.ts \
         ../../../i18n/ja/mediummount.ts \
         ../../../i18n/ko/mediummount.ts \
         ../../../i18n/no/mediummount.ts \
         ../../../i18n/pl/mediummount.ts \
         ../../../i18n/pt/mediummount.ts \
         ../../../i18n/pt_BR/mediummount.ts \
         ../../../i18n/sl/mediummount.ts \
         ../../../i18n/zh_CN/mediummount.ts \
         ../../../i18n/zh_TW/mediummount.ts
+include ( ../../../include.pro )
diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro
index d74618c..ae098aa 100644
--- a/noncore/settings/netsystemtime/netsystemtime.pro
+++ b/noncore/settings/netsystemtime/netsystemtime.pro
@@ -1,28 +1,32 @@
        TEMPLATE= app
        CONFIG  = qt warn_on debug
        #CONFIG         = qt warn_on release
        HEADERS         = ntp.h settime.h 
        SOURCES         = main.cpp ntp.cpp settime.cpp 
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
        INTERFACES= ntpbase.ui
 DESTDIR         = $(OPIEDIR)/bin
        TARGET  = systemtime
 TRANSLATIONS = ../../../i18n/de/systemtime.ts \
         ../../../i18n/da/systemtime.ts \
         ../../../i18n/xx/systemtime.ts \
         ../../../i18n/en/systemtime.ts \
         ../../../i18n/es/systemtime.ts \
         ../../../i18n/fr/systemtime.ts \
         ../../../i18n/hu/systemtime.ts \
         ../../../i18n/ja/systemtime.ts \
         ../../../i18n/ko/systemtime.ts \
         ../../../i18n/no/systemtime.ts \
         ../../../i18n/pl/systemtime.ts \
         ../../../i18n/pt/systemtime.ts \
         ../../../i18n/pt_BR/systemtime.ts \
         ../../../i18n/sl/systemtime.ts \
         ../../../i18n/zh_CN/systemtime.ts \
         ../../../i18n/zh_TW/systemtime.ts
+include ( ../../../include.pro )
diff --git a/noncore/settings/networksettings/interfaces/interfaces.pro b/noncore/settings/networksettings/interfaces/interfaces.pro
index 9a024f6..9fd1b20 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.pro
+++ b/noncore/settings/networksettings/interfaces/interfaces.pro
@@ -1,12 +1,16 @@
 TEMPLATE        = lib
 CONFIG          += qt warn_on release
        #CONFIG         += qt warn_on debug
        DESTDIR         = $(QTDIR)/lib$(PROJMAK)
        HEADERS         = interface.h  interfaceinformationimp.h  interfaces.h  interfacesetupimp.h
        SOURCES         = interface.cpp interfaces.cpp interfaceinformationimp.cpp  interfacesetupimp.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= interfaceadvanced.ui  interfaceinformation.ui  interfacesetup.ui
        TARGET  = interfaces
        VERSION         = 1.0.0
+include ( ../../../../include.pro )
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro
index 85dbc4a..d1d0355 100644
--- a/noncore/settings/networksettings/networksettings.pro
+++ b/noncore/settings/networksettings/networksettings.pro
@@ -1,11 +1,15 @@
 DESTDIR   = $(OPIEDIR)/bin
 TEMPLATE  = app
 #CONFIG   = qt warn_on debug
 CONFIG    = qt warn_on release
 HEADERS   = mainwindowimp.h addconnectionimp.h defaultmodule.h  module.h
 SOURCES   = main.cpp mainwindowimp.cpp addconnectionimp.cpp
 INCLUDEPATH += $(OPIEDIR)/include interfaces/
 DEPENDPATH  += $(OPIEDIR)/include interfaces/ wlan/
 LIBS            += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces
 INTERFACES  = mainwindow.ui addconnection.ui
 TARGET    = networksettings
+include ( ../../../include.pro )
diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro
index 075cc5f..42dc4a9 100644
--- a/noncore/settings/networksettings/ppp/ppp.pro
+++ b/noncore/settings/networksettings/ppp/ppp.pro
@@ -1,12 +1,16 @@
 TEMPLATE        = lib
 CONFIG          += qt warn_on release
        #CONFIG         += qt warn_on debug
 DESTDIR         = $(OPIEDIR)/plugins/networksetup
        HEADERS         = pppimp.h pppmodule.h
        SOURCES         = pppimp.cpp pppmodule.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -L../interfaces/ -linterfaces
        INTERFACES= ppp.ui
        TARGET  = pppplugin
        VERSION         = 1.0.0
+include ( ../../../../include.pro )
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro
index 8607931..5a8bfea 100644
--- a/noncore/settings/networksettings/wlan/wlan.pro
+++ b/noncore/settings/networksettings/wlan/wlan.pro
@@ -1,12 +1,16 @@
 TEMPLATE        = lib
 CONFIG          += qt warn_on release
        #CONFIG         += qt warn_on debug
 DESTDIR         = $(OPIEDIR)/plugins/networksettings
        HEADERS         = wlanimp.h infoimp.h wlanmodule.h wextensions.h
        SOURCES         = wlanimp.cpp infoimp.cpp wlanmodule.cpp wextensions.cpp
        INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -L../interfaces/ -linterfaces
        INTERFACES= wlan.ui info.ui
        TARGET  = wlanplugin
        VERSION         = 1.0.0
+include ( ../../../../include.pro )
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index fe07d95..f8ac76b 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -1,27 +1,31 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = soundsettings.h soundsettingsbase.h
 SOURCES   = soundsettings.cpp soundsettingsbase.cpp main.cpp
 #INTERFACES = soundsettingsbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET    = sound
 TRANSLATIONS = ../../../i18n/de/sound.ts \
         ../../../i18n/da/sound.ts \
         ../../../i18n/xx/sound.ts \
         ../../../i18n/en/sound.ts \
         ../../../i18n/es/sound.ts \
         ../../../i18n/fr/sound.ts \
         ../../../i18n/hu/sound.ts \
         ../../../i18n/ja/sound.ts \
         ../../../i18n/ko/sound.ts \
         ../../../i18n/no/sound.ts \
         ../../../i18n/pl/sound.ts \
         ../../../i18n/pt/sound.ts \
         ../../../i18n/pt_BR/sound.ts \
         ../../../i18n/sl/sound.ts \
         ../../../i18n/zh_CN/sound.ts \
         ../../../i18n/zh_TW/sound.ts
+include ( ../../../include.pro )
diff --git a/noncore/settings/sshkeys/sshkeys.pro b/noncore/settings/sshkeys/sshkeys.pro
index 1a4e325..96ed1f1 100644
--- a/noncore/settings/sshkeys/sshkeys.pro
+++ b/noncore/settings/sshkeys/sshkeys.pro
@@ -1,29 +1,33 @@
 TEMPLATE = app
 CONFIG += qt warn_on release
 HEADERS = sshkeys.h
 SOURCES = main.cpp sshkeys.cpp
 TARGET = sshkeys
 INTERFACES = sshkeysbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH += $(OPIEDIR)/include
 LIBS += -lqpe -lopie
 DESTDIR = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/sshkeys.ts \
        ../../../i18n/xx/sshkeys.ts \
        ../../../i18n/en/sshkeys.ts \
        ../../../i18n/es/sshkeys.ts \
        ../../../i18n/fr/sshkeys.ts \
        ../../../i18n/hu/sshkeys.ts \
        ../../../i18n/ja/sshkeys.ts \
        ../../../i18n/ko/sshkeys.ts \
        ../../../i18n/no/sshkeys.ts \
        ../../../i18n/pl/sshkeys.ts \
        ../../../i18n/pt/sshkeys.ts \
        ../../../i18n/pt_BR/sshkeys.ts \
        ../../../i18n/sl/sshkeys.ts \
        ../../../i18n/zh_CN/sshkeys.ts \
        ../../../i18n/zh_TW/sshkeys.ts \
        ../../../i18n/it/sshkeys.ts \
        ../../../i18n/da/sshkeys.ts
+include ( ../../../include.pro )
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index b6217c3..18be20a 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -1,44 +1,48 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = memory.h \
      graph.h \
      load.h \
      storage.h \
      processinfo.h \
      modulesinfo.h \
      detail.h \
      versioninfo.h \
      sysinfo.h
 SOURCES   = main.cpp \
      memory.cpp \
      graph.cpp \
      load.cpp \
      storage.cpp \
      processinfo.cpp \
      modulesinfo.cpp \
      detail.cpp \
      versioninfo.cpp \
      sysinfo.cpp
 INTERFACES  = 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET    = sysinfo
 TRANSLATIONS = ../../../i18n/de/sysinfo.ts \
         ../../../i18n/xx/sysinfo.ts \
         ../../../i18n/en/sysinfo.ts \
         ../../../i18n/es/sysinfo.ts \
         ../../../i18n/fr/sysinfo.ts \
         ../../../i18n/hu/sysinfo.ts \
         ../../../i18n/ja/sysinfo.ts \
         ../../../i18n/ko/sysinfo.ts \
         ../../../i18n/no/sysinfo.ts \
         ../../../i18n/pl/sysinfo.ts \
         ../../../i18n/pt/sysinfo.ts \
         ../../../i18n/pt_BR/sysinfo.ts \
         ../../../i18n/sl/sysinfo.ts \
         ../../../i18n/zh_CN/sysinfo.ts \
         ../../../i18n/zh_TW/sysinfo.ts \
         ../../../i18n/da/sysinfo.ts
+include ( ../../../include.pro )
diff --git a/noncore/settings/tabmanager/tabmanager.pro b/noncore/settings/tabmanager/tabmanager.pro
index 9911617..be03dda 100644
--- a/noncore/settings/tabmanager/tabmanager.pro
+++ b/noncore/settings/tabmanager/tabmanager.pro
@@ -1,27 +1,31 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = tabmanager.h tabmainwindow.h tablistview.h tabmanagerbase.h tabapplnk.h
        SOURCES         = main.cpp tabmanager.cpp tabmanagerbase.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        LIBS    += -lqpe
        INTERFACES= app.ui wait.ui
        TARGET  = tabmanager
        DESTDIR = $(OPIEDIR)/bin
        TRANSLATIONS =../../../i18n/de/tabmanager.ts \
         ../../../i18n/da/tabmanager.ts \
         ../../../i18n/xx/tabmanager.ts \
                ../../../i18n/en/tabmanager.ts \
                ../../../i18n/es/tabmanager.ts \
                ../../../i18n/fr/tabmanager.ts \
                ../../../i18n/hu/tabmanager.ts \
                ../../../i18n/ja/tabmanager.ts \
                ../../../i18n/ko/tabmanager.ts \
                ../../../i18n/no/tabmanager.ts \
                ../../../i18n/pl/tabmanager.ts \
                ../../../i18n/pt/tabmanager.ts \
                ../../../i18n/pt_BR/tabmanager.ts \
                ../../../i18n/sl/tabmanager.ts \
                ../../../i18n/zh_CN/tabmanager.ts \
                ../../../i18n/zh_TW/tabmanager.ts
+include ( ../../../include.pro )
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index 11c31da..c4c3dfd 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -1,29 +1,33 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
        HEADERS         = usermanager.h userdialog.h groupdialog.h passwd.h
        SOURCES         = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.h main.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie -lcrypt
        TARGET  = usermanager
 DESTDIR         = $(OPIEDIR)/bin
 TRANSLATIONS = ../../../i18n/de/usermanager.ts \
        ../../../i18n/xx/usermanager.ts \
        ../../../i18n/en/usermanager.ts \
        ../../../i18n/es/usermanager.ts \
        ../../../i18n/fr/usermanager.ts \
        ../../../i18n/hu/usermanager.ts \
        ../../../i18n/ja/usermanager.ts \
        ../../../i18n/ko/usermanager.ts \
        ../../../i18n/no/usermanager.ts \
        ../../../i18n/pl/usermanager.ts \
        ../../../i18n/pt/usermanager.ts \
        ../../../i18n/pt_BR/usermanager.ts \
        ../../../i18n/sl/usermanager.ts \
        ../../../i18n/zh_CN/usermanager.ts \
        ../../../i18n/zh_TW/usermanager.ts \
        ../../../i18n/it/usermanager.ts \
        ../../../i18n/da/usermanager.ts
+include ( ../../../include.pro )
diff --git a/noncore/styles/flat/flat.pro b/noncore/styles/flat/flat.pro
index 8e2512f..796697b 100644
--- a/noncore/styles/flat/flat.pro
+++ b/noncore/styles/flat/flat.pro
@@ -1,11 +1,15 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS         = flat.h
        SOURCES         = flat.cpp
        TARGET  = flatstyle
        DESTDIR         = $(OPIEDIR)/plugins/styles
        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
+include ( ../../../include.pro )
diff --git a/noncore/styles/fresh/fresh.pro b/noncore/styles/fresh/fresh.pro
index e2780e0..2603909 100644
--- a/noncore/styles/fresh/fresh.pro
+++ b/noncore/styles/fresh/fresh.pro
@@ -1,11 +1,15 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
        HEADERS         = fresh.h
        SOURCES         = fresh.cpp
        TARGET  = freshstyle
        DESTDIR         = $(OPIEDIR)/plugins/styles
        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
+include ( ../../../include.pro )
diff --git a/noncore/styles/liquid/liquid.pro b/noncore/styles/liquid/liquid.pro
index a774fd2..588b373 100644
--- a/noncore/styles/liquid/liquid.pro
+++ b/noncore/styles/liquid/liquid.pro
@@ -1,34 +1,38 @@
 TEMPLATE    =  lib
 CONFIG       = qt embedded release warn_on
 SOURCES     =  liquid.cpp \
               effects.cpp \
               liquidset.cpp \
               plugin.cpp
               
 HEADERS     =  liquid.h \
               effects.h \
               liquidset.h \
               plugin.h
               
 LIBS       += -lqpe -lopie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = liquid
 VERSION      = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libliquid.ts \
         ../../../i18n/da/libliquid.ts \
         ../../../i18n/xx/libliquid.ts \
         ../../../i18n/en/libliquid.ts \
         ../../../i18n/es/libliquid.ts \
         ../../../i18n/fr/libliquid.ts \
         ../../../i18n/hu/libliquid.ts \
         ../../../i18n/ja/libliquid.ts \
         ../../../i18n/ko/libliquid.ts \
         ../../../i18n/no/libliquid.ts \
         ../../../i18n/pl/libliquid.ts \
         ../../../i18n/pt/libliquid.ts \
         ../../../i18n/pt_BR/libliquid.ts \
         ../../../i18n/sl/libliquid.ts \
         ../../../i18n/zh_CN/libliquid.ts \
         ../../../i18n/zh_TW/libliquid.ts
+include ( ../../../include.pro )
diff --git a/noncore/styles/metal/metal.pro b/noncore/styles/metal/metal.pro
index df833bc..6c38a2d 100644
--- a/noncore/styles/metal/metal.pro
+++ b/noncore/styles/metal/metal.pro
@@ -1,27 +1,31 @@
 TEMPLATE    =  lib
 CONFIG       = qt embedded release warn_on
 SOURCES     =  metal.cpp plugin.cpp
               
 HEADERS     =  metal.h plugin.h
 LIBS       += -lqpe
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = metal
 VERSION      = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libmetal.ts \
         ../../../i18n/da/libmetal.ts \
         ../../../i18n/xx/libmetal.ts \
         ../../../i18n/en/libmetal.ts \
         ../../../i18n/es/libmetal.ts \
         ../../../i18n/fr/libmetal.ts \
         ../../../i18n/hu/libmetal.ts \
         ../../../i18n/ja/libmetal.ts \
         ../../../i18n/ko/libmetal.ts \
         ../../../i18n/no/libmetal.ts \
         ../../../i18n/pl/libmetal.ts \
         ../../../i18n/pt/libmetal.ts \
         ../../../i18n/pt_BR/libmetal.ts \
         ../../../i18n/sl/libmetal.ts \
         ../../../i18n/zh_CN/libmetal.ts \
         ../../../i18n/zh_TW/libmetal.ts
+include ( ../../../include.pro )
diff --git a/noncore/styles/theme/theme.pro b/noncore/styles/theme/theme.pro
index 29da52f..8865fbc 100644
--- a/noncore/styles/theme/theme.pro
+++ b/noncore/styles/theme/theme.pro
@@ -1,37 +1,41 @@
 TEMPLATE    =  lib
 CONFIG       = qt embedded debug warn_on
 SOURCES     =  ogfxeffect.cpp \
               othemestyle.cpp \
               othemebase.cpp \
               themeset.cpp \
               plugin.cpp
 HEADERS     = ogfxeffect.h \
              othemebase.h \
              othemestyle.h \
              themeset.h \
              plugin.h
               
 LIBS       += -lqpe
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = theme
 VERSION      = 1.0.0
 TRANSLATIONS = ../../../i18n/de/libtheme.ts \
         ../../../i18n/da/libtheme.ts \
         ../../../i18n/xx/libtheme.ts \
         ../../../i18n/en/libtheme.ts \
         ../../../i18n/es/libtheme.ts \
         ../../../i18n/fr/libtheme.ts \
         ../../../i18n/hu/libtheme.ts \
         ../../../i18n/ja/libtheme.ts \
         ../../../i18n/ko/libtheme.ts \
         ../../../i18n/no/libtheme.ts \
         ../../../i18n/pl/libtheme.ts \
         ../../../i18n/pt/libtheme.ts \
         ../../../i18n/pt_BR/libtheme.ts \
         ../../../i18n/sl/libtheme.ts \
         ../../../i18n/zh_CN/libtheme.ts \
         ../../../i18n/zh_TW/libtheme.ts
+include ( ../../../include.pro )
diff --git a/noncore/todayplugins/fortune/fortune.pro b/noncore/todayplugins/fortune/fortune.pro
index 01d0593..dab1170 100644
--- a/noncore/todayplugins/fortune/fortune.pro
+++ b/noncore/todayplugins/fortune/fortune.pro
@@ -1,19 +1,23 @@
 TEMPLATE = lib
 #CONFIG -= moc
 CONFIG += qt debug
 # Input
 HEADERS = fortuneplugin.h fortunepluginimpl.h \
        fortunepluginwidget.h
 SOURCES = fortuneplugin.cpp fortunepluginimpl.cpp \
        fortunepluginwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayfortuneplugin
+include ( ../../../include.pro )
diff --git a/noncore/todayplugins/stockticker/stockticker.pro b/noncore/todayplugins/stockticker/stockticker.pro
index 96319da..659d4c3 100644
--- a/noncore/todayplugins/stockticker/stockticker.pro
+++ b/noncore/todayplugins/stockticker/stockticker.pro
@@ -1,2 +1,6 @@
 TEMPLATE        = subdirs
 unix:SUBDIRS    = stockticker stocktickerlib
+include ( ../../../include.pro )
diff --git a/noncore/todayplugins/stockticker/stockticker/stockticker.pro b/noncore/todayplugins/stockticker/stockticker/stockticker.pro
index c5fe885..56353a3 100644
--- a/noncore/todayplugins/stockticker/stockticker/stockticker.pro
+++ b/noncore/todayplugins/stockticker/stockticker/stockticker.pro
@@ -1,10 +1,14 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 HEADERS   = inputDialog.h helpwindow.h
 SOURCES   = inputDialog.cpp helpwindow.cpp main.cpp
 INTERFACES  = 
 TARGET    = stockticker
 INCLUDEPATH     += $(OPIEDIR)/include 
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/bin
+include ( ../../../../include.pro )
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
index 13c846b..73fda49 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
@@ -1,27 +1,31 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt debug
 HEADERS = stocktickerplugin.h stocktickeruginimpl.h stocktickerpluginwidget.h stocktickerconfig.h \
      ../libstocks/csv.h \
      ../libstocks/http.h \
      ../libstocks/lists.h \
      ../libstocks/stocks.h
 SOURCES = stocktickerplugin.cpp stocktickerpluginimpl.cpp stocktickerpluginwidget.cpp stocktickerconfig.cpp \
      ../libstocks/csv.c \
      ../libstocks/currency.c \
      ../libstocks/history.c \
      ../libstocks/http.c \
      ../libstocks/lists.c \
      ../libstocks/stocks.c
 INCLUDEPATH     += $(OPIEDIR)/include \
    ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
    ../ ../library
 LIBS+= -lqpe -lopie -lpthread
 TMAKE_CFLAGS += -D__UNIX__
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaystocktickerplugin
+include ( ../../../../include.pro )
diff --git a/noncore/todayplugins/weather/weather.pro b/noncore/todayplugins/weather/weather.pro
index 2c7d865..5228f38 100644
--- a/noncore/todayplugins/weather/weather.pro
+++ b/noncore/todayplugins/weather/weather.pro
@@ -1,23 +1,27 @@
 TEMPLATE = lib
 #CONFIG -= moc
 CONFIG += qt debug
 HEADERS = weatherplugin.h       \
          weatherpluginimpl.h   \
          weatherpluginwidget.h \
          weatherconfig.h
 SOURCES = weatherplugin.cpp       \
          weatherpluginimpl.cpp   \
          weatherpluginwidget.cpp \
          weatherconfig.cpp
 INCLUDEPATH     += $(OPIEDIR)/include \
                ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                ../ ../library
 LIBS+= -lqpe -lopie
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayweatherplugin
+include ( ../../../include.pro )
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro
index 9e32362..92dd2f6 100644
--- a/noncore/tools/calc2/binary/binary.pro
+++ b/noncore/tools/calc2/binary/binary.pro
@@ -1,29 +1,33 @@
 #TEMPLATE = lib
 #CONFIG -= moc
 #CONFIG += qt release
 ## Input
 #INTERFACES += binary.ui
 #HEADERS = binaryimpl.h \
        #    binaryfactory.h 
 #SOURCES = binaryimpl.cpp \
        #    binaryfactory.cpp
 #INCLUDEPATH     += $(OPIEDIR)/include \
        #           $(OPIEDIR)/calc2
 #DEPENDPATH      += $(OPIEDIR)/include 
 #DESTDIR = $(OPIEDIR)/plugins/calculator
 #TARGET = binary
 #
 #TRANSLATIONS = ../../../../i18n/de/libbinary.ts \
        # ../../../../i18n/en/libbinary.ts \
        # ../../../../i18n/es/libbinary.ts \
        # ../../../../i18n/fr/libbinary.ts \
        # ../../../../i18n/hu/libbinary.ts \
        # ../../../../i18n/ja/libbinary.ts \
        # ../../../../i18n/ko/libbinary.ts \
        # ../../../../i18n/no/libbinary.ts \
        # ../../../../i18n/pl/libbinary.ts \
        # ../../../../i18n/pt/libbinary.ts \
        # ../../../../i18n/pt_BR/libbinary.ts \
        # ../../../../i18n/sl/libbinary.ts \
        # ../../../../i18n/zh_CN/libbinary.ts \
        # ../../../../i18n/zh_TW/libbinary.ts
+include ( ../../../../include.pro )
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index f9553ef..31b277f 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -1,25 +1,29 @@
 #TEMPLATE = app
 #CONFIG += qt release
 ## Input
 #HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
 #SOURCES += calc.cpp main.cpp engine.cpp
 #INCLUDEPATH     += $(OPIEDIR)/include 
 #DEPENDPATH      += $(OPIEDIR)/include 
 #LIBS += -lqpe -Wl,-export-dynamic 
 #TARGET = calc
 #DESTDIR = $(OPIEDIR)/bin
 #
 #TRANSLATIONS = ../../../i18n/de/calc.pro \
        # ../../../i18n/en/calc.pro \
        # ../../../i18n/es/calc.pro \
        # ../../../i18n/fr/calc.pro \
        # ../../../i18n/hu/calc.pro \
        # ../../../i18n/ja/calc.pro \
        # ../../../i18n/ko/calc.pro \
        # ../../../i18n/no/calc.pro \
        # ../../../i18n/pl/calc.pro \
        # ../../../i18n/pt/calc.pro \
        # ../../../i18n/pt_BR/calc.pro \
        # ../../../i18n/sl/calc.pro \
        # ../../../i18n/zh_CN/calc.pro \
        # ../../../i18n/zh_TW/calc.pro
+include ( ../../../include.pro )
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro
index c114dde..772db73 100644
--- a/noncore/tools/calc2/simple/simple.pro
+++ b/noncore/tools/calc2/simple/simple.pro
@@ -1,26 +1,30 @@
 #TEMPLATE = lib
 #CONFIG -= moc
 #CONFIG += qt release
 ## Input
 #INTERFACES += simple.ui
 #HEADERS = simpleimpl.h  simplefactory.h stdinstructions.h
 #SOURCES = simpleimpl.cpp simplefactory.cpp
 #INCLUDEPATH     += $(OPIEDIR)/include \
        #           $(OPIEDIR)/calc2
 #DEPENDPATH      += $(OPIEDIR)/include 
 #DESTDIR = $(OPIEDIR)/plugins/calculator
 #
 #TRANSLATIONS = ../../../../i18n/de/lib.ts \
        # ../../../../i18n/en/lib.ts \
        # ../../../../i18n/es/lib.ts \
        # ../../../../i18n/fr/lib.ts \
        # ../../../../i18n/hu/lib.ts \
        # ../../../../i18n/ja/lib.ts \
        # ../../../../i18n/ko/lib.ts \
        # ../../../../i18n/no/lib.ts \
        # ../../../../i18n/pl/lib.ts \
        # ../../../../i18n/pt/lib.ts \
        # ../../../../i18n/pt_BR/lib.ts \
        # ../../../../i18n/sl/lib.ts \
        # ../../../../i18n/zh_CN/lib.ts \
        # ../../../../i18n/zh_TW/lib.ts
+include ( ../../../../include.pro )
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index eed584f..280d202 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -1,28 +1,32 @@
        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = calculatorimpl.h
        SOURCES         = calculatorimpl.cpp \
                  main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= calculator.ui
        TARGET  = calculator
 TRANSLATIONS = ../../../i18n/de/calculator.ts \
         ../../../i18n/xx/calculator.ts \
         ../../../i18n/en/calculator.ts \
         ../../../i18n/es/calculator.ts \
         ../../../i18n/fr/calculator.ts \
         ../../../i18n/hu/calculator.ts \
         ../../../i18n/ja/calculator.ts \
         ../../../i18n/ko/calculator.ts \
         ../../../i18n/no/calculator.ts \
         ../../../i18n/pl/calculator.ts \
         ../../../i18n/pt/calculator.ts \
         ../../../i18n/pt_BR/calculator.ts \
         ../../../i18n/sl/calculator.ts \
         ../../../i18n/zh_CN/calculator.ts \
         ../../../i18n/zh_TW/calculator.ts \
         ../../../i18n/da/calculator.ts
+include ( ../../../include.pro )
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index 086349e..c4ffdb9 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -1,28 +1,32 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = clock.h setAlarm.h
 SOURCES   = clock.cpp setAlarm.cpp \
      main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 INTERFACES  =
 TARGET    = clock
 TRANSLATIONS = ../../../i18n/de/clock.ts \
         ../../../i18n/xx/clock.ts \
         ../../../i18n/en/clock.ts \
         ../../../i18n/es/clock.ts \
         ../../../i18n/fr/clock.ts \
         ../../../i18n/hu/clock.ts \
         ../../../i18n/ja/clock.ts \
         ../../../i18n/ko/clock.ts \
         ../../../i18n/no/clock.ts \
         ../../../i18n/pl/clock.ts \
         ../../../i18n/pt/clock.ts \
         ../../../i18n/pt_BR/clock.ts \
         ../../../i18n/sl/clock.ts \
         ../../../i18n/zh_CN/clock.ts \
         ../../../i18n/zh_TW/clock.ts \
         ../../../i18n/da/clock.ts
+include ( ../../../include.pro )
diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro
index 2c08e4c..48520da 100644
--- a/noncore/tools/formatter/formatter.pro
+++ b/noncore/tools/formatter/formatter.pro
@@ -1,26 +1,30 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = formatter.h inputDialog.h output.h
 SOURCES   = formatter.cpp inputDialog.cpp output.cpp main.cpp
 TARGET    = formatter
 DESTDIR   = $(OPIEDIR)/bin
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 TRANSLATIONS = ../../../i18n/de/formatter.ts \
         ../../../i18n/da/formatter.ts \
         ../../../i18n/xx/formatter.ts \
         ../../../i18n/en/formatter.ts \
         ../../../i18n/es/formatter.ts \
         ../../../i18n/fr/formatter.ts \
         ../../../i18n/hu/formatter.ts \
         ../../../i18n/ja/formatter.ts \
         ../../../i18n/ko/formatter.ts \
         ../../../i18n/no/formatter.ts \
         ../../../i18n/pl/formatter.ts \
         ../../../i18n/pt/formatter.ts \
         ../../../i18n/pt_BR/formatter.ts \
         ../../../i18n/sl/formatter.ts \
         ../../../i18n/zh_CN/formatter.ts \
         ../../../i18n/zh_TW/formatter.ts
+include ( ../../../include.pro )
diff --git a/noncore/tools/opie-sh/opie-sh.pro b/noncore/tools/opie-sh/opie-sh.pro
index c6c1846..373df7d 100644
--- a/noncore/tools/opie-sh/opie-sh.pro
+++ b/noncore/tools/opie-sh/opie-sh.pro
@@ -1,26 +1,30 @@
        TEMPLATE                =app
        CONFIG                  +=qt warn_on release
        DESTDIR                         =$(OPIEDIR)/bin
        HEADERS                         =mbox.h fviewer.h inputdialog.h
        SOURCES                         =opie-sh.cpp mbox.cpp fviewer.cpp inputdialog.cpp
        INCLUDEPATH     +=$(OPIEDIR)/include
        DEPENDPATH      +=$(OPIEDIR)/include
        LIBS                                    +=-lqpe
 TARGET                   = opie-sh
 TRANSLATIONS = ../../../i18n/de/opie-sh.ts \
         ../../../i18n/da/opie-sh.ts \
         ../../../i18n/xx/opie-sh.ts \
         ../../../i18n/en/opie-sh.ts \
         ../../../i18n/es/opie-sh.ts \
         ../../../i18n/fr/opie-sh.ts \
         ../../../i18n/hu/opie-sh.ts \
         ../../../i18n/ja/opie-sh.ts \
         ../../../i18n/ko/opie-sh.ts \
         ../../../i18n/no/opie-sh.ts \
         ../../../i18n/pl/opie-sh.ts \
         ../../../i18n/pt/opie-sh.ts \
         ../../../i18n/pt_BR/opie-sh.ts \
         ../../../i18n/sl/opie-sh.ts \
         ../../../i18n/zh_CN/opie-sh.ts \
         ../../../i18n/zh_TW/opie-sh.ts
+include ( ../../../include.pro )
diff --git a/noncore/tools/remote/remote.pro b/noncore/tools/remote/remote.pro
index 277c5ef..50fcdbb 100644
--- a/noncore/tools/remote/remote.pro
+++ b/noncore/tools/remote/remote.pro
@@ -1,26 +1,30 @@
        TEMPLATE=app
        CONFIG  +=qt warn_on release
        DESTDIR         =$(OPIEDIR)/bin
        HEADERS         = remotetab.h learntab.h configtab.h topgroup.h dvdgroup.h channelgroup.h vcrgroup.h buttondialog.h topgroupconf.h dvdgroupconf.h channelgroupconf.h vcrgroupconf.h mainview.h recorddialog.h helptab.h
        SOURCES         =remote.cpp remotetab.cpp learntab.cpp configtab.cpp topgroup.cpp dvdgroup.cpp channelgroup.cpp vcrgroup.cpp buttondialog.cpp topgroupconf.cpp dvdgroupconf.cpp channelgroupconf.cpp vcrgroupconf.cpp mainview.cpp recorddialog.cpp helptab.cpp
        INCLUDEPATH+=$(OPIEDIR)/include
        DEPENDPATH+=$(OPIEDIR)/include
        LIBS    +=-lqpe -lopie
 TARGET          = remote
 TRANSLATIONS = ../../../i18n/de/remote.ts \
         ../../../i18n/da/remote.ts \
         ../../../i18n/xx/remote.ts \
         ../../../i18n/en/remote.ts \
         ../../../i18n/es/remote.ts \
         ../../../i18n/fr/remote.ts \
         ../../../i18n/hu/remote.ts \
         ../../../i18n/ja/remote.ts \
         ../../../i18n/ko/remote.ts \
         ../../../i18n/no/remote.ts \
         ../../../i18n/pl/remote.ts \
         ../../../i18n/pt/remote.ts \
         ../../../i18n/pt_BR/remote.ts \
         ../../../i18n/sl/remote.ts \
         ../../../i18n/zh_CN/remote.ts \
         ../../../i18n/zh_TW/remote.ts
+include ( ../../../include.pro )
diff --git a/noncore/unsupported/filebrowser/filebrowser.pro b/noncore/unsupported/filebrowser/filebrowser.pro
index a98e293..c3f5427 100644
--- a/noncore/unsupported/filebrowser/filebrowser.pro
+++ b/noncore/unsupported/filebrowser/filebrowser.pro
@@ -1,27 +1,31 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = inlineedit.h  filebrowser.h filePermissions.h
        SOURCES         = filebrowser.cpp inlineedit.cpp filePermissions.cpp main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES=
 TRANSLATIONS = ../../../i18n/de/filebrowser.ts \
         ../../../i18n/da/filebrowser.ts \
         ../../../i18n/xx/filebrowser.ts \
         ../../../i18n/en/filebrowser.ts \
         ../../../i18n/es/filebrowser.ts \
         ../../../i18n/fr/filebrowser.ts \
         ../../../i18n/hu/filebrowser.ts \
         ../../../i18n/ja/filebrowser.ts \
         ../../../i18n/ko/filebrowser.ts \
         ../../../i18n/no/filebrowser.ts \
         ../../../i18n/pl/filebrowser.ts \
         ../../../i18n/pt/filebrowser.ts \
         ../../../i18n/pt_BR/filebrowser.ts \
         ../../../i18n/sl/filebrowser.ts \
         ../../../i18n/zh_CN/filebrowser.ts \
         ../../../i18n/it/filebrowser.ts \
         ../../../i18n/zh_TW/filebrowser.ts
+include ( ../../../include.pro )
diff --git a/noncore/unsupported/gsmtool/gsmtool.pro b/noncore/unsupported/gsmtool/gsmtool.pro
index a5d3797..9a55fce 100644
--- a/noncore/unsupported/gsmtool/gsmtool.pro
+++ b/noncore/unsupported/gsmtool/gsmtool.pro
@@ -1,31 +1,35 @@
        TEMPLATE= app
        #CONFIG         = qt warn_on debug
        CONFIG  = qt warn_on release
 DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = gsmtool.h
        SOURCES         = main.cpp gsmtool.cpp
 # This doesn't actually work...
 TMAKE_CXXFLAGS  += -fexceptions
        INCLUDEPATH+= $(OPIEDIR)/include
        INCLUDEPATH+= $(GSMLIBDIR)
        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -L$(GSMLIBDIR)/gsmlib/.libs -lgsmme
        INTERFACES= gsmtoolbase.ui
        TARGET  = gsmtool
 TRANSLATIONS = ../../../i18n/de/gsmtool.ts \
         ../../../i18n/da/gsmtool.ts \
         ../../../i18n/xx/gsmtool.ts \
         ../../../i18n/en/gsmtool.ts \
         ../../../i18n/es/gsmtool.ts \
         ../../../i18n/fr/gsmtool.ts \
         ../../../i18n/hu/gsmtool.ts \
         ../../../i18n/ja/gsmtool.ts \
         ../../../i18n/ko/gsmtool.ts \
         ../../../i18n/no/gsmtool.ts \
         ../../../i18n/pl/gsmtool.ts \
         ../../../i18n/pt/gsmtool.ts \
         ../../../i18n/pt_BR/gsmtool.ts \
         ../../../i18n/sl/gsmtool.ts \
         ../../../i18n/zh_CN/gsmtool.ts \
         ../../../i18n/zh_TW/gsmtool.ts
+include ( ../../../include.pro )
diff --git a/noncore/unsupported/mail2/bend/bend.pro b/noncore/unsupported/mail2/bend/bend.pro
index c03ebd2..117e18e 100644
--- a/noncore/unsupported/mail2/bend/bend.pro
+++ b/noncore/unsupported/mail2/bend/bend.pro
@@ -1,27 +1,31 @@
        TEMPLATE        =lib
        CONFIG          +=qt warn_on release
        HEADERS                 +=bend.h \
                        bendimpl.h
        SOURCES                 +=bend.cpp \
                        bendimpl.cpp
        INCLUDEPATH     +=$(OPIEDIR)/include ../libmail
        LIBS            +=-lmail -lqpe
        TARGET          =bend
        DESTDIR                 +=$(OPIEDIR)/plugins/applets/
 TRANSLATIONS = ../../../i18n/de/libbend.ts \
         ../../../i18n/da/libbend.ts \
         ../../../i18n/xx/libbend.ts \
         ../../../i18n/en/libbend.ts \
         ../../../i18n/es/libbend.ts \
         ../../../i18n/fr/libbend.ts \
         ../../../i18n/hu/libbend.ts \
         ../../../i18n/ja/libbend.ts \
         ../../../i18n/ko/libbend.ts \
         ../../../i18n/no/libbend.ts \
         ../../../i18n/pl/libbend.ts \
         ../../../i18n/pt/libbend.ts \
         ../../../i18n/pt_BR/libbend.ts \
         ../../../i18n/sl/libbend.ts \
         ../../../i18n/zh_CN/libbend.ts \
         ../../../i18n/zh_TW/libbend.ts
+include ( ../../../include.pro )
diff --git a/noncore/unsupported/mail2/libmail/libmail.pro b/noncore/unsupported/mail2/libmail/libmail.pro
index 2bee479..1d5a4c1 100644
--- a/noncore/unsupported/mail2/libmail/libmail.pro
+++ b/noncore/unsupported/mail2/libmail/libmail.pro
@@ -1,41 +1,45 @@
        TEMPLATE        =lib
        CONFIG          =qt warn_on debug
        #CONFIG                 =qt warn_on release
        HEADERS                 =configfile.h \
                        defines.h \
                        imapbase.h \
                        imaphandler.h \
                        imapresponse.h \
                        mailfactory.h \
                        md5.cpp \
                        miscfunctions.h \
                        smtphandler.h
        SOURCES                 =configfile.cpp \
                        imapbase.cpp \
                        imaphandler.cpp \
                        imapresponse.cpp \
                        mailfactory.cpp \
                        md5.h \
                        miscfunctions.cpp \
                        smtphandler.cpp
        INCLUDEPATH     +=$(OPIEDIR)/include
        LIBS            +=-L$(OPIEDIR)/lib -lqpe
        TARGET          =mail
        DESTDIR                 =$(QTDIR)/lib
 TRANSLATIONS = ../../../i18n/de/libmail.ts \
         ../../../i18n/da/libmail.ts \
         ../../../i18n/xx/libmail.ts \
         ../../../i18n/en/libmail.ts \
         ../../../i18n/es/libmail.ts \
         ../../../i18n/fr/libmail.ts \
         ../../../i18n/hu/libmail.ts \
         ../../../i18n/ja/libmail.ts \
         ../../../i18n/ko/libmail.ts \
         ../../../i18n/no/libmail.ts \
         ../../../i18n/pl/libmail.ts \
         ../../../i18n/pt/libmail.ts \
         ../../../i18n/pt_BR/libmail.ts \
         ../../../i18n/sl/libmail.ts \
         ../../../i18n/zh_CN/libmail.ts \
         ../../../i18n/zh_TW/libmail.ts
+include ( ../../../include.pro )
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro
index 3378153..407545f 100644
--- a/noncore/unsupported/mail2/mail.pro
+++ b/noncore/unsupported/mail2/mail.pro
@@ -1,63 +1,67 @@
        TEMPLATE        = app
        CONFIG          = qt warn_on debug
        #CONFIG                 = qt warn_on release
        HEADERS                 = accounteditor.h \
                          addresspicker.h \
                          composer.h \
                          composerbase.h \
                          configdiag.h \
                          folderwidget.h \
                          listviewplus.h \
                        mailstatusbar.h \
                          mailtable.h \
                          mainwindow.h \
                          mainwindowbase.h \
                          opendiag.h \
                          rename.h \
                          searchdiag.h \
                          viewmail.h \
                          viewmailbase.h
        SOURCES                 = accounteditor.cpp \
                          addresspicker.cpp \
                          composer.cpp \
                          composerbase.cpp \
                          configdiag.cpp \
                          folderwidget.cpp \
                          listviewplus.cpp \
                        mailstatusbar.cpp \
                          mailtable.cpp \
                          main.cpp \
                          mainwindow.cpp \
                          mainwindowbase.cpp \
                          opendiag.cpp \
                          rename.cpp \
                          searchdiag.cpp \
                          viewmail.cpp \
                          viewmailbase.cpp
        INTERFACES      = accounteditorbase.ui \
                          addresspickerbase.ui \
                          configdiagbase.ui \
                          opendiagbase.ui \
                          renamebase.ui \
                          searchdiagbase.ui
        INCLUDEPATH    += $(OPIEDIR)/include libmail
        LIBS           += -lmail -lqpe -lopie
        TARGET          = mail 
        DESTDIR                 = $(OPIEDIR)/bin
 TRANSLATIONS = ../../i18n/de/mail.ts \
         ../../i18n/da/mail.ts \
         ../../i18n/xx/mail.ts \
         ../../i18n/en/mail.ts \
         ../../i18n/es/mail.ts \
         ../../i18n/fr/mail.ts \
         ../../i18n/hu/mail.ts \
         ../../i18n/ja/mail.ts \
         ../../i18n/ko/mail.ts \
         ../../i18n/no/mail.ts \
         ../../i18n/pl/mail.ts \
         ../../i18n/pt/mail.ts \
         ../../i18n/pt_BR/mail.ts \
         ../../i18n/sl/mail.ts \
         ../../i18n/zh_CN/mail.ts \
         ../../i18n/zh_TW/mail.ts
+include ( ../../include.pro )
diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro
index 7b933e1..0cbaf47 100644
--- a/noncore/unsupported/oipkg/oipkg.pro
+++ b/noncore/unsupported/oipkg/oipkg.pro
@@ -1,55 +1,59 @@
        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        #CONFIG         = qt warn_on release
        CONFIG  = qt warn_on debug
        HEADERS         = mainwindow.h \
                pksettings.h \
                pmipkg.h \
                packagelistdoclnk.h \
                installdialog.h \
                utils.h \
                listviewitemoipkg.h \
                packagelistitem.h \
                packagelistremote.h \
                packagelist.h \
                packagelistlocal.h \
                packagelistview.h \
                package.h
        SOURCES         = main.cpp \
                mainwindow.cpp \
                utils.cpp \
                packagelistdoclnk.cpp \
                packagelistview.cpp \
                installdialog.cpp \
                listviewitemoipkg.cpp \
                packagelistremote.cpp \
                packagelistlocal.cpp \
                pksettings.cpp \
                pmipkg.cpp \
                packagelistitem.cpp \
                packagelist.cpp \
                package.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/ioclude
 LIBS            += -lqpe
 LIBS            += -lopie
        INTERFACES= runwindow.ui \
                pksettingsbase.ui
        TARGET  = oipkg
 TRANSLATIONS = ../../../i18n/de/oipkg.ts \
         ../../../i18n/da/oipkg.ts \
         ../../../i18n/xx/oipkg.ts \
         ../../../i18n/en/oipkg.ts \
         ../../../i18n/es/oipkg.ts \
         ../../../i18n/fr/oipkg.ts \
         ../../../i18n/hu/oipkg.ts \
         ../../../i18n/ja/oipkg.ts \
         ../../../i18n/ko/oipkg.ts \
         ../../../i18n/no/oipkg.ts \
         ../../../i18n/pl/oipkg.ts \
         ../../../i18n/pt/oipkg.ts \
         ../../../i18n/pt_BR/oipkg.ts \
         ../../../i18n/sl/oipkg.ts \
         ../../../i18n/zh_CN/oipkg.ts \
         ../../../i18n/zh_TW/oipkg.ts
+include ( ../../../include.pro )
diff --git a/noncore/unsupported/qpdf/qpdf.pro b/noncore/unsupported/qpdf/qpdf.pro
index 8c73477..7c92eda 100644
--- a/noncore/unsupported/qpdf/qpdf.pro
+++ b/noncore/unsupported/qpdf/qpdf.pro
@@ -1,72 +1,76 @@
 TEMPLATE    =  app
 CONFIG      *= qt embedded release warn_off
 CONFIG      -= warn_on
 SOURCES     =  xpdf/Array.cc \
               xpdf/BuiltinFont.cc \
               xpdf/BuiltinFontTables.cc \
               xpdf/CMap.cc \
               xpdf/Catalog.cc \
               xpdf/CharCodeToUnicode.cc \
               xpdf/Decrypt.cc \
               xpdf/Dict.cc \
               xpdf/Error.cc \
               xpdf/FontEncodingTables.cc \
               xpdf/Annot.cc \
               xpdf/Function.cc \
               xpdf/Gfx.cc \
               xpdf/GfxFont.cc \
               xpdf/GfxState.cc \
               xpdf/GlobalParams.cc \
               xpdf/Lexer.cc \
               xpdf/Link.cc \
               xpdf/NameToCharCode.cc \
               xpdf/Object.cc \
               xpdf/OutputDev.cc \
               xpdf/PDFDoc.cc \
               xpdf/Page.cc \
               xpdf/Parser.cc \
               xpdf/PSTokenizer.cc \
               xpdf/Stream.cc \
               xpdf/TextOutputDev.cc \
               xpdf/UnicodeMap.cc \
                       xpdf/XRef.cc \
               goo/GHash.cc \
               goo/GString.cc \
               goo/GList.cc \
               QOutputDev.cpp \
               QPEOutputDev.cpp \
               qpdf.cpp \
               qbusybar.cpp \
               gooStub.cpp
 HEADERS     =  QOutputDev.h \
               QPEOutputDev.h \
               qbusybar.h \
               qpdf.h
 INCLUDEPATH += . \
               .. \
               xpdf \
               $(OPIEDIR)/include \
               ../goo \ 
               goo
               
 LIBS        += -L $(OPIEDIR)/lib -lqpe -lopie -lstdc++
 DESTDIR      = $(OPIEDIR)/bin
 TARGET       = qpdf
 TRANSLATIONS = ../../../i18n/de/qpdf.ts \
         ../../../i18n/da/qpdf.ts \
         ../../../i18n/xx/qpdf.ts \
         ../../../i18n/en/qpdf.ts \
         ../../../i18n/es/qpdf.ts \
         ../../../i18n/fr/qpdf.ts \
         ../../../i18n/hu/qpdf.ts \
         ../../../i18n/ja/qpdf.ts \
         ../../../i18n/ko/qpdf.ts \
         ../../../i18n/no/qpdf.ts \
         ../../../i18n/pl/qpdf.ts \
         ../../../i18n/pt/qpdf.ts \
         ../../../i18n/pt_BR/qpdf.ts \
         ../../../i18n/sl/qpdf.ts \
         ../../../i18n/zh_CN/qpdf.ts \
         ../../../i18n/it/qpdf.ts \
         ../../../i18n/zh_TW/qpdf.ts
+include ( ../../../include.pro )
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 1797b98..cbe2014 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -119,192 +119,193 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
            t << var("QMAKE_LINK") << endl;
        t << "LFLAGS   = " << var("QMAKE_LFLAGS") << endl;
        t << "LIBS     = " << "$(SUBLIBS) " << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << endl;
    }
    t << "AR       = " << var("QMAKE_AR") << endl;
    t << "RANLIB   = " << var("QMAKE_RANLIB") << endl;
    t << "MOC      = " << var("QMAKE_MOC") << endl;
            t << "UIC      = "<< var("QMAKE_UIC") << endl;
            t << "QMAKE    = "<< (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
            t << "TAR      = "<< var("QMAKE_TAR") << endl;
    t << "GZIP     = " << var("QMAKE_GZIP") << endl;
    t << "COPY     = " << var("QMAKE_COPY") << endl;
    t << "COPY_FILE= " << var("QMAKE_COPY_FILE") << endl;
    t << "COPY_DIR = " << var("QMAKE_COPY_DIR") << endl;
    t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl;
    t << "SYMLINK  = " << var("QMAKE_SYMBOLIC_LINK") << endl;
    t << "DEL_DIR  = " << var("QMAKE_DEL_DIR") << endl;
    t << "MOVE     = " << var("QMAKE_MOVE") << endl;
    t << endl;
    t << "####### Output directory" << endl << endl;
    if (! project->variables()["OBJECTS_DIR"].isEmpty())
        t << "OBJECTS_DIR = " << var("OBJECTS_DIR") << endl;
    else
        t << "OBJECTS_DIR = ./" << endl;
    t << endl;
    /* files */
    t << "####### Files" << endl << endl;
    t << "HEADERS = " << varList("HEADERS") << endl;
    t << "SOURCES = " << varList("SOURCES") << endl;
    if(do_incremental) {
        QStringList &objs = project->variables()["OBJECTS"], &incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
        t << "OBJECTS = ";
        for(QStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
            bool increment = FALSE;
            for(QStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
                if((*objit).find(QRegExp((*incrit), TRUE, TRUE)) != -1) {
                    increment = TRUE;
                    incrs_out.append((*objit));
                    break;
                }
            }
            if(!increment)
                t << "\\\n\t\t" << (*objit);
        }
        if(incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done!
            t << incrs_out.join(" \\\n\t\t") << endl;
        } else if(!incrs_out.count()) {
            t << endl;
        } else {
            src_incremental = TRUE;
            t << endl;
            t << "INCREMENTAL_OBJECTS = " << incrs_out.join(" \\\n\t\t") << endl;
        }
    } else {
        t << "OBJECTS = " << varList("OBJECTS") << endl;
    }
    t << "FORMS = " << varList("FORMS") << endl;
    t << "UICDECLS = " << varList("UICDECLS") << endl;
    t << "UICIMPLS = " << varList("UICIMPLS") << endl;
    QString srcMoc = varList("SRCMOC"), objMoc = varList("OBJMOC");
    t << "SRCMOC   = " << srcMoc << endl;
    if(do_incremental) {
        QStringList &objs = project->variables()["OBJMOC"],
                   &incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
        t << "OBJMOC = ";
        for(QStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
            bool increment = FALSE;
            for(QStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
                if((*objit).find(QRegExp((*incrit), TRUE, TRUE)) != -1) {
                    increment = TRUE;
                    incrs_out.append((*objit));
                    break;
                }
            }
            if(!increment)
                t << "\\\n\t\t" << (*objit);
        }
        if(incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done!
            t << incrs_out.join(" \\\n\t\t") << endl;
        } else if(!incrs_out.count()) {
            t << endl;
        } else {
            moc_incremental = TRUE;
            t << endl;
            t << "INCREMENTAL_OBJMOC = " << incrs_out.join(" \\\n\t\t") << endl;
        }
    } else {
        t << "OBJMOC = " << objMoc << endl;
    }
    if(do_incremental && !moc_incremental && !src_incremental)
        do_incremental = FALSE;
            t << "DIST   = " << varList("DISTFILES") << endl;
+    t << "PRO      = " << fileFixify(project->projectFile()) << endl;
    t << "QMAKE_TARGET = " << var("QMAKE_ORIG_TARGET") << endl;
    t << "DESTDIR  = " << var("DESTDIR") << endl;
    t << "TARGET   = " << var("TARGET") << endl;
    if(project->isActiveConfig("plugin") ) {
        t << "TARGETD   = " << var("TARGET") << endl;
    } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
                t << "TARGETA= " << var("TARGETA") << endl;
        if (os == "hpux") {
                    t << "TARGETD= " << var("TARGET_x") << endl;
                    t << "TARGET0= " << var("TARGET_") << endl;
        }
        else {
                    t << "TARGETD= " << var("TARGET_x.y.z") << endl;
                    t << "TARGET0= " << var("TARGET_") << endl;
                    t << "TARGET1= " << var("TARGET_x") << endl;
                    t << "TARGET2= " << var("TARGET_x.y") << endl;
        }
    }
    t << endl;
    // blasted incldues
    QStringList &qeui = project->variables()["QMAKE_EXTRA_UNIX_INCLUDES"];
    QStringList::Iterator it;
    for( it = qeui.begin(); it != qeui.end(); ++it)
        t << "include " << (*it) << endl;
    /* rules */
    t << "first: all" << endl;
    t << "####### Implicit rules" << endl << endl;
    t << ".SUFFIXES: .c";
    QStringList::Iterator cppit;
    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
        t << " " << (*cppit);
    t << endl << endl;
    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
        t << (*cppit) << ".o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
    t << ".c.o:\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
    if(include_deps) {
        QString cmd=var("QMAKE_CFLAGS_DEPS") + " ";
        cmd += varGlue("DEFINES","-D"," -D","") + varGlue("PRL_EXPORT_DEFINES"," -D"," -D","");
        if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
            cmd += " -I" + project->first("QMAKE_ABSOLUTE_SOURCE_PATH") + " ";
        cmd += " $(INCPATH) " + varGlue("DEPENDPATH", "-I", " -I", "");
        QString odir;
        if(!project->variables()["OBJECTS_DIR"].isEmpty())
            odir = project->first("OBJECTS_DIR");
        t << "###### Dependancies" << endl << endl;
        t << odir << ".deps/%.d: %.cpp\n\t"
          << "@echo Creating depend for $<" << "\n\t"
          << "@test -d $(@D) || mkdir -p $(@D)" << "\n\t"
          << "@$(CXX) " << cmd << " $< | sed \"s,^\\($(*F).o\\):," << odir << "\\1:,g\" >$@" << endl << endl;
        t << odir << ".deps/%.d: %.c\n\t"
          << "@echo Creating depend for $<" << "\n\t"
          << "@test -d $(@D) || mkdir -p $(@D)" << "\n\t"
          << "@$(CC) " << cmd << " $< | sed \"s,^\\($(*F).o\\):," << odir << "\\1:,g\" >$@" << endl << endl;
        QString src[] = { "SOURCES", "UICIMPLS", "SRCMOC", QString::null };
        for(int x = 0; !src[x].isNull(); x++) {
            QStringList &l = project->variables()[src[x]];
            for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
                if(!(*it).isEmpty()) {
                    QString d_file;
                    if((*it).endsWith(".c")) {
                        d_file = (*it).left((*it).length() - 2);
                    } else {
                        for(QStringList::Iterator cppit = Option::cpp_ext.begin();
                            cppit != Option::cpp_ext.end(); ++cppit) {
                            if((*it).endsWith((*cppit))) {
                                d_file = (*it).left((*it).length() - (*cppit).length());
                                break;
                            }
                        }
                    }
                    if(!d_file.isEmpty()) {
                        d_file = odir + ".deps/" + d_file + ".d";
                        QStringList deps = findDependencies((*it)).grep(QRegExp(Option::moc_ext + "$"));
                        if(!deps.isEmpty())
                            t << d_file << ": " << deps.join(" ") << endl;
                        t << "-include " << d_file << endl;
                    }
                }
            }
        }
    }
    t << "####### Build rules" << endl << endl;
    if(!project->variables()["SUBLIBS"].isEmpty()) {
        QString libdir = "tmp/";
        if(!project->isEmpty("SUBLIBS_DIR"))
            libdir = project->first("SUBLIBS_DIR");
        t << "SUBLIBS= ";
        QStringList &l = project->variables()["SUBLIBS"];
        for(QStringList::Iterator it = l.begin(); it != l.end(); ++it)
diff --git a/quickexec/quickexec.pro b/quickexec/quickexec.pro
index 007510b..c0e77b8 100644
--- a/quickexec/quickexec.pro
+++ b/quickexec/quickexec.pro
@@ -1,24 +1,28 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = 
        SOURCES         = quickexec.cpp
 LIBS += -ldl -lqpe
        TARGET  = quickexec
 TRANSLATIONS = ../i18n/de/quickexec.ts \
         ../i18n/da/quickexec.ts \
         ../i18n/xx/quickexec.ts \
         ../i18n/en/quickexec.ts \
         ../i18n/es/quickexec.ts \
         ../i18n/fr/quickexec.ts \
         ../i18n/hu/quickexec.ts \
         ../i18n/ja/quickexec.ts \
         ../i18n/ko/quickexec.ts \
         ../i18n/no/quickexec.ts \
         ../i18n/pl/quickexec.ts \
         ../i18n/pt/quickexec.ts \
         ../i18n/pt_BR/quickexec.ts \
         ../i18n/sl/quickexec.ts \
         ../i18n/zh_CN/quickexec.ts \
         ../i18n/zh_TW/quickexec.ts
+include ( ../include.pro )
diff --git a/x11/ipc/server/ocopserver.pro b/x11/ipc/server/ocopserver.pro
index e0a928c..b6d4af5 100644
--- a/x11/ipc/server/ocopserver.pro
+++ b/x11/ipc/server/ocopserver.pro
@@ -1,10 +1,14 @@
        TEMPLATE= app
 DESTDIR         = $(OPIEDIR)/bin
        CONFIG  = qt warn_on debug
        #CONFIG         = qt warn_on release
        HEADERS         = ../common/ocoppacket.h ocopclient.h ocopserver.h
        SOURCES         = ../common/ocoppacket.cpp main.cpp ocopserver.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        TARGET  = ocopserver
+include ( ../../../include.pro )
diff --git a/x11/ipc/server/server.pro b/x11/ipc/server/server.pro
index e0a928c..b6d4af5 100644
--- a/x11/ipc/server/server.pro
+++ b/x11/ipc/server/server.pro
@@ -1,10 +1,14 @@
        TEMPLATE= app
 DESTDIR         = $(OPIEDIR)/bin
        CONFIG  = qt warn_on debug
        #CONFIG         = qt warn_on release
        HEADERS         = ../common/ocoppacket.h ocopclient.h ocopserver.h
        SOURCES         = ../common/ocoppacket.cpp main.cpp ocopserver.cpp
        INCLUDEPATH+= $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
        TARGET  = ocopserver
+include ( ../../../include.pro )
diff --git a/x11/libqpe-x11/libqpe-x11.pro b/x11/libqpe-x11/libqpe-x11.pro
index 459d3ba..1671ffa 100644
--- a/x11/libqpe-x11/libqpe-x11.pro
+++ b/x11/libqpe-x11/libqpe-x11.pro
@@ -48,96 +48,100 @@ HEADERS	=   ../../library/calendar.h \
            ../../library/ir.h \
            ../../library/backend/vobject_p.h \
            ../../library/findwidget_p.h \
            ../../library/finddialog.h \
            ../../library/lnkproperties.h \
            ../../library/windowdecorationinterface.h \
            ../../library/textcodecinterface.h \
            ../../library/imagecodecinterface.h \
            ../../library/fontdatabase.h \
            qt/qcopchannel_qws.h \
            qpe/qpeapplication.h \
            qpe/fontmanager.h \
            ../ipc/client/ocopclient.h \
            ../ipc/common/ocoppacket.h
        SOURCES=   ../../library/calendar.cpp \
            ../../library/global.cpp \
            ../../library/xmlreader.cpp \
            ../../library/mimetype.cpp \
            ../../library/menubutton.cpp \
            ../../library/network.cpp \
            ../../library/networkinterface.cpp \
            ../../library/filemanager.cpp \
            ../../library/qdawg.cpp \
            ../../library/datebookmonth.cpp \
            ../../library/fileselector.cpp \
            ../../library/imageedit.cpp \
            ../../library/resource.cpp \
            ../../library/qcopenvelope_qws.cpp \
            ../../library/qpestyle.cpp \
            ../../library/qpedialog.cpp \
            ../../library/lightstyle.cpp \
            ../../library/config.cpp \
            ../../library/applnk.cpp \
            ../../library/sound.cpp \
            ../../library/tzselect.cpp \
            ../../library/qmath.c \
            ../../library/datebookdb.cpp \
            ../../library/alarmserver.cpp \
            ../../library/password.cpp \
            ../../library/process.cpp \
            ../../library/process_unix.cpp \
            ../../library/timestring.cpp \
            ../../library/power.cpp \
            ../../library/storage.cpp \
            ../../library/qpemessagebox.cpp \
            ../../library/backend/timeconversion.cpp \
            ../../library/qpedebug.cpp \
            ../../library/qpemenubar.cpp \
            ../../library/qpetoolbar.cpp \
            ../../library/backend/categories.cpp \
            ../../library/backend/stringutil.cpp \
            ../../library/backend/palmtoprecord.cpp \
            ../../library/backend/task.cpp \
            ../../library/backend/event.cpp \
            ../../library/backend/contact.cpp \
            ../../library/categorymenu.cpp \
            ../../library/categoryedit_p.cpp \
            ../../library/categoryselect.cpp \
            ../../library/categorywidget.cpp \
            ../../library/ir.cpp \
            ../../library/backend/vcc_yacc.cpp \
            ../../library/backend/vobject.cpp \
            ../../library/findwidget_p.cpp \
            ../../library/finddialog.cpp \
            ../../library/lnkproperties.cpp \
            ../../library/fontdatabase.cpp \
            qt/qcopchannel_qws.cpp \
            qpe/qpeapplication.cpp \
            ../ipc/client/ocopclient.cpp \
            ../ipc/common/ocoppacket.cpp
 # Qt 3 compatibility
 HEADERS +=  ../../library/quuid.h \
             ../../library/qcom.h \
             ../../library/qlibrary.h  \
              ../../library/qlibrary_p.h
 SOURCES +=  ../../library/quuid.cpp \
            ../../library/qlibrary.cpp \
            ../../library/qlibrary_unix.cpp
 INCLUDEPATH += $(OPIEDIR)/include backend
        LIBS    += -ldl -lcrypt -lm
 INTERFACES =  ../../library/passwordbase_p.ui \
              ../../library/categoryeditbase_p.ui \
              ../../library/findwidgetbase_p.ui \
              ../../library/lnkpropertiesbase_p.ui
        TARGET  = qpe
        DESTDIR         = $(QTDIR)/lib$(PROJMAK)
 # This is set by configure$(OPIEDIR).
        VERSION         = 1.5.0.1
+include ( ../../include.pro )
author	kergoth <kergoth>	2003-01-16 06:18:34 (UTC)
committer	kergoth <kergoth>	2003-01-16 06:18:34 (UTC)
commit	9a90cb1a9e61d2bc3298f2131671d9f32abbac5a (patch) (unidiff)
tree	1d2d0eb0372f32e682fe139b3e89882f381dc0db
parent	216efd1cb2210211816b865b5574866e598bf3bd (diff)
download	opie-9a90cb1a9e61d2bc3298f2131671d9f32abbac5a.zip opie-9a90cb1a9e61d2bc3298f2131671d9f32abbac5a.tar.gz opie-9a90cb1a9e61d2bc3298f2131671d9f32abbac5a.tar.bz2