diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index c9af693..6902d3e 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -7856,7 +7856,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++
 ++#include <tqstringlist.h>
 ++
-++#include <kapplication.h>
+++#include <tdeapplication.h>
 ++
 ++#include <iostream>
 ++
@@ -9007,9 +9007,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++#include <tdefilepicker.hxx>
 ++#include <tdecommandthread.hxx>
 ++
-++#include <kaboutdata.h>
-++#include <kapplication.h>
-++#include <kcmdlineargs.h>
+++#include <tdeaboutdata.h>
+++#include <tdeapplication.h>
+++#include <tdecmdlineargs.h>
 ++
 ++#include <iostream>
 ++#include <stdlib.h>
@@ -9102,7 +9102,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++
 ++#include <tdemodalityfilter.hxx>
 ++
-++#include <kapplication.h>
+++#include <tdeapplication.h>
 ++#include <kdialogbase.h>
 ++
 ++#include <netwm.h>
@@ -12183,9 +12183,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++
 ++
 ++/* ********* TDE base headers */
-++#include <kaboutdata.h>
-++#include <kapplication.h>
-++#include <kcmdlineargs.h>
+++#include <tdeaboutdata.h>
+++#include <tdeapplication.h>
+++#include <tdecmdlineargs.h>
 ++#include <tdeconfig.h>
 ++#include <tdeversion.h>
 ++#include <kemailsettings.h>
@@ -12196,7 +12196,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++#include <kmenubar.h>
 ++#include <kprotocolmanager.h>
 ++#include <kstartupinfo.h>
-++#include <kstyle.h>
+++#include <tdestyle.h>
 ++
 ++
 ++/* ********* TDE address book connectivity headers */
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
index e533f57..4079f73 100644
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@@ -7856,7 +7856,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++
 ++#include <tqstringlist.h>
 ++
-++#include <kapplication.h>
+++#include <tdeapplication.h>
 ++
 ++#include <iostream>
 ++
@@ -9007,9 +9007,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++#include <tdefilepicker.hxx>
 ++#include <tdecommandthread.hxx>
 ++
-++#include <kaboutdata.h>
-++#include <kapplication.h>
-++#include <kcmdlineargs.h>
+++#include <tdeaboutdata.h>
+++#include <tdeapplication.h>
+++#include <tdecmdlineargs.h>
 ++
 ++#include <iostream>
 ++#include <stdlib.h>
@@ -9102,7 +9102,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++
 ++#include <tdemodalityfilter.hxx>
 ++
-++#include <kapplication.h>
+++#include <tdeapplication.h>
 ++#include <kdialogbase.h>
 ++
 ++#include <netwm.h>
@@ -12183,9 +12183,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++
 ++
 ++/* ********* TDE base headers */
-++#include <kaboutdata.h>
-++#include <kapplication.h>
-++#include <kcmdlineargs.h>
+++#include <tdeaboutdata.h>
+++#include <tdeapplication.h>
+++#include <tdecmdlineargs.h>
 ++#include <tdeconfig.h>
 ++#include <tdeversion.h>
 ++#include <kemailsettings.h>
@@ -12196,7 +12196,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++#include <kmenubar.h>
 ++#include <kprotocolmanager.h>
 ++#include <kstartupinfo.h>
-++#include <kstyle.h>
+++#include <tdestyle.h>
 ++
 ++
 ++/* ********* TDE address book connectivity headers */
diff --git a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
index 2a9bab3..dedc390 100644
--- a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
@@ -1548,9 +1548,9 @@ index 0000000..d0f1444
 +
 +
 +/* ********* TDE base headers */
-+#include <kaboutdata.h>
-+#include <kapplication.h>
-+#include <kcmdlineargs.h>
++#include <tdeaboutdata.h>
++#include <tdeapplication.h>
++#include <tdecmdlineargs.h>
 +#include <tdeconfig.h>
 +#include <tdeversion.h>
 +#include <kemailsettings.h>
@@ -1561,7 +1561,7 @@ index 0000000..d0f1444
 +#include <kmenubar.h>
 +#include <kprotocolmanager.h>
 +#include <kstartupinfo.h>
-+#include <kstyle.h>
++#include <tdestyle.h>
 +
 +
 +/* ********* TDE address book connectivity headers */
@@ -2290,9 +2290,9 @@ index 0000000..d0f1444
 +
 +
 +/* ********* TDE base headers */
-+#include <kaboutdata.h>
-+#include <kapplication.h>
-+#include <kcmdlineargs.h>
++#include <tdeaboutdata.h>
++#include <tdeapplication.h>
++#include <tdecmdlineargs.h>
 +#include <tdeconfig.h>
 +#include <tdeversion.h>
 +#include <kemailsettings.h>
@@ -2303,7 +2303,7 @@ index 0000000..d0f1444
 +#include <kmenubar.h>
 +#include <kprotocolmanager.h>
 +#include <kstartupinfo.h>
-+#include <kstyle.h>
++#include <tdestyle.h>
 +
 +
 +/* ********* TDE address book connectivity headers */
@@ -2669,7 +2669,7 @@ index b68ddb0..6aeea9b 100644
  #include <qstringlist.h>
 +#endif // ENABLE_TDE
  
- #include <kapplication.h>
+ #include <tdeapplication.h>
  
 diff --git a/vcl/unx/kde/fpicker/kdecommandthread.hxx b/vcl/unx/kde/fpicker/kdecommandthread.hxx
 index 7486bf9..929a1eb 100644
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index 17dcc45..fba6c6d 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -8166,7 +8166,7 @@ index 0000000..8da50d2
 +
 +#include <tqstringlist.h>
 +
-+#include <kapplication.h>
++#include <tdeapplication.h>
 +
 +#if OSL_DEBUG_LEVEL > 1
 +#include <iostream>
@@ -9334,9 +9334,9 @@ index 0000000..eb20aa3
 +#include <tdefilepicker.hxx>
 +#include <tdecommandthread.hxx>
 +
-+#include <kaboutdata.h>
-+#include <kapplication.h>
-+#include <kcmdlineargs.h>
++#include <tdeaboutdata.h>
++#include <tdeapplication.h>
++#include <tdecmdlineargs.h>
 +
 +#include <iostream>
 +#include <stdlib.h>
@@ -9433,7 +9433,7 @@ index 0000000..6ced314
 +
 +#include <tdemodalityfilter.hxx>
 +
-+#include <kapplication.h>
++#include <tdeapplication.h>
 +#include <kdialogbase.h>
 +
 +#include <netwm.h>
@@ -12220,9 +12220,9 @@ index 0000000..91f59f9
 +
 +
 +/* ********* TDE base headers */
-+#include <kaboutdata.h>
-+#include <kapplication.h>
-+#include <kcmdlineargs.h>
++#include <tdeaboutdata.h>
++#include <tdeapplication.h>
++#include <tdecmdlineargs.h>
 +#include <tdeconfig.h>
 +#include <tdeversion.h>
 +#include <kemailsettings.h>
@@ -12233,7 +12233,7 @@ index 0000000..91f59f9
 +#include <kmenubar.h>
 +#include <kprotocolmanager.h>
 +#include <kstartupinfo.h>
-+#include <kstyle.h>
++#include <tdestyle.h>
 +
 +
 +/* ********* TDE address book connectivity headers */
@@ -13511,9 +13511,9 @@ index 0000000..9c9f008
 +
 +
 +/* ********* TDE base headers */
-+#include <kaboutdata.h>
-+#include <kapplication.h>
-+#include <kcmdlineargs.h>
++#include <tdeaboutdata.h>
++#include <tdeapplication.h>
++#include <tdecmdlineargs.h>
 +#include <tdeconfig.h>
 +#include <tdeversion.h>
 +#include <kemailsettings.h>
@@ -13524,7 +13524,7 @@ index 0000000..9c9f008
 +#include <kmenubar.h>
 +#include <kprotocolmanager.h>
 +#include <kstartupinfo.h>
-+#include <kstyle.h>
++#include <tdestyle.h>
 +
 +
 +/* ********* TDE address book connectivity headers */