diff --git a/akregator/src/about/akregator.css b/akregator/src/about/akregator.css
index 9c31cfe35..ab0bb7741 100644
--- a/akregator/src/about/akregator.css
+++ b/akregator/src/about/akregator.css
@@ -15,6 +15,3 @@
   background-position: bottom right;
 }
 */
-
-/* vim:set sw=2 et nocindent smartindent: */
-
diff --git a/akregator/src/about/main.html b/akregator/src/about/main.html
index 5bcca3d41..52cfe4ad9 100644
--- a/akregator/src/about/main.html
+++ b/akregator/src/about/main.html
@@ -64,4 +64,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index 05a6a8e0a..24dc8b49b 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -120,4 +120,3 @@ void AddFeedDialog::textChanged(const TQString& text)
 } // namespace Akregator
 
 #include "addfeeddialog.moc"
-// vim: ts=4 sw=4 et
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 1e17c05f4..66abcae5a 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -220,5 +220,3 @@ namespace Akregator
 }
 
 #endif // _AKREGATORPART_H_
-
-// vim: set et ts=4 sts=4 sw=4:
diff --git a/akregator/src/akregator_run.cpp b/akregator/src/akregator_run.cpp
index 84fd65720..89bb190a4 100644
--- a/akregator/src/akregator_run.cpp
+++ b/akregator/src/akregator_run.cpp
@@ -68,5 +68,3 @@ void BrowserRun::slotViewerDeleted()
 } // namespace Akregator
 
 #include "akregator_run.moc"
-
-// vim: set et ts=4 sts=4 sw=4:
diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h
index e819dc13f..4d22ca82c 100644
--- a/akregator/src/akregator_run.h
+++ b/akregator/src/akregator_run.h
@@ -67,5 +67,3 @@ class BrowserRun : public KParts::BrowserRun
 }
 
 #endif
-
-// vim: set et ts=4 sts=4 sw=4:
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index a0e5c8b70..48114f975 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -809,4 +809,3 @@ TQValueList<Article> ArticleListView::selectedArticles() const
 } // namespace Akregator
 
 #include "articlelistview.moc"
-// vim: ts=4 sw=4 et
diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h
index 1a0f449ea..d70413b87 100644
--- a/akregator/src/fetchqueue.h
+++ b/akregator/src/fetchqueue.h
@@ -86,6 +86,3 @@ class FetchQueue : public TQObject
 } // namespace Akregator
 
 #endif
-
-// vim: set et ts=4 sts=4 sw=4:
-
diff --git a/akregator/src/frame.h b/akregator/src/frame.h
index 4a0cb36d8..b5ed013ff 100644
--- a/akregator/src/frame.h
+++ b/akregator/src/frame.h
@@ -96,6 +96,3 @@ namespace Akregator
 }
 
 #endif
-
-
-// vim: set et ts=4 sts=4 sw=4:
diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp
index 244130535..18522fe3e 100644
--- a/akregator/src/librss/article.cpp
+++ b/akregator/src/librss/article.cpp
@@ -286,5 +286,3 @@ bool Article::operator==(const Article &other) const
 {
 	return d->guid == other.guid();
 }
-
-// vim:noet:ts=4
diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h
index 7656eeeda..c27fdfe75 100644
--- a/akregator/src/librss/article.h
+++ b/akregator/src/librss/article.h
@@ -169,4 +169,3 @@ namespace RSS
 }
 
 #endif // LIBRSS_ARTICLE_H
-// vim: noet:ts=4
diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp
index 6d6e10577..3bc64d000 100644
--- a/akregator/src/librss/document.cpp
+++ b/akregator/src/librss/document.cpp
@@ -649,5 +649,3 @@ Document &Document::operator=(const Document &other)
     }
     return *this;
 }
-
-// vim:noet:ts=4
diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h
index 7a94e59d4..8d098e7db 100644
--- a/akregator/src/librss/document.h
+++ b/akregator/src/librss/document.h
@@ -234,4 +234,3 @@ namespace RSS
 }
 
 #endif // LIBRSS_DOCUMENT_H
-// vim: noet:ts=4
diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h
index 091018cb8..26c5037bf 100644
--- a/akregator/src/librss/global.h
+++ b/akregator/src/librss/global.h
@@ -145,4 +145,3 @@ namespace RSS
 }
 
 #endif // LIBRSS_GLOBAL_H
-// vim: noet:ts=4
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index 383d76b94..174a105b5 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/image.cpp
@@ -164,4 +164,3 @@ bool Image::operator==(const Image &other) const
 }
 
 #include "image.moc"
-// vim:noet:ts=4
diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h
index ab0cf6879..299b4292f 100644
--- a/akregator/src/librss/image.h
+++ b/akregator/src/librss/image.h
@@ -171,4 +171,3 @@ namespace RSS
 }
 
 #endif // LIBRSS_IMAGE_H
-// vim: noet:ts=4
diff --git a/akregator/src/librss/librss.h b/akregator/src/librss/librss.h
index b99556b1c..877d06f2e 100644
--- a/akregator/src/librss/librss.h
+++ b/akregator/src/librss/librss.h
@@ -21,4 +21,3 @@
 #include "textinput.h"
 
 #endif // LIBRSS_LIBRSS_H
-// vim: noet:ts=4
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index ea0134e62..8e2967b7b 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -410,4 +410,3 @@ void Loader::discoverFeeds(const TQByteArray &data)
 }
 
 #include "loader.moc"
-// vim:noet:ts=4
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index 670ed9d32..ed22da22e 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/loader.h
@@ -342,4 +342,3 @@ namespace RSS
 }
 
 #endif // LIBRSS_LOADER_H
-// vim: noet:ts=4
diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp
index 04799fcaa..a32c9f584 100644
--- a/akregator/src/librss/textinput.cpp
+++ b/akregator/src/librss/textinput.cpp
@@ -92,5 +92,3 @@ bool TextInput::operator==(const TextInput &other) const
 		   d->name == other.name() &&
 		   d->link == other.link();
 }
-
-// vim:noet:ts=4
diff --git a/akregator/src/librss/textinput.h b/akregator/src/librss/textinput.h
index cbf5bdb6d..dd46d1769 100644
--- a/akregator/src/librss/textinput.h
+++ b/akregator/src/librss/textinput.h
@@ -118,4 +118,3 @@ namespace RSS
 }
 
 #endif // LIBRSS_TEXTINPUT_H
-// vim: noet:ts=4
diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp
index bd8ce39b3..9303bdf50 100644
--- a/akregator/src/librss/tools_p.cpp
+++ b/akregator/src/librss/tools_p.cpp
@@ -245,5 +245,3 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver
 }
 
 } // namespace RSS
-
-// vim:noet:ts=4
diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h
index 47be905d8..0ec9013f3 100644
--- a/akregator/src/librss/tools_p.h
+++ b/akregator/src/librss/tools_p.h
@@ -37,4 +37,3 @@ namespace RSS
 }
 
 #endif // LIBRSS_TOOLS_P_H
-// vim:noet:ts=4
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index c4e47338a..f5654d9bc 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -285,6 +285,3 @@ void MainWindow::slotSetStatusBarText( const TQString & text )
 } // namespace Akregator
 
 #include "mainwindow.moc"
-
-
-// vim: set et ts=4 sts=4 sw=4:
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index 160c4bad9..edd5f8611 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -1686,5 +1686,3 @@ ALSO LISTED IN THE RELEASE HISTORY
     Moves do not involve any data copying w.r.t. subviews and memo's.
 
 The old release history is at http://www.equi4.com/metakit/history.html
-
-# vim: tw=72
diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp
index 149eb480c..b8d318e86 100644
--- a/akregator/src/propertiesdialog.cpp
+++ b/akregator/src/propertiesdialog.cpp
@@ -321,4 +321,3 @@ void FeedPropertiesDialog::selectFeedName()
 } // namespace Akregator
 
 #include "propertiesdialog.moc"
-// vim: ts=4 sw=4 et
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 0588a4295..02bba26c0 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -332,5 +332,3 @@ void Viewer::setSafeMode()
 } // namespace Akregator
 
 #include "viewer.moc"
-
-// vim: set et ts=4 sts=4 sw=4:
diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h
index af89fee2a..112e71b0d 100644
--- a/akregator/src/viewer.h
+++ b/akregator/src/viewer.h
@@ -121,4 +121,3 @@ namespace Akregator
 }
 
 #endif // VIEWER_H
-// vim: ts=4 sw=4 et
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index c61ce7dba..5b6b26455 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -1,4 +1,4 @@
-/* -*- mode: c++; c-basic-offset:4 -*-
+/*
     certmanager.h
 
     This file is part of Kleopatra, the KDE keymanager
diff --git a/certmanager/hierarchyanalyser.h b/certmanager/hierarchyanalyser.h
index dede3814d..45ef9ccb6 100644
--- a/certmanager/hierarchyanalyser.h
+++ b/certmanager/hierarchyanalyser.h
@@ -1,4 +1,4 @@
-/* -*- mode: c++ -*-
+/*
     hierarchyanalyser.h
 
     This file is part of Kleopatra, the KDE keymanager
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.h b/certmanager/lib/backends/chiasmus/chiasmusbackend.h
index 1619f9ea1..17f7572c0 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.h
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     chiasmusbackend.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h
index 1ca6ba19c..69274d102 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.h
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     chiasmusjob.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h
index fa1adc737..3a3536af9 100644
--- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h
+++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     chiasmuslibrary.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
index da19257b7..3f7246abd 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     obtainkeysjob.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/kpgp/gpg1backend.h b/certmanager/lib/backends/kpgp/gpg1backend.h
index a1ff723c8..96729f33f 100644
--- a/certmanager/lib/backends/kpgp/gpg1backend.h
+++ b/certmanager/lib/backends/kpgp/gpg1backend.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     gpg1backend.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
index b5b006b56..dfa88af66 100644
--- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
+++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     kpgpbackendbase.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.h b/certmanager/lib/backends/kpgp/kpgpbackendbase.h
index 6fdf29bfb..d9dbf5794 100644
--- a/certmanager/lib/backends/kpgp/kpgpbackendbase.h
+++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     kpgpbackendbase.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
index d126ea675..3434dd97f 100644
--- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
+++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++ -*-
+/*
     kpgpkeylistjob.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp
index 71c082937..6778f45d0 100644
--- a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp
+++ b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     kpgpwrapper.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.h b/certmanager/lib/backends/kpgp/kpgpwrapper.h
index 8dc7dbc2b..7776e98c5 100644
--- a/certmanager/lib/backends/kpgp/kpgpwrapper.h
+++ b/certmanager/lib/backends/kpgp/kpgpwrapper.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     kpgpwrapper.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/kpgp/pgp2backend.h b/certmanager/lib/backends/kpgp/pgp2backend.h
index b486bfd6a..622566e1c 100644
--- a/certmanager/lib/backends/kpgp/pgp2backend.h
+++ b/certmanager/lib/backends/kpgp/pgp2backend.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     pgp2backend.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/kpgp/pgp5backend.h b/certmanager/lib/backends/kpgp/pgp5backend.h
index 2db55932b..b02183de9 100644
--- a/certmanager/lib/backends/kpgp/pgp5backend.h
+++ b/certmanager/lib/backends/kpgp/pgp5backend.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     pgp5backend.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/kpgp/pgp6backend.h b/certmanager/lib/backends/kpgp/pgp6backend.h
index c5f9eeffd..464942446 100644
--- a/certmanager/lib/backends/kpgp/pgp6backend.h
+++ b/certmanager/lib/backends/kpgp/pgp6backend.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     pgp6backend.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index c38097ed1..ee4128bfd 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     qgpgmebackend.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.h b/certmanager/lib/backends/qgpgme/qgpgmebackend.h
index a23c08d44..9d6aca814 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     qgpgmebackend.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index bc0d232eb..54d13358e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     qgpgmeprogresstokenmapper.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp
index 77a914514..20747457a 100644
--- a/certmanager/lib/cryptplug.cpp
+++ b/certmanager/lib/cryptplug.cpp
@@ -1,5 +1,4 @@
-/* -*- Mode: C++ -*-
-
+/*
   this is a C++-ification of:
   GPGMEPLUG - an GPGME based cryptography plug-in following
               the common CRYPTPLUG specification.
diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h
index d633e6396..e11d28751 100644
--- a/certmanager/lib/cryptplug.h
+++ b/certmanager/lib/cryptplug.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C++ -*-
-
+/*
   this is a C++-ification of:
   CRYPTPLUG - an independent cryptography plug-in API
 
diff --git a/certmanager/lib/cryptplugwrapperlist.cpp b/certmanager/lib/cryptplugwrapperlist.cpp
index 43f88670d..94d8a48cb 100644
--- a/certmanager/lib/cryptplugwrapperlist.cpp
+++ b/certmanager/lib/cryptplugwrapperlist.cpp
@@ -1,5 +1,4 @@
-/* -*- c++ -*-
-
+/*
   CRYPTPLUG - an independent cryptography plug-in
   API. CryptPlugWrapperList holds any number of crypto plug-ins.
 
diff --git a/certmanager/lib/cryptplugwrapperlist.h b/certmanager/lib/cryptplugwrapperlist.h
index 30d4fcd95..016913383 100644
--- a/certmanager/lib/cryptplugwrapperlist.h
+++ b/certmanager/lib/cryptplugwrapperlist.h
@@ -1,5 +1,4 @@
-/* -*- Mode: C++ -*-
-
+/*
   CRYPTPLUG - an independent cryptography plug-in
   API. CryptPlugWrapperList holds any number of crypto plug-ins.
 
diff --git a/certmanager/lib/tests/test.data b/certmanager/lib/tests/test.data
index a4109fbd5..5a63ff091 100644
--- a/certmanager/lib/tests/test.data
+++ b/certmanager/lib/tests/test.data
@@ -1,4 +1,4 @@
-/* -*- mode: c++; c-basic-offset:4 -*-
+/*
     tests/test_uiserver.cpp
 
     This file is part of Kleopatra, the KDE keymanager
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index a97b00208..9d8f4d402 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     backendconfigwidget.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h
index f01315475..bde73c2ed 100644
--- a/certmanager/lib/ui/backendconfigwidget.h
+++ b/certmanager/lib/ui/backendconfigwidget.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     backendconfigwidget.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index b2f1343ad..874ba0fa5 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     dnattributeorderconfigwidget.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h
index b7ba1330e..ea24728da 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.h
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     dnattributeorderconfigwidget.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index 118b6b103..2892a05e8 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    KD Tools - a set of useful widgets for TQt
 */
 
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 71c1c928d..4cae46b1e 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    KD Tools - a set of useful widgets for TQt
 */
 
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 0ee6d8657..900605ae9 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyapprovaldialog.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index bd953fa32..8fa6a7cc6 100644
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyselectiondialog.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index c9516a2ba..e245898e9 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyrequester.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index 899d3cde4..e73b7988c 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyrequester.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index c46228a43..25a1a2256 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyselectiondialog.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index 630255c12..3138d9996 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyselectiondialog.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index 990f93cdf..f2771201d 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     passphrasedialog.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h
index 6515fa4ca..eece8f48e 100644
--- a/certmanager/lib/ui/passphrasedialog.h
+++ b/certmanager/lib/ui/passphrasedialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     passphrasedialog.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/doc/akregator/index.docbook b/doc/akregator/index.docbook
index c460a0eec..f872e1de8 100644
--- a/doc/akregator/index.docbook
+++ b/doc/akregator/index.docbook
@@ -1152,12 +1152,3 @@ Documentation copyright 2006
 
 &documentation.index;
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->
\ No newline at end of file
diff --git a/doc/kalarm/index.docbook b/doc/kalarm/index.docbook
index 0d5565c92..3362f18c4 100644
--- a/doc/kalarm/index.docbook
+++ b/doc/kalarm/index.docbook
@@ -4158,13 +4158,3 @@ distributed with &kalarm;.</para>
 
 &documentation.index;
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->
-
diff --git a/doc/kandy/index.docbook b/doc/kandy/index.docbook
index 834df10ba..d5ca2cc82 100644
--- a/doc/kandy/index.docbook
+++ b/doc/kandy/index.docbook
@@ -334,15 +334,3 @@ Window. <function>exit()</function> closes &kandy;.</para>
 </appendix>
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/karm/index.docbook b/doc/karm/index.docbook
index b1465c753..08de3cc40 100644
--- a/doc/karm/index.docbook
+++ b/doc/karm/index.docbook
@@ -1224,15 +1224,3 @@ QString addtodo(QString todoname)
 
 &documentation.index; 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/kleopatra/index.docbook b/doc/kleopatra/index.docbook
index f7e5b610e..1a534ccd0 100644
--- a/doc/kleopatra/index.docbook
+++ b/doc/kleopatra/index.docbook
@@ -1444,15 +1444,3 @@ and &Jesper.Pedersen;., copyright 2004 &Daniel.Molkentin;, copyright 2004 Klar&a
 
 &documentation.index; 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/kmail/index.docbook b/doc/kmail/index.docbook
index 028c85790..877846ab1 100644
--- a/doc/kmail/index.docbook
+++ b/doc/kmail/index.docbook
@@ -149,15 +149,3 @@
 
 </appendix>
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=0:sw=2:tw=78:noet
--->
diff --git a/doc/knode/using-morefeatures.docbook b/doc/knode/using-morefeatures.docbook
index 39892bf60..28d3142c2 100644
--- a/doc/knode/using-morefeatures.docbook
+++ b/doc/knode/using-morefeatures.docbook
@@ -843,13 +843,3 @@ PGP-signature</guimenuitem></menuchoice>.</para>
 </sect2>
 
 </sect1> 
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "chapter" "sect1")
-End:
--->
diff --git a/doc/knotes/index.docbook b/doc/knotes/index.docbook
index 73d60ba9e..723509ef0 100644
--- a/doc/knotes/index.docbook
+++ b/doc/knotes/index.docbook
@@ -370,14 +370,3 @@ allowing you to configure the note.</para>
 &documentation.index; 
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/konsolekalendar/index.docbook b/doc/konsolekalendar/index.docbook
index 6e35c4905..307b6be33 100644
--- a/doc/konsolekalendar/index.docbook
+++ b/doc/konsolekalendar/index.docbook
@@ -860,12 +860,3 @@ on the &kde; desktop.</para>
 
 &documentation.index;
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->
diff --git a/doc/kontact/index.docbook b/doc/kontact/index.docbook
index 8032da906..13fdb8159 100644
--- a/doc/kontact/index.docbook
+++ b/doc/kontact/index.docbook
@@ -1163,14 +1163,3 @@ url="http://kontact.kde.org">http://kontact.kde.org</ulink></para>
 
 &documentation.index;
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/korganizer/index.docbook b/doc/korganizer/index.docbook
index bdb5bb511..39e0eee79 100644
--- a/doc/korganizer/index.docbook
+++ b/doc/korganizer/index.docbook
@@ -4976,14 +4976,3 @@ To-do becomes very similar to an event.</para>
 &documentation.index;
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/korn/index.docbook b/doc/korn/index.docbook
index 535ce323b..5962ff83a 100644
--- a/doc/korn/index.docbook
+++ b/doc/korn/index.docbook
@@ -228,11 +228,3 @@ Korn...</guimenuitem> option or above.</para>
 
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/kwatchgnupg/index.docbook b/doc/kwatchgnupg/index.docbook
index 6e40f6bca..894e57817 100644
--- a/doc/kwatchgnupg/index.docbook
+++ b/doc/kwatchgnupg/index.docbook
@@ -268,15 +268,3 @@ history manually.
 
 &documentation.index; 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 5755784af..e1be330a4 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -1597,5 +1597,3 @@ bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQSt
  ******************************************************************************/
 
 #include "gnokii_xxport.moc"
-
-/* vim: set sts=4 ts=4 sw=4: */
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 21070acfb..59c00f824 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -67,5 +67,3 @@ TDEABC::AddresseeList PABXXPort::importContacts( const TQString& ) const
 }
 
 #include "pab_xxport.moc"
-
-// vim: ts=2 sw=2 et
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index 6db8dcabb..ef40a626e 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
 */
 
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index c10073597..4eb88df7e 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/kdgantt/KDGanttMinimizeSplitter.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
 */
 
diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp
index ed4943fdb..879d25e55 100644
--- a/kdgantt/KDGanttSemiSizingControl.cpp
+++ b/kdgantt/KDGanttSemiSizingControl.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
 */
 
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index 4dfac98d2..4f14b1ad0 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/kdgantt/KDGanttSemiSizingControl.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
 */
 
diff --git a/kdgantt/KDGanttSizingControl.cpp b/kdgantt/KDGanttSizingControl.cpp
index 3d174ad57..bf2b5a1cf 100644
--- a/kdgantt/KDGanttSizingControl.cpp
+++ b/kdgantt/KDGanttSizingControl.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
 */
 /****************************************************************************
diff --git a/kdgantt/KDGanttSizingControl.h b/kdgantt/KDGanttSizingControl.h
index 733f60351..31ac59c0d 100644
--- a/kdgantt/KDGanttSizingControl.h
+++ b/kdgantt/KDGanttSizingControl.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
 */
 /****************************************************************************
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index 440da7a79..d490da85d 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 9a12bceb3..18e77bbc3 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDChart - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp
index f98bb0fdc..d8880121f 100644
--- a/kdgantt/KDGanttViewEventItem.cpp
+++ b/kdgantt/KDGanttViewEventItem.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewEventItem.h b/kdgantt/KDGanttViewEventItem.h
index 6bddf5a4d..7bfc561ca 100644
--- a/kdgantt/KDGanttViewEventItem.h
+++ b/kdgantt/KDGanttViewEventItem.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index c24a3580e..70cfcedf0 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index e645029d8..948098fc8 100644
--- a/kdgantt/KDGanttViewItem.h
+++ b/kdgantt/KDGanttViewItem.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index e747beec9..a708699f6 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index b793ac4b4..965977e1a 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp
index 7c400e54a..184bf3c07 100644
--- a/kdgantt/KDGanttViewSummaryItem.cpp
+++ b/kdgantt/KDGanttViewSummaryItem.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewSummaryItem.h b/kdgantt/KDGanttViewSummaryItem.h
index 7361adca4..17fa8850b 100644
--- a/kdgantt/KDGanttViewSummaryItem.h
+++ b/kdgantt/KDGanttViewSummaryItem.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index 9bdedaf89..653925c09 100644
--- a/kdgantt/KDGanttViewTaskItem.cpp
+++ b/kdgantt/KDGanttViewTaskItem.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewTaskItem.h b/kdgantt/KDGanttViewTaskItem.h
index aa958d2ce..2c3a23779 100644
--- a/kdgantt/KDGanttViewTaskItem.h
+++ b/kdgantt/KDGanttViewTaskItem.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp
index 555e70a72..f6fa68833 100644
--- a/kdgantt/KDGanttViewTaskLink.cpp
+++ b/kdgantt/KDGanttViewTaskLink.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewTaskLink.h b/kdgantt/KDGanttViewTaskLink.h
index ad16265b2..228ccf5f9 100644
--- a/kdgantt/KDGanttViewTaskLink.h
+++ b/kdgantt/KDGanttViewTaskLink.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewTaskLinkGroup.cpp b/kdgantt/KDGanttViewTaskLinkGroup.cpp
index 3437dcd1f..6c8d542ed 100644
--- a/kdgantt/KDGanttViewTaskLinkGroup.cpp
+++ b/kdgantt/KDGanttViewTaskLinkGroup.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttViewTaskLinkGroup.h b/kdgantt/KDGanttViewTaskLinkGroup.h
index b155b8b4d..480309bce 100644
--- a/kdgantt/KDGanttViewTaskLinkGroup.h
+++ b/kdgantt/KDGanttViewTaskLinkGroup.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp
index af09edb4f..5f181934d 100644
--- a/kdgantt/KDGanttXMLTools.cpp
+++ b/kdgantt/KDGanttXMLTools.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kdgantt/KDGanttXMLTools.h b/kdgantt/KDGanttXMLTools.h
index b1639c920..8a7067c0b 100644
--- a/kdgantt/KDGanttXMLTools.h
+++ b/kdgantt/KDGanttXMLTools.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    $Id$
    KDGantt - a multi-platform charting engine
 */
diff --git a/kitchensync/src/about/kitchensync.css b/kitchensync/src/about/kitchensync.css
index 18aa0ddcd..c37ba7f79 100644
--- a/kitchensync/src/about/kitchensync.css
+++ b/kitchensync/src/about/kitchensync.css
@@ -25,6 +25,3 @@
 #subtext {
   font-style: italic;
 }
-
-/* vim:set sw=2 et nocindent smartindent: */
-
diff --git a/kitchensync/src/about/main.html b/kitchensync/src/about/main.html
index 2474a7fca..8f948ffac 100644
--- a/kitchensync/src/about/main.html
+++ b/kitchensync/src/about/main.html
@@ -63,4 +63,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/kmail/about/kmail.css b/kmail/about/kmail.css
index 38db99875..0444430ba 100644
--- a/kmail/about/kmail.css
+++ b/kmail/about/kmail.css
@@ -20,6 +20,3 @@
   background-repeat: no-repeat;
   background-position: bottom right;
 }
-
-/* vim:set sw=2 et nocindent smartindent: */
-
diff --git a/kmail/about/main.html b/kmail/about/main.html
index 634b5f001..52876f210 100644
--- a/kmail/about/main.html
+++ b/kmail/about/main.html
@@ -64,4 +64,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index 91bc1607f..89521c09c 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     aboutdata.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 5c5b08ae0..02c0a7c46 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     aboutdata.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp
index 7ae3d2a37..97f95b112 100644
--- a/kmail/accountcombobox.cpp
+++ b/kmail/accountcombobox.cpp
@@ -1,4 +1,4 @@
-/** -*- mode: C++ -*-
+/*
  * Copyright (c) 2004 David Faure <faure@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h
index c2e85cf66..2fa27f396 100644
--- a/kmail/accountcombobox.h
+++ b/kmail/accountcombobox.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * Copyright (c) 2004 David Faure <faure@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h
index bf79f0968..fb15cb383 100644
--- a/kmail/accountdialog.h
+++ b/kmail/accountdialog.h
@@ -1,4 +1,4 @@
-/*   -*- c++ -*-
+/*
  *   accountdialog.h
  *
  *   kmail: KDE mail client
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index 4afe8bb99..9097d3510 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h
index 54303960e..4551b3d28 100644
--- a/kmail/actionscheduler.h
+++ b/kmail/actionscheduler.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++ -*-
+/*
     Action Scheduler
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 2563e4eee..f187dcd6c 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     antispamconfig.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/antispamconfig.h b/kmail/antispamconfig.h
index 9c3449935..922d49dba 100644
--- a/kmail/antispamconfig.h
+++ b/kmail/antispamconfig.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     antispamconfig.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index 7248b9e51..e93480c1e 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++ -*-
+/*
     This file is part of KMail.
     Copyright (c) 2003 Andreas Gungl <a.gungl@gmx.de>
 
diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp
index 526fbb543..5fe9348ef 100644
--- a/kmail/app_octetstream.cpp
+++ b/kmail/app_octetstream.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     app_octetstream.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/attachmentcollector.cpp b/kmail/attachmentcollector.cpp
index b902f596f..6fbab33d2 100644
--- a/kmail/attachmentcollector.cpp
+++ b/kmail/attachmentcollector.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentcollector.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/attachmentcollector.h b/kmail/attachmentcollector.h
index 6930e07ea..a0069d515 100644
--- a/kmail/attachmentcollector.h
+++ b/kmail/attachmentcollector.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentcollector.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp
index a03cd32f7..9e99e6402 100644
--- a/kmail/attachmentlistview.cpp
+++ b/kmail/attachmentlistview.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentlistview.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h
index 881f8b286..d0a0b63e2 100644
--- a/kmail/attachmentlistview.h
+++ b/kmail/attachmentlistview.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentlistview.h
 
     KMail, the KDE mail client.
diff --git a/kmail/attachmentstrategy.cpp b/kmail/attachmentstrategy.cpp
index 87157ed4f..2f12f39b2 100644
--- a/kmail/attachmentstrategy.cpp
+++ b/kmail/attachmentstrategy.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentstrategy.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/attachmentstrategy.h b/kmail/attachmentstrategy.h
index 268a43309..66fb6b857 100644
--- a/kmail/attachmentstrategy.h
+++ b/kmail/attachmentstrategy.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentstrategy.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp
index bd6da060a..8435ef25e 100644
--- a/kmail/bodypartformatter.cpp
+++ b/kmail/bodypartformatter.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     bodypartformatter.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodypartformatter.h b/kmail/bodypartformatter.h
index 1c2965824..2664be0d2 100644
--- a/kmail/bodypartformatter.h
+++ b/kmail/bodypartformatter.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     bodypartformatter.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodypartformatterfactory.cpp b/kmail/bodypartformatterfactory.cpp
index 62a929531..fbae5a448 100644
--- a/kmail/bodypartformatterfactory.cpp
+++ b/kmail/bodypartformatterfactory.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     bodypartformatterfactory.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodypartformatterfactory.h b/kmail/bodypartformatterfactory.h
index dd89eb34e..7606a5c1e 100644
--- a/kmail/bodypartformatterfactory.h
+++ b/kmail/bodypartformatterfactory.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     bodypartformatterfactory.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodypartformatterfactory_p.h b/kmail/bodypartformatterfactory_p.h
index 088a17f29..60067cd72 100644
--- a/kmail/bodypartformatterfactory_p.h
+++ b/kmail/bodypartformatterfactory_p.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     bodypartformatterfactory.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h
index a436fb443..cfe43b49f 100644
--- a/kmail/bodyvisitor.h
+++ b/kmail/bodyvisitor.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Carsten Burghardt <burghardt@kde.org>
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index e4a29d6e9..bba5b1b66 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2002-2004  Bo Thorsen <bo@sonofthor.dk>
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index bdf645417..f2daa6c7f 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2002-2003  Bo Thorsen <bo@sonofthor.dk>
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index b6e0e938b..66bcd12f7 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     callback.cpp
 
     This file is used by KMail's plugin interface.
diff --git a/kmail/callback.h b/kmail/callback.h
index a3fccc4ed..560d5ddcc 100644
--- a/kmail/callback.h
+++ b/kmail/callback.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     callback.h
 
     This file is used by KMail's plugin interface.
diff --git a/kmail/composer.h b/kmail/composer.h
index 30cf0b284..709bfb730 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * KMComposeWin Header File
  * Author: Markus Wuebben <markus.wuebben@kde.org>
  */
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 0f92eab5e..7dcf8ce20 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2000 Espen Sand, espen@kde.org
  *              Copyright (C) 2001-2003 Marc Mutz, mutz@kde.org
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index 265bc9570..acd0bc5af 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -1,4 +1,4 @@
-/*   -*- c++ -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2000 Espen Sand, espen@kde.org
  *              Copyright (C) 2001-2002 Marc Mutz <mutz@kde.org>
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 6ba969de1..10e9b8df7 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 // configuredialog_p.h: classes internal to ConfigureDialog
 // see configuredialog.h for details.
 
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index e5bfb7bfe..c4f583904 100644
--- a/kmail/csshelper.cpp
+++ b/kmail/csshelper.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     csshelper.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/csshelper.h b/kmail/csshelper.h
index 9bff99ca3..cba58adcf 100644
--- a/kmail/csshelper.h
+++ b/kmail/csshelper.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     csshelper.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 644f5fa99..5daf001db 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov
  *
diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h
index 1af437346..b117dd69f 100644
--- a/kmail/customtemplates.h
+++ b/kmail/customtemplates.h
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov
  *
diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp
index 6eb1b4934..be705d3df 100644
--- a/kmail/dictionarycombobox.cpp
+++ b/kmail/dictionarycombobox.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     dictionarycombobox.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h
index 0a8d5c0fd..a6d3584ab 100644
--- a/kmail/dictionarycombobox.h
+++ b/kmail/dictionarycombobox.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     dictionarycombobox.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/expirejob.h b/kmail/expirejob.h
index dbec3d523..dbdb6a3a8 100644
--- a/kmail/expirejob.h
+++ b/kmail/expirejob.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * Copyright (c) 2004 David Faure <faure@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/kmail/filehtmlwriter.cpp b/kmail/filehtmlwriter.cpp
index c4f2d214e..abad64207 100644
--- a/kmail/filehtmlwriter.cpp
+++ b/kmail/filehtmlwriter.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     filehtmlwriter.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/filehtmlwriter.h b/kmail/filehtmlwriter.h
index 879143228..768e0c582 100644
--- a/kmail/filehtmlwriter.h
+++ b/kmail/filehtmlwriter.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     filehtmlwriter.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp
index 981e1b373..a95e3e13e 100644
--- a/kmail/folderIface.cpp
+++ b/kmail/folderIface.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/folderIface.h b/kmail/folderIface.h
index e348ea6b5..c8593d2ca 100644
--- a/kmail/folderIface.h
+++ b/kmail/folderIface.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 6b2e85fc4..35b72784b 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * folderdiaacltab.cpp
  *
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index bc619c4eb..0a5d64654 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * folderdiaacltab.h
  *
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 3fdb308ff..2fd950b2b 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * folderdiaquotatab.cpp
  *
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 6b260035e..fe7af4316 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * folderdiaquotatab.h
  *
diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp
index 657d1a9b9..2472df3a3 100644
--- a/kmail/folderjob.cpp
+++ b/kmail/folderjob.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index 47838044d..5b7f40373 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index f159c69f6..4a3aa0984 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++ -*-
+/*
     This file is part of KMail, the KDE mail client.
     Copyright (c) 2004 Till Adam <adam@kde.org>
 
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index afa581a1b..ff2b82ae8 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     headerstrategy.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/headerstrategy.h b/kmail/headerstrategy.h
index ebb610122..9f49f1ac5 100644
--- a/kmail/headerstrategy.h
+++ b/kmail/headerstrategy.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     headerstrategy.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index f7c2973e4..44f12b384 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     headerstyle.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/headerstyle.h b/kmail/headerstyle.h
index ff7228d32..881439090 100644
--- a/kmail/headerstyle.h
+++ b/kmail/headerstyle.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     headerstyle.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index fecda8de5..61205a7fb 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     htmlstatusbar.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h
index 95af5206a..9a86302f5 100644
--- a/kmail/htmlstatusbar.h
+++ b/kmail/htmlstatusbar.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     htmlstatusbar.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 90b4ffdd2..91b108c9a 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     identitydialog.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h
index 29b50f05e..fc9b4594c 100644
--- a/kmail/identitydialog.h
+++ b/kmail/identitydialog.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     identitydialog.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp
index 88df48f6a..f3c6435dc 100644
--- a/kmail/identitydrag.cpp
+++ b/kmail/identitydrag.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitydrag.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h
index 1c2ddb0d7..295c83adc 100644
--- a/kmail/identitydrag.h
+++ b/kmail/identitydrag.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitydrag.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp
index c13b9d1fe..f10edf7dc 100644
--- a/kmail/identitylistview.cpp
+++ b/kmail/identitylistview.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitylistview.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h
index abe12127a..586767c7c 100644
--- a/kmail/identitylistview.h
+++ b/kmail/identitylistview.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitylistview.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 1350da290..40ff81f76 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -1,4 +1,4 @@
-/** -*- c++ -*-
+/*
  * imapaccountbase.cpp
  *
  * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 3a4c4bff9..1c022044f 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * imapaccountbase.h
  *
  * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index dc9a98f56..1f7682b54 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2002-2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index c8e00e14a..e348b2df4 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2002-2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/interfaces/bodypart.h b/kmail/interfaces/bodypart.h
index 434906321..c70441cfc 100644
--- a/kmail/interfaces/bodypart.h
+++ b/kmail/interfaces/bodypart.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     bodypart.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/bodypartformatter.h b/kmail/interfaces/bodypartformatter.h
index 14fedc617..7fb3d19a1 100644
--- a/kmail/interfaces/bodypartformatter.h
+++ b/kmail/interfaces/bodypartformatter.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     bodypartformatter.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/bodyparturlhandler.h b/kmail/interfaces/bodyparturlhandler.h
index 78d566c1f..885e55d0d 100644
--- a/kmail/interfaces/bodyparturlhandler.h
+++ b/kmail/interfaces/bodyparturlhandler.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     interfaces/bodyparturlhandler.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/htmlwriter.h b/kmail/interfaces/htmlwriter.h
index 179841c1a..f7a76ad54 100644
--- a/kmail/interfaces/htmlwriter.h
+++ b/kmail/interfaces/htmlwriter.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     interfaces/htmlwriter.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/observable.h b/kmail/interfaces/observable.h
index 10d14dfa4..3e004ba61 100644
--- a/kmail/interfaces/observable.h
+++ b/kmail/interfaces/observable.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     observable.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/observer.h b/kmail/interfaces/observer.h
index 31cbc80a7..75d28c35e 100644
--- a/kmail/interfaces/observer.h
+++ b/kmail/interfaces/observer.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     observer.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/rulewidgethandler.h b/kmail/interfaces/rulewidgethandler.h
index 330952238..edc581b1f 100644
--- a/kmail/interfaces/rulewidgethandler.h
+++ b/kmail/interfaces/rulewidgethandler.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     interfaces/rulewidgethandler.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h
index 1eb0e365f..2ad9295e0 100644
--- a/kmail/interfaces/urlhandler.h
+++ b/kmail/interfaces/urlhandler.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     interfaces/urlhandler.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/isubject.h b/kmail/isubject.h
index 8bad40c46..10fc7b378 100644
--- a/kmail/isubject.h
+++ b/kmail/isubject.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Carsten Burghardt <burghardt@kde.org>
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index fa0e2fedb..07dc1d729 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2000 Espen Sand, espen@kde.org
  *              Copyright (C) 2001-2003 Marc Mutz, mutz@kde.org
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index 76d4ae8fa..fcd2f2792 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyresolver.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/kmail/keyresolver.h b/kmail/keyresolver.h
index c7bdfe25c..2f7bd936b 100644
--- a/kmail/keyresolver.h
+++ b/kmail/keyresolver.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyresolver.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h
index 663f0b634..c7cfd99b5 100644
--- a/kmail/kleo_util.h
+++ b/kmail/kleo_util.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kleo_util.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index f0455b3b9..8445d55ea 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index 3e10332a1..6be22c010 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * kmacctimap.h
  *
  * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp
index 6b7747382..dcc58e02c 100644
--- a/kmail/kmaddrbook.cpp
+++ b/kmail/kmaddrbook.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmail_options.h b/kmail/kmail_options.h
index c0489b7fe..e5b327ec0 100644
--- a/kmail/kmail_options.h
+++ b/kmail/kmail_options.h
@@ -1,4 +1,3 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*- */
 #ifndef KMAIL_OPTIONS_H
 #define KMAIL_OPTIONS_H
 
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 23918a044..4d6654224 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -1,5 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
-
+/*
     This file is part of KMail.
     Copyright (c) 2002-2003 Don Sanders <sanders@kde.org>,
     Copyright (c) 2003      Zack Rusin  <zack@kde.org>,
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index 4d9fc42df..d6a9c4c44 100644
--- a/kmail/kmatmlistview.cpp
+++ b/kmail/kmatmlistview.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmatmlistview.cpp
 // Author: Markus Wuebben <markus.wuebben@kde.org>
 // This code is published under the GPL.
diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h
index f4d865953..30f0bd5f0 100644
--- a/kmail/kmatmlistview.h
+++ b/kmail/kmatmlistview.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * KMAtmListViewItem Header File
  * Author: Markus Wuebben <markus.wuebben@kde.org>
  */
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 3194cee1e..5239cedae 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
     This file is part of KMail, the KDE mail client.
     Copyright (c) 2002 Don Sanders <sanders@kde.org>
 
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 25c0a1173..dcafbf3d1 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -1,5 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
-
 #ifndef KMCommands_h
 #define KMCommands_h
 
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index bcdbe4a68..9125f56f1 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmcomposewin.cpp
 // Author: Markus Wuebben <markus.wuebben@kde.org>
 // This code is published under the GPL.
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 123f112b3..b9fbe1c73 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * KMComposeWin Header File
  * Author: Markus Wuebben <markus.wuebben@kde.org>
  */
diff --git a/kmail/kmdebug.h b/kmail/kmdebug.h
index 46262aeb4..142d0b9e2 100644
--- a/kmail/kmdebug.h
+++ b/kmail/kmdebug.h
@@ -1,5 +1,3 @@
-// -*- c++ -*- convenience wrappers around kdDebug/kdWarning/etc
-
 #ifndef __KMAIL_KMDEBUG_H__
 #define __KMAIL_KMDEBUG_H__
 
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index afe854dea..1fe546481 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmcomposewin.cpp
 // Author: Markus Wuebben <markus.wuebben@kde.org>
 // This code is published under the GPL.
diff --git a/kmail/kmedit.h b/kmail/kmedit.h
index f545a1368..c42734dc5 100644
--- a/kmail/kmedit.h
+++ b/kmail/kmedit.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * KMComposeWin Header File
  * Author: Markus Wuebben <markus.wuebben@kde.org>
  */
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index d681c6a65..df6a55430 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmfilter.h b/kmail/kmfilter.h
index 35fdecdac..fd993e3c8 100644
--- a/kmail/kmfilter.h
+++ b/kmail/kmfilter.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index d9065f6dc..b1bbb9aba 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmfilterdlg.cpp
 // Author: Marc Mutz <Marc@Mutz.com>
 // based on work by Stefan Taferner <taferner@kde.org>
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index e91a44a6a..8c47afc0a 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmfiltermgr.cpp
 
 // my header
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 45738939c..b1b9c2618 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index dd04d9f24..e8de8207e 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 265b1ee9c..da4671bfd 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * kmfolderdia.cpp
  *
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 5f3ea9678..e7c6b1d15 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * kmfolderdia.h
  *
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index 7bb77f0da..9b60b25ce 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
     This file is part of KMail, the KDE mail client.
     Copyright (c) 2000 Don Sanders <sanders@kde.org>
 
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index 8a8176e6a..ae67d7db5 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
     This file is part of KMail, the KDE mail client.
     Copyright (c) 2000 Don Sanders <sanders@kde.org>
 
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 5242060aa..29f9aaccf 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmfoldermaildir.cpp
 // Author: Kurt Granroth <granroth@kde.org>
 
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 6692f54ca..43c9a9137 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -1,4 +1,4 @@
-/* -*- c-basic-offset: 2 -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index 11e7584f4..b41c2b556 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
    This file is part of the KDE libraries
 
    This library is free software; you can redistribute it and/or
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 3196e6272..1b29fd299 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmheaders.cpp
 
 #include <config.h>
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 423ec3dcf..112b1cdeb 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -1,5 +1,3 @@
-// -*- mode: C++ -*-
-
 #ifndef __KMHEADERS
 #define __KMHEADERS
 
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index f998a74c3..cfb28ab2c 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -1,4 +1,3 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*- */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 610ab4768..d92266835 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -1,5 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
-
 #ifndef _KMCONTROL
 #define _KMCONTROL
 
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index 20421ec90..45585147c 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmcomposewin.cpp
 // Author: Markus Wuebben <markus.wuebben@kde.org>
 // This code is published under the GPL.
diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h
index 536d3158c..06bfce5ea 100644
--- a/kmail/kmlineeditspell.h
+++ b/kmail/kmlineeditspell.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * KMComposeWin Header File
  * Author: Markus Wuebben <markus.wuebben@kde.org>
  */
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 1d2661f58..d5ba1f31a 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmmainwidget.cpp
 //#define MALLOC_DEBUG 1
 
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index f790ff0f4..d90dda24f 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
     This file is part of KMail, the KDE mail client.
     Copyright (c) 2002 Don Sanders <sanders@kde.org>
 
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index d99614785..f9a7f3888 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmmessage.cpp
 
 // if you do not want GUI elements in here then set ALLOW_GUI to 0.
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index 3a61a11fc..dfe96116f 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /* kmmessage.h: Mime Message Class
  *
  */
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 200e77368..779fffd47 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
     kmmimeparttree.h A MIME part tree viwer.
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h
index 395694fe6..1b4fc4f56 100644
--- a/kmail/kmmimeparttree.h
+++ b/kmail/kmmimeparttree.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
     kmmimeparttree.cpp A MIME part tree viwer.
 
     This file is part of KMail, the KDE mail client.
@@ -28,10 +28,6 @@
     you do not wish to do so, delete this exception statement from
     your version.
 */
-
-
-
-// -*- c++ -*-
 #ifndef KMMIMEPARTTREE_H
 #define KMMIMEPARTTREE_H
 
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index 4994800b3..452114d4f 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h
index 2fa3462f6..2101fcb5f 100644
--- a/kmail/kmreadermainwin.h
+++ b/kmail/kmreadermainwin.h
@@ -1,5 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
-
 #ifndef KMReaderMainWin_h
 #define KMReaderMainWin_h
 
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 927a5d59d..184167b09 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmreaderwin.cpp
 // Author: Markus Wuebben <markus.wuebben@kde.org>
 
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index c9f78aec6..dfc4490c2 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // Header for kmreaderwin the kmail reader
 // written by Markus Wuebben <markus.wuebben@kde.org>
 
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index d1d47daf0..114f4e8d7 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmsearchpattern.cpp
 // Author: Marc Mutz <Marc@Mutz.com>
 // This code is under GPL!
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index 9b521c1f1..9d517fdf8 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmsearchpattern.h
 // Author: Marc Mutz <Marc@Mutz.com>
 // This code is under GPL!
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index 88f3609b3..21ade7b2d 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmsearchpatternedit.cpp
 // Author: Marc Mutz <Marc@Mutz.com>
 // This code is under GPL
diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h
index 77089df40..86d890bb8 100644
--- a/kmail/kmsearchpatternedit.h
+++ b/kmail/kmsearchpatternedit.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmfilterrulesedit.h
 // Author: Marc Mutz <Marc@Mutz.com>
 // This code is under GPL
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index 446c739e5..5c11f0757 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmservertest.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h
index 5d5cddf13..db8535a0a 100644
--- a/kmail/kmservertest.h
+++ b/kmail/kmservertest.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmservertest.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index f3ff58a49..1d1ce9339 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /***************************************************************************
                           kmsystemtray.cpp  -  description
                              -------------------
diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp
index c2d4e5551..2f6e839e3 100644
--- a/kmail/localsubscriptiondialog.cpp
+++ b/kmail/localsubscriptiondialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     localsubscriptiondialog.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h
index 601a84639..eb977908a 100644
--- a/kmail/localsubscriptiondialog.h
+++ b/kmail/localsubscriptiondialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     localsubscriptiondialog.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp
index b507d9272..4c3b520cb 100644
--- a/kmail/maildirjob.cpp
+++ b/kmail/maildirjob.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h
index 1d5a97106..878c5d788 100644
--- a/kmail/maildirjob.h
+++ b/kmail/maildirjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/mailinglist-magic.cpp b/kmail/mailinglist-magic.cpp
index 1f9270842..37600d504 100644
--- a/kmail/mailinglist-magic.cpp
+++ b/kmail/mailinglist-magic.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/kmail/mailinglist-magic.h b/kmail/mailinglist-magic.h
index eaa645929..8eed4f8f6 100644
--- a/kmail/mailinglist-magic.h
+++ b/kmail/mailinglist-magic.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 #ifndef MAILINGLIST_MAGIC_H
 #define MAILINGLIST_MAGIC_H
 
diff --git a/kmail/mailserviceimpl.cpp b/kmail/mailserviceimpl.cpp
index f5b810a3b..79af5eaf8 100644
--- a/kmail/mailserviceimpl.cpp
+++ b/kmail/mailserviceimpl.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/mailserviceimpl.h b/kmail/mailserviceimpl.h
index 6dc5224a8..842b4e4e7 100644
--- a/kmail/mailserviceimpl.h
+++ b/kmail/mailserviceimpl.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp
index eff69cce1..7a06f9709 100644
--- a/kmail/mailsourceviewer.cpp
+++ b/kmail/mailsourceviewer.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *
diff --git a/kmail/mailsourceviewer.h b/kmail/mailsourceviewer.h
index 0c29175ba..68f82c238 100644
--- a/kmail/mailsourceviewer.h
+++ b/kmail/mailsourceviewer.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *
diff --git a/kmail/main.cpp b/kmail/main.cpp
index bb3e0a8a2..8b40e555e 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp
index 7fb22ddbe..df25a8ada 100644
--- a/kmail/mboxjob.cpp
+++ b/kmail/mboxjob.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h
index 9b1d2deac..c9b1e37cd 100644
--- a/kmail/mboxjob.h
+++ b/kmail/mboxjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 7f4c53b32..9a5f5e993 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -1,4 +1,4 @@
-/** -*- c++ -*-
+/*
  * networkaccount.cpp
  *
  * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 1c5dde6e8..2ed8e452b 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * networkaccount.h
  *
  * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 71858bd14..39b7ac001 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     objecttreeparser.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h
index f9e71427a..cd4adfae2 100644
--- a/kmail/objecttreeparser.h
+++ b/kmail/objecttreeparser.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     objecttreeparser.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp
index a645b3989..683d3c4c4 100644
--- a/kmail/objecttreeparser_p.cpp
+++ b/kmail/objecttreeparser_p.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     objecttreeparser_p.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/objecttreeparser_p.h b/kmail/objecttreeparser_p.h
index 44a1e9af6..04e1c2c38 100644
--- a/kmail/objecttreeparser_p.h
+++ b/kmail/objecttreeparser_p.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     objecttreeparser_p.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index 012c6e18a..b39bc65f1 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
     partNode.cpp A node in a MIME tree.
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/partNode.h b/kmail/partNode.h
index 20328ddea..918f3f31b 100644
--- a/kmail/partNode.h
+++ b/kmail/partNode.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
     partNode.h A node in a MIME tree.
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/partmetadata.h b/kmail/partmetadata.h
index ee6f51d34..e5b060b96 100644
--- a/kmail/partmetadata.h
+++ b/kmail/partmetadata.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     partmetadata.h
 
     KMail, the KDE mail client.
diff --git a/kmail/partnodebodypart.cpp b/kmail/partnodebodypart.cpp
index 45ce28620..4f095ee89 100644
--- a/kmail/partnodebodypart.cpp
+++ b/kmail/partnodebodypart.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     partnodebodypart.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/partnodebodypart.h b/kmail/partnodebodypart.h
index 3591286e5..6ce17615f 100644
--- a/kmail/partnodebodypart.h
+++ b/kmail/partnodebodypart.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     partnodebodypart.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index f8cb0e92a..f6acfee77 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 #ifndef KMAcctExpPop_h
 #define KMAcctExpPop_h
 
diff --git a/kmail/protocols.h b/kmail/protocols.h
index ab5aa38d3..f24730f8b 100644
--- a/kmail/protocols.h
+++ b/kmail/protocols.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * protocols.h
  *
diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h
index aa46404f8..b4893298d 100644
--- a/kmail/redirectdialog.h
+++ b/kmail/redirectdialog.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++ -*-
+/*
     This file is part of KMail.
     Copyright (c) 2003 Andreas Gungl <a.gungl@gmx.de>
 
diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp
index 1b14fb4f3..1ce0237b7 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     regexplineedit.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h
index 4db2e922a..732f5449a 100644
--- a/kmail/regexplineedit.h
+++ b/kmail/regexplineedit.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     regexplineedit.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index fac482ee5..ae04af88e 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     rulewidgethandlermanager.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/rulewidgethandlermanager.h b/kmail/rulewidgethandlermanager.h
index 431731e46..8043243c9 100644
--- a/kmail/rulewidgethandlermanager.h
+++ b/kmail/rulewidgethandlermanager.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     rulewidgethandlermanager.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp
index 5a6896335..a421209a5 100644
--- a/kmail/secondarywindow.cpp
+++ b/kmail/secondarywindow.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
     secondarywindow.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h
index 560b707de..cd7e6f45c 100644
--- a/kmail/secondarywindow.h
+++ b/kmail/secondarywindow.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     secondarywindow.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp
index ff3e156d9..a787e06a5 100644
--- a/kmail/sieveconfig.cpp
+++ b/kmail/sieveconfig.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     sieveconfig.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h
index ac296375f..d7b9b8dc0 100644
--- a/kmail/sieveconfig.h
+++ b/kmail/sieveconfig.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     sieveconfig.h
 
     KMail, the KDE mail client.
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index 96f0a6086..290e2d71d 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     sievejob.h
 
     KMail, the KDE mail client.
@@ -290,6 +290,3 @@ namespace KMail {
 } // namespace KMail
 
 #include "sievejob.moc"
-
-// vim: set noet sts=2 ts=8 sw=2:
-
diff --git a/kmail/sievejob.h b/kmail/sievejob.h
index fb1d3a90d..d57e71763 100644
--- a/kmail/sievejob.h
+++ b/kmail/sievejob.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     sievejob.h
 
     KMail, the KDE mail client.
@@ -127,6 +127,3 @@ namespace KMail {
 } // namespace KMail
 
 #endif // __KMAIL_SIEVE_JOB_H__
-
-// vim: set noet sts=2 ts=8 sw=2:
-
diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp
index 81131956f..209e18c1c 100644
--- a/kmail/signatureconfigurator.cpp
+++ b/kmail/signatureconfigurator.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     signatureconfigurator.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h
index 48e6c5d6b..222a2a98c 100644
--- a/kmail/signatureconfigurator.h
+++ b/kmail/signatureconfigurator.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     signatureconfigurator.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index b96a1ad89..c37ea13f2 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     simplestringlisteditor.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h
index cb28d57bd..a2361c328 100644
--- a/kmail/simplestringlisteditor.h
+++ b/kmail/simplestringlisteditor.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     simplestringlisteditor.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/spamheaderanalyzer.cpp b/kmail/spamheaderanalyzer.cpp
index 427aa4d16..debc64b09 100644
--- a/kmail/spamheaderanalyzer.cpp
+++ b/kmail/spamheaderanalyzer.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     spamheaderanalyzer.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/spamheaderanalyzer.h b/kmail/spamheaderanalyzer.h
index ddb9bf1b1..391edbcf9 100644
--- a/kmail/spamheaderanalyzer.h
+++ b/kmail/spamheaderanalyzer.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     spamheaderanalyzer.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/stl_util.h b/kmail/stl_util.h
index 8a2738952..f72512c59 100644
--- a/kmail/stl_util.h
+++ b/kmail/stl_util.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     stl_util.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index cf4572b23..93f92a799 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     subscriptiondialog.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h
index 30a06d9f1..bfae617c7 100644
--- a/kmail/subscriptiondialog.h
+++ b/kmail/subscriptiondialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     subscriptiondialog.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/tdehtmlparthtmlwriter.cpp b/kmail/tdehtmlparthtmlwriter.cpp
index 5450509ec..2fcf29ba0 100644
--- a/kmail/tdehtmlparthtmlwriter.cpp
+++ b/kmail/tdehtmlparthtmlwriter.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     tdehtmlparthtmlwriter.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/tdehtmlparthtmlwriter.h b/kmail/tdehtmlparthtmlwriter.h
index 5d9af2e10..dc07b5782 100644
--- a/kmail/tdehtmlparthtmlwriter.h
+++ b/kmail/tdehtmlparthtmlwriter.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     tdehtmlparthtmlwriter.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/teehtmlwriter.cpp b/kmail/teehtmlwriter.cpp
index b162059e6..339eea282 100644
--- a/kmail/teehtmlwriter.cpp
+++ b/kmail/teehtmlwriter.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     teehtmlwriter.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/teehtmlwriter.h b/kmail/teehtmlwriter.h
index a55fd5899..2aaa20d5a 100644
--- a/kmail/teehtmlwriter.h
+++ b/kmail/teehtmlwriter.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     teehtmlwriter.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index f94be9549..d2dbd3188 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru>
  *
diff --git a/kmail/templateparser.h b/kmail/templateparser.h
index c7551c0fa..ae0f9f841 100644
--- a/kmail/templateparser.h
+++ b/kmail/templateparser.h
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru>
  *
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 9a90ca5ac..1b79c5217 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov
  *
diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h
index a0196c8e8..6a268c60b 100644
--- a/kmail/templatesconfiguration.h
+++ b/kmail/templatesconfiguration.h
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov
  *
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index b89fd2a12..2b195c6d9 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru>
  *
diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h
index 437ad8bdf..c928dd67d 100644
--- a/kmail/templatesinsertcommand.h
+++ b/kmail/templatesinsertcommand.h
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru>
  *
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index c17c18595..324691183 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     urlhandlermanager.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/urlhandlermanager.h b/kmail/urlhandlermanager.h
index 2e0959ed0..191213b05 100644
--- a/kmail/urlhandlermanager.h
+++ b/kmail/urlhandlermanager.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     urlhandlermanager.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index 3066b559c..383daa94e 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     vacation.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/vacation.h b/kmail/vacation.h
index eac3bd9d7..2bf55d3e8 100644
--- a/kmail/vacation.h
+++ b/kmail/vacation.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     vacation.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index 192298954..6e74ab5b5 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     vacationdialog.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h
index d38c75d03..9d80e5f70 100644
--- a/kmail/vacationdialog.h
+++ b/kmail/vacationdialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     vacationdialog.h
 
     KMail, the KDE mail client.
diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h
index e65307145..c107299f0 100644
--- a/kmail/xfaceconfigurator.h
+++ b/kmail/xfaceconfigurator.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     xfaceconfigurator.cpp
 
     KMail, the KDE mail client.
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
index d7af77059..6aeb4fdea 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cxx
@@ -214,5 +214,3 @@ bool Filter::needsSecondPage()
 {
   return true;
 }
-
-// vim: ts=2 sw=2 et
diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp
index e5324e9ed..f3e8b8a25 100644
--- a/kmobile/systemtray.cpp
+++ b/kmobile/systemtray.cpp
@@ -102,5 +102,3 @@ void SystemTray::setToolTip(const TQString &tip)
 }
 
 #include "systemtray.moc"
-
-// vim: ts=8
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index 9e801a6ec..78d391495 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -1107,5 +1107,3 @@ void KNSendErrorDialog::slotHighlighted(int idx)
 
 //-------------------------------
 #include "knarticlefactory.moc"
-
-// kate: space-indent on; indent-width 2;
diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp
index 90cf0e7de..53b810897 100644
--- a/knode/knarticlewindow.cpp
+++ b/knode/knarticlewindow.cpp
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
 /*
     KNode, the KDE newsreader
     Copyright (c) 1999-2005 the KNode authors.
diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp
index 33714840c..8b2849a95 100644
--- a/knode/kncleanup.cpp
+++ b/knode/kncleanup.cpp
@@ -315,5 +315,3 @@ void KNCleanUp::ProgressDialog::closeEvent(TQCloseEvent *)
 {
   // do nothing => prevent that the user closes the window
 }
-
-// kate: space-indent on; indent-width 2;
diff --git a/knode/kncleanup.h b/knode/kncleanup.h
index 60a815163..d765dc154 100644
--- a/knode/kncleanup.h
+++ b/knode/kncleanup.h
@@ -68,5 +68,3 @@ class KNCleanUp {
 };
 
 #endif
-
-// kate: space-indent on; indent-width 2;
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index c13027a71..8695048e6 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -2657,5 +2657,3 @@ void KNComposer::AttachmentPropertiesDlg::slotMimeTypeTextChanged(const TQString
 //--------------------------------
 
 #include "kncomposer.moc"
-
-// kate: space-indent on; indent-width 2;
diff --git a/knode/kngroup.h b/knode/kngroup.h
index fef5c6d62..15f26839e 100644
--- a/knode/kngroup.h
+++ b/knode/kngroup.h
@@ -196,5 +196,3 @@ class KNGroup : public KNArticleCollection , public KNJobItem  {
 };
 
 #endif
-
-// kate: space-indent on; indent-width 2;
diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp
index 706e9d9b9..b429bd6c8 100644
--- a/knode/kngroupmanager.cpp
+++ b/knode/kngroupmanager.cpp
@@ -700,5 +700,3 @@ void KNGroupManager::slotCheckForNewGroups(KNNntpAccount *a, TQDate date)
 //--------------------------------
 
 #include "kngroupmanager.moc"
-
-// kate: space-indent on; indent-width 2;
diff --git a/knode/kngrouppropdlg.h b/knode/kngrouppropdlg.h
index 0c640bea6..c7c408b78 100644
--- a/knode/kngrouppropdlg.h
+++ b/knode/kngrouppropdlg.h
@@ -55,5 +55,3 @@ class KNGroupPropDlg : public KDialogBase  {
 };
 
 #endif
-
-// kate: space-indent on; indent-width 2;
diff --git a/knode/knnntpaccount.h b/knode/knnntpaccount.h
index 235670779..852fa9ab6 100644
--- a/knode/knnntpaccount.h
+++ b/knode/knnntpaccount.h
@@ -114,5 +114,3 @@ class KNNntpAccount : public KNCollection , public KNServerInfo {
 };
 
 #endif
-
-// kate: space-indent on; indent-width 2;
diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp
index ba594a9fb..20c62f1df 100644
--- a/knode/knstringfilter.cpp
+++ b/knode/knstringfilter.cpp
@@ -161,5 +161,3 @@ void KNStringFilterWidget::setStartFocus()
 // -----------------------------------------------------------------------------+
 
 #include "knstringfilter.moc"
-
-// kate: space-indent on; indent-width 2;
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index edaf86da4..3c270aa83 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -126,4 +126,3 @@ TQString Core::lastErrorMessage() const
 }
 
 #include "core.moc"
-// vim: sw=2 sts=2 et tw=80
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index 65e939b94..2e96fd0be 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -99,5 +99,3 @@ class KDE_EXPORT Core : public KParts::MainWindow
 }
 
 #endif
-
-// vim: sw=2 sts=2 et tw=80
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index ed81dcb65..3b63466c7 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -255,5 +255,3 @@ void Plugin::virtual_hook( int, void* ) {
 }
 
 #include "plugin.moc"
-
-// vim: sw=2 et sts=2 tw=80
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index d4852e80f..d6db8112b 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -213,5 +213,3 @@ int KABUniqueAppHandler::newInstance()
 }
 
 #include "kaddressbook_plugin.moc"
-
-// vim: sw=2 sts=2 tw=80 et
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 9ac186028..924938a0a 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -1,5 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
-
+/*
     This file is part of Kontact.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
diff --git a/kontact/src/about/kontact.css b/kontact/src/about/kontact.css
index 47188fe5f..d599a6306 100644
--- a/kontact/src/about/kontact.css
+++ b/kontact/src/about/kontact.css
@@ -23,6 +23,3 @@
 #subtext {
   font-style: italic;
 }
-
-/* vim:set sw=2 et nocindent smartindent: */
-
diff --git a/kontact/src/about/main.html b/kontact/src/about/main.html
index c2e10ec29..8460249cd 100644
--- a/kontact/src/about/main.html
+++ b/kontact/src/about/main.html
@@ -64,4 +64,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 39deb330c..338aeb8d6 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -599,5 +599,3 @@ void IconSidePane::indicateForegrunding( Kontact::Plugin *plugin )
 
 }
 #include "iconsidepane.moc"
-
-// vim: sw=2 sts=2 et tw=80
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index 57df05c07..e5d66378b 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -174,4 +174,3 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
 }
 
 #endif
-// vim: sw=2 sts=2 et
diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp
index 03999f879..d44897bec 100644
--- a/libemailfunctions/email.cpp
+++ b/libemailfunctions/email.cpp
@@ -1,5 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
-
+/*
     This file is part of tdepim.
     Copyright (c) 2004 TDEPIM developers
 
diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h
index 6c2a522d1..f8b5b46b7 100644
--- a/libemailfunctions/email.h
+++ b/libemailfunctions/email.h
@@ -1,5 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
-
+/*
     This file is part of tdepim.
     Copyright (c) 2004 TDEPIM developers
 
diff --git a/libemailfunctions/kasciistringtools.cpp b/libemailfunctions/kasciistringtools.cpp
index a9e6fb60e..9d7590af1 100644
--- a/libemailfunctions/kasciistringtools.cpp
+++ b/libemailfunctions/kasciistringtools.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kasciistringtools.cpp
 
     This file is part of libtdepim.
diff --git a/libemailfunctions/kasciistringtools.h b/libemailfunctions/kasciistringtools.h
index ac19960db..c67e5c317 100644
--- a/libemailfunctions/kasciistringtools.h
+++ b/libemailfunctions/kasciistringtools.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kasciistringtools.h
 
     This file is part of libtdepim.
diff --git a/libkcal/assignmentvisitor.cpp b/libkcal/assignmentvisitor.cpp
index 023df8572..c5599e930 100644
--- a/libkcal/assignmentvisitor.cpp
+++ b/libkcal/assignmentvisitor.cpp
@@ -119,5 +119,3 @@ bool AssignmentVisitor::visit( FreeBusy *freebusy )
   *freebusy = *source;
   return true;
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/libkcal/assignmentvisitor.h b/libkcal/assignmentvisitor.h
index 2be0215cc..12d6daac3 100644
--- a/libkcal/assignmentvisitor.h
+++ b/libkcal/assignmentvisitor.h
@@ -119,4 +119,3 @@ class AssignmentVisitor : public IncidenceBase::Visitor
 }
 
 #endif
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/libkcal/libical/src/libical/icalattach.c b/libkcal/libical/src/libical/icalattach.c
index 106096bf9..a2c1bd4c7 100644
--- a/libkcal/libical/src/libical/icalattach.c
+++ b/libkcal/libical/src/libical/icalattach.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C -*-
+/*
   ======================================================================
   FILE: icalattach.c
   CREATOR: acampi 28 May 02
diff --git a/libkmime/kmime_charfreq.h b/libkmime/kmime_charfreq.h
index 014cae6e3..280c48999 100644
--- a/libkmime/kmime_charfreq.h
+++ b/libkmime/kmime_charfreq.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_charfreq.h
 
     KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_codec_base64.cpp b/libkmime/kmime_codec_base64.cpp
index e1c4d499a..4b4020cb9 100644
--- a/libkmime/kmime_codec_base64.cpp
+++ b/libkmime/kmime_codec_base64.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_codec_base64.cpp
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_codec_base64.h b/libkmime/kmime_codec_base64.h
index 6d80d9b92..6d9b867f7 100644
--- a/libkmime/kmime_codec_base64.h
+++ b/libkmime/kmime_codec_base64.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_codec_base64.h
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_codec_identity.cpp b/libkmime/kmime_codec_identity.cpp
index 27fe8f42e..39792a21e 100644
--- a/libkmime/kmime_codec_identity.cpp
+++ b/libkmime/kmime_codec_identity.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_codec_identity.cpp
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_codec_identity.h b/libkmime/kmime_codec_identity.h
index a18cfd1ff..4ded0f8bf 100644
--- a/libkmime/kmime_codec_identity.h
+++ b/libkmime/kmime_codec_identity.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_codec_identity.h
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_codec_qp.cpp b/libkmime/kmime_codec_qp.cpp
index 149b01f2a..b625346fa 100644
--- a/libkmime/kmime_codec_qp.cpp
+++ b/libkmime/kmime_codec_qp.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_codec_qp.cpp
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_codec_qp.h b/libkmime/kmime_codec_qp.h
index a80226f56..28bb79f72 100644
--- a/libkmime/kmime_codec_qp.h
+++ b/libkmime/kmime_codec_qp.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_codec_qp.h
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_codec_uuencode.cpp b/libkmime/kmime_codec_uuencode.cpp
index fe5acf4f0..ada9416d5 100644
--- a/libkmime/kmime_codec_uuencode.cpp
+++ b/libkmime/kmime_codec_uuencode.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_codec_uuencode.cpp
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_codec_uuencode.h b/libkmime/kmime_codec_uuencode.h
index 80288b412..0477c93c4 100644
--- a/libkmime/kmime_codec_uuencode.h
+++ b/libkmime/kmime_codec_uuencode.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_codec_uuencode.h
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_codecs.cpp b/libkmime/kmime_codecs.cpp
index bf33159e0..361b224c5 100644
--- a/libkmime/kmime_codecs.cpp
+++ b/libkmime/kmime_codecs.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_codecs.cpp
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h
index 1bd8c9ecf..cd1e588ad 100644
--- a/libkmime/kmime_codecs.h
+++ b/libkmime/kmime_codecs.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_codecs.h
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp
index 5c9423b72..1e9007028 100644
--- a/libkmime/kmime_header_parsing.cpp
+++ b/libkmime/kmime_header_parsing.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_header_parsing.cpp
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h
index d567e5fe3..efa2192bc 100644
--- a/libkmime/kmime_header_parsing.h
+++ b/libkmime/kmime_header_parsing.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_header_parsing.h
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h
index 4c2b73136..6978ffed2 100644
--- a/libkmime/kmime_headers.h
+++ b/libkmime/kmime_headers.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*
+/*
     kmime_headers.h
 
     KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_mdn.cpp b/libkmime/kmime_mdn.cpp
index 4040d8934..60142120b 100644
--- a/libkmime/kmime_mdn.cpp
+++ b/libkmime/kmime_mdn.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_mdn.cpp
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_mdn.h b/libkmime/kmime_mdn.h
index 30fa238a6..57b58a340 100644
--- a/libkmime/kmime_mdn.h
+++ b/libkmime/kmime_mdn.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_mdn.h
 
     This file is part of KMime, the KDE internet mail/usenet news message library.
diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h
index 4619446a4..736e15831 100644
--- a/libkmime/kmime_util.h
+++ b/libkmime/kmime_util.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmime_util.h
 
     KMime, the KDE internet mail/usenet news message library.
diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index 4d5120d0e..bd4193bfc 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     kpgp.cpp
 
     Copyright (C) 2001,2002 the KPGP authors
diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h
index 184b61f54..5756d9ed0 100644
--- a/libkpgp/kpgpui.h
+++ b/libkpgp/kpgpui.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kpgpui.h
 
     Copyright (C) 2001,2002 the KPGP authors
diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index c43620ea3..f81bc3b15 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // tdemidentity.cpp
 // License: GPL
 
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index c1af97e15..2cc4ec4ec 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * User identity information
  *
  * Author: Stefan Taferner <taferner@kde.org>
diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp
index adc79efd1..8644cb5aa 100644
--- a/libkpimidentities/identitycombo.cpp
+++ b/libkpimidentities/identitycombo.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitycombo.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h
index 1644f9c2f..5fcfa7eec 100644
--- a/libkpimidentities/identitycombo.h
+++ b/libkpimidentities/identitycombo.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitycombo.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index c7b97216a..354145021 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     identitymanager.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index b0aee59d4..b341891f0 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitymanager.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/libksieve/impl/lexer.h b/libksieve/impl/lexer.h
index f25abdd5a..ee64745be 100644
--- a/libksieve/impl/lexer.h
+++ b/libksieve/impl/lexer.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     impl/lexer.h
 
     Internal header file. Subject to change without notice. DO NOT USE.
diff --git a/libksieve/impl/parser.h b/libksieve/impl/parser.h
index dd8b82283..3fdb8b721 100644
--- a/libksieve/impl/parser.h
+++ b/libksieve/impl/parser.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     impl/parser.h
 
     Internal header file. Subject to change without notice. DO NOT USE.
diff --git a/libksieve/impl/utf8validator.h b/libksieve/impl/utf8validator.h
index e0f11222b..c193b56b8 100644
--- a/libksieve/impl/utf8validator.h
+++ b/libksieve/impl/utf8validator.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     impl/utf8validator.h
 
     This file is part of KSieve,
diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h
index d2adcd8bd..def7e0145 100644
--- a/libksieve/ksieve/error.h
+++ b/libksieve/ksieve/error.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     ksieve/error.h
 
     This file is part of KSieve,
diff --git a/libksieve/ksieve/lexer.h b/libksieve/ksieve/lexer.h
index d4dc7a972..4fce631c2 100644
--- a/libksieve/ksieve/lexer.h
+++ b/libksieve/ksieve/lexer.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     ksieve/lexer.h
 
     This file is part of KSieve,
diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h
index 88bb94189..72db29353 100644
--- a/libksieve/ksieve/parser.h
+++ b/libksieve/ksieve/parser.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     ksieve/parser.h
 
     This file is part of KSieve,
diff --git a/libksieve/ksieve/scriptbuilder.h b/libksieve/ksieve/scriptbuilder.h
index f365adfa3..9da7ce786 100644
--- a/libksieve/ksieve/scriptbuilder.h
+++ b/libksieve/ksieve/scriptbuilder.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     ksieve/interfaces/scriptbuilder.h
 
     This file is part of KSieve,
diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp
index 93c5732a1..4b0ebf4f1 100644
--- a/libksieve/parser/lexer.cpp
+++ b/libksieve/parser/lexer.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     parser/lexer.cpp
 
     This file is part of KSieve,
diff --git a/libksieve/parser/parser.cpp b/libksieve/parser/parser.cpp
index c04599754..68718c327 100644
--- a/libksieve/parser/parser.cpp
+++ b/libksieve/parser/parser.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     parser/parser.cpp
 
     This file is part of KSieve,
diff --git a/libksieve/parser/utf8validator.cpp b/libksieve/parser/utf8validator.cpp
index b8600e7b4..5204383a1 100644
--- a/libksieve/parser/utf8validator.cpp
+++ b/libksieve/parser/utf8validator.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     utf8validator.cpp
 
     This file is part of KSieve,
diff --git a/libksieve/shared/error.cpp b/libksieve/shared/error.cpp
index 400587c3d..a39e7de92 100644
--- a/libksieve/shared/error.cpp
+++ b/libksieve/shared/error.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     error.cpp
 
     This file is part of KSieve,
diff --git a/libksieve/tests/lexertest.cpp b/libksieve/tests/lexertest.cpp
index 43d641fc2..d3e54ba67 100644
--- a/libksieve/tests/lexertest.cpp
+++ b/libksieve/tests/lexertest.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     tests/lexertest.cpp
 
     This file is part of the testsuite of KSieve,
diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp
index ea718e4d2..a671b821f 100644
--- a/libksieve/tests/parsertest.cpp
+++ b/libksieve/tests/parsertest.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     tests/parsertest.cpp
 
     This file is part of the testsuite of KSieve,
diff --git a/libtdenetwork/gpgmepp/context.h b/libtdenetwork/gpgmepp/context.h
index 054f8bee7..e886d8320 100644
--- a/libtdenetwork/gpgmepp/context.h
+++ b/libtdenetwork/gpgmepp/context.h
@@ -16,8 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with GPGME++; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
 #ifndef __GPGMEPP_CONTEXT_H__
 #define __GPGMEPP_CONTEXT_H__
 
diff --git a/libtdenetwork/gpgmepp/context_p.h b/libtdenetwork/gpgmepp/context_p.h
index dfff58634..5d44ba7ca 100644
--- a/libtdenetwork/gpgmepp/context_p.h
+++ b/libtdenetwork/gpgmepp/context_p.h
@@ -16,9 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with GPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-
-// -*- c++ -*- 
 #ifndef __GPGMEPP_CONTEXT_P_H__
 #define __GPGMEPP_CONTEXT_P_H__
 
diff --git a/libtdenetwork/gpgmepp/data_p.h b/libtdenetwork/gpgmepp/data_p.h
index 38981cce9..7f2c83fc3 100644
--- a/libtdenetwork/gpgmepp/data_p.h
+++ b/libtdenetwork/gpgmepp/data_p.h
@@ -1,4 +1,4 @@
-/* data_p.h - wraps a gpgme data object, private part -*- c++ -*-
+/*
    Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB
 
    This file is part of GPGME++.
diff --git a/libtdenetwork/gpgmepp/eventloopinteractor.h b/libtdenetwork/gpgmepp/eventloopinteractor.h
index c3688833c..0bf3785f8 100644
--- a/libtdenetwork/gpgmepp/eventloopinteractor.h
+++ b/libtdenetwork/gpgmepp/eventloopinteractor.h
@@ -16,8 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with GPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
 #ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__
 #define __GPGMEPP_EVENTLOOPINTERACTOR_H__
 
diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h
index f05d372db..753ffec06 100644
--- a/libtdenetwork/gpgmepp/key.h
+++ b/libtdenetwork/gpgmepp/key.h
@@ -16,8 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with GPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
 #ifndef __GPGMEPP_KEY_H__
 #define __GPGMEPP_KEY_H__
 
diff --git a/libtdenetwork/gpgmepp/shared.h b/libtdenetwork/gpgmepp/shared.h
index f9c79e0cc..e263d8f1d 100644
--- a/libtdenetwork/gpgmepp/shared.h
+++ b/libtdenetwork/gpgmepp/shared.h
@@ -1,4 +1,4 @@
-/* shared.h - internal tool for refcounting -*- c++ -*-
+/*
    Copyright (C) 2003 Klarälvdalens Datakonsult AB
 
    This file is part of GPGME++.
diff --git a/libtdenetwork/gpgmepp/trustitem.h b/libtdenetwork/gpgmepp/trustitem.h
index 61c74617b..aa1850b5c 100644
--- a/libtdenetwork/gpgmepp/trustitem.h
+++ b/libtdenetwork/gpgmepp/trustitem.h
@@ -16,8 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with GPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
 #ifndef __GPGMEPP_TRUSTITEM_H__
 #define __GPGMEPP_TRUSTITEM_H__
 
diff --git a/libtdenetwork/gpgmepp/util.h b/libtdenetwork/gpgmepp/util.h
index 8246cfc32..088a81c4c 100644
--- a/libtdenetwork/gpgmepp/util.h
+++ b/libtdenetwork/gpgmepp/util.h
@@ -16,8 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with GPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
 #ifndef __GPGMEPP_UTIL_H__
 #define __GPGMEPP_UTIL_H__
 
diff --git a/libtdenetwork/qgpgme/dataprovider.cpp b/libtdenetwork/qgpgme/dataprovider.cpp
index 308fbc12f..af3bc7155 100644
--- a/libtdenetwork/qgpgme/dataprovider.cpp
+++ b/libtdenetwork/qgpgme/dataprovider.cpp
@@ -16,9 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
-
 #include <config.h>
 
 #include <qgpgme/dataprovider.h>
diff --git a/libtdenetwork/qgpgme/dataprovider.h b/libtdenetwork/qgpgme/dataprovider.h
index 58c097d1e..36e2afc77 100644
--- a/libtdenetwork/qgpgme/dataprovider.h
+++ b/libtdenetwork/qgpgme/dataprovider.h
@@ -16,8 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
 #ifndef __TQGPGME_DATAPROVIDER_H__
 #define __TQGPGME_DATAPROVIDER_H__
 
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.cpp b/libtdenetwork/qgpgme/eventloopinteractor.cpp
index b6d9830d6..3e75bf892 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.cpp
+++ b/libtdenetwork/qgpgme/eventloopinteractor.cpp
@@ -16,9 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.h b/libtdenetwork/qgpgme/eventloopinteractor.h
index b89b1841e..64abc576a 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.h
+++ b/libtdenetwork/qgpgme/eventloopinteractor.h
@@ -16,8 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
 #ifndef __TQGPGME_EVENTLOOPINTERACTOR_H__
 #define __TQGPGME_EVENTLOOPINTERACTOR_H__
 
diff --git a/libtdenetwork/qgpgme/tests/dataprovidertest.cpp b/libtdenetwork/qgpgme/tests/dataprovidertest.cpp
index 675c85ea8..c72ac36c4 100644
--- a/libtdenetwork/qgpgme/tests/dataprovidertest.cpp
+++ b/libtdenetwork/qgpgme/tests/dataprovidertest.cpp
@@ -16,9 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
-
 #ifdef NDEBUG
 #undef NDEBUG
 #endif
diff --git a/libtdepim/about/kde_infopage.css b/libtdepim/about/kde_infopage.css
index e943b888d..93452a7dd 100644
--- a/libtdepim/about/kde_infopage.css
+++ b/libtdepim/about/kde_infopage.css
@@ -324,5 +324,3 @@ body {margin: 0px; padding: 0px; background-color: #003070; background-image: ur
   height: 100px;
   z-index: -1;
 }
-
-/* vim:set sw=2 et nocindent smartindent: */
diff --git a/libtdepim/about/kde_infopage_rtl.css b/libtdepim/about/kde_infopage_rtl.css
index 003330196..5be375263 100644
--- a/libtdepim/about/kde_infopage_rtl.css
+++ b/libtdepim/about/kde_infopage_rtl.css
@@ -7,5 +7,3 @@ body {direction: rtl}
 #nextlink {
     text-align: left;
 }
-
-/* vim:set sw=2 et nocindent smartindent: */
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index d764b3765..e0071ef04 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of libtdepim.
  *
diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h
index 1cc383b21..e87866c73 100644
--- a/libtdepim/addressesdialog.h
+++ b/libtdepim/addressesdialog.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of libtdepim.
  *
diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h
index 962fe15da..106b59749 100644
--- a/libtdepim/collectingprocess.h
+++ b/libtdepim/collectingprocess.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++ -*-
+/*
     collectingprocess.h
 
     This file is part of libtdepim.
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 924a669a5..bc6f8839a 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -1,4 +1,4 @@
-/** -*- c++ -*-
+/*
  * completionordereditor.cpp
  *
  *  Copyright (c) 2004 David Faure <faure@kde.org>
diff --git a/libtdepim/completionordereditor.h b/libtdepim/completionordereditor.h
index 53061f04f..f7ac80448 100644
--- a/libtdepim/completionordereditor.h
+++ b/libtdepim/completionordereditor.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * completionordereditor.h
  *
  *  Copyright (c) 2004 David Faure <faure@kde.org>
diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h
index 37147843d..87d48e4e2 100644
--- a/libtdepim/configmanager.h
+++ b/libtdepim/configmanager.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     configmanager.h
 
     KMail, the KDE mail client.
diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp
index bb4d8ea99..8ed060da2 100644
--- a/libtdepim/csshelper.cpp
+++ b/libtdepim/csshelper.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     csshelper.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/libtdepim/csshelper.h b/libtdepim/csshelper.h
index ab9190cf8..0d5b1a44e 100644
--- a/libtdepim/csshelper.h
+++ b/libtdepim/csshelper.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     csshelper.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/libtdepim/kaccount.cpp b/libtdepim/kaccount.cpp
index 86cf4cfca..292365db7 100644
--- a/libtdepim/kaccount.cpp
+++ b/libtdepim/kaccount.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kaccount.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h
index 559a3c03c..06c0a7c1e 100644
--- a/libtdepim/kaccount.h
+++ b/libtdepim/kaccount.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kaccount.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index c0122923a..b32b017ed 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kaddrbook.cpp
 // Author: Stefan Taferner <taferner@kde.org>
 // This code is under GPL
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index f353c4d39..a06af1368 100644
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 2 -*-
-
 #include "kfoldertree.h"
 #include <tdelocale.h>
 #include <tdeio/global.h>
diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h
index bec5e030c..d9f0a1a68 100644
--- a/libtdepim/kfoldertree.h
+++ b/libtdepim/kfoldertree.h
@@ -1,5 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
-
+/*
    This file is part of libtdepim.
 
    Copyright (C) 2002 Carsten Burghardt <burghardt@kde.org>
diff --git a/libtdepim/komposer/core/attachment.cpp b/libtdepim/komposer/core/attachment.cpp
index df803de60..6d5017e91 100644
--- a/libtdepim/komposer/core/attachment.cpp
+++ b/libtdepim/komposer/core/attachment.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * attachment.cpp
  *
diff --git a/libtdepim/komposer/core/attachment.h b/libtdepim/komposer/core/attachment.h
index 5c4e1ebf2..8344c8d76 100644
--- a/libtdepim/komposer/core/attachment.h
+++ b/libtdepim/komposer/core/attachment.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * attachment.h
  *
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index fa8e1dc1a..2616f8e2d 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * core.cpp
  *
diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h
index 92235a18f..482ee1dbd 100644
--- a/libtdepim/komposer/core/core.h
+++ b/libtdepim/komposer/core/core.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * core.h
  *
diff --git a/libtdepim/komposer/core/corewidget.cpp b/libtdepim/komposer/core/corewidget.cpp
index c65893766..d9130f533 100644
--- a/libtdepim/komposer/core/corewidget.cpp
+++ b/libtdepim/komposer/core/corewidget.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * corewidget.cpp
  *
diff --git a/libtdepim/komposer/core/corewidget.h b/libtdepim/komposer/core/corewidget.h
index dbe1d6747..c2a6a0e78 100644
--- a/libtdepim/komposer/core/corewidget.h
+++ b/libtdepim/komposer/core/corewidget.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * corewidget.h
  *
diff --git a/libtdepim/komposer/core/editor.cpp b/libtdepim/komposer/core/editor.cpp
index 5dada393f..83b11b0e8 100644
--- a/libtdepim/komposer/core/editor.cpp
+++ b/libtdepim/komposer/core/editor.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * editor.cpp
  *
diff --git a/libtdepim/komposer/core/editor.h b/libtdepim/komposer/core/editor.h
index a1845f6fe..4e595b3f7 100644
--- a/libtdepim/komposer/core/editor.h
+++ b/libtdepim/komposer/core/editor.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * editor.h
  *
diff --git a/libtdepim/komposer/core/plugin.cpp b/libtdepim/komposer/core/plugin.cpp
index 41af47cd9..133d203d5 100644
--- a/libtdepim/komposer/core/plugin.cpp
+++ b/libtdepim/komposer/core/plugin.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * plugin.cpp
  *
diff --git a/libtdepim/komposer/core/plugin.h b/libtdepim/komposer/core/plugin.h
index c14bcc6bf..ac0b54980 100644
--- a/libtdepim/komposer/core/plugin.h
+++ b/libtdepim/komposer/core/plugin.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * plugin.h
  *
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 2e5aa4f67..9a33b9904 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 2; -*-
 /**
  * pluginmanager.cpp
  * Most of this code has been lifted from Martijn's KopetePluginManager class
diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h
index eae6d49a6..d9366b3ff 100644
--- a/libtdepim/komposer/core/pluginmanager.h
+++ b/libtdepim/komposer/core/pluginmanager.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * pluginmanager.h
  *
diff --git a/libtdepim/kregexp3.cpp b/libtdepim/kregexp3.cpp
index d60946c28..006872ec3 100644
--- a/libtdepim/kregexp3.cpp
+++ b/libtdepim/kregexp3.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kregexp3.cpp
 
     This file is part of libtdenetwork.
diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h
index 4622e16db..ab27c4ea3 100644
--- a/libtdepim/kregexp3.h
+++ b/libtdepim/kregexp3.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kregexp3.h
 
     This file is part of libtdenetwork.
diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp
index dc4e8a620..d279c8bcc 100644
--- a/libtdepim/kwidgetlister.cpp
+++ b/libtdepim/kwidgetlister.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kwidgetlister.cpp
 
     This file is part of libtdenetwork.
diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h
index 4eb189c2e..449172c31 100644
--- a/libtdepim/kwidgetlister.h
+++ b/libtdepim/kwidgetlister.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kwidgetlister.h
 
     This file is part of libtdenetwork.
diff --git a/libtdepim/overlaywidget.cpp b/libtdepim/overlaywidget.cpp
index 338a6c428..7c72883c4 100644
--- a/libtdepim/overlaywidget.cpp
+++ b/libtdepim/overlaywidget.cpp
@@ -1,4 +1,4 @@
-/** -*- c++ -*-
+/*
  * overlaywidget.h
  *
  *  Copyright (c) 2004 David Faure <faure@kde.org>
diff --git a/libtdepim/overlaywidget.h b/libtdepim/overlaywidget.h
index c25f00d77..7ba8d4d8c 100644
--- a/libtdepim/overlaywidget.h
+++ b/libtdepim/overlaywidget.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * overlaywidget.h
  *
  *  Copyright (c) 2004 David Faure <faure@kde.org>
diff --git a/libtdepim/pluginloader.h b/libtdepim/pluginloader.h
index c6b805551..1ec8dc6f9 100644
--- a/libtdepim/pluginloader.h
+++ b/libtdepim/pluginloader.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     This file is part of libtdepim.
 
     Copyright (c) 2002,2004 Marc Mutz <mutz@kde.org>
diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp
index 911fbba6e..090c2fb7e 100644
--- a/libtdepim/pluginloaderbase.cpp
+++ b/libtdepim/pluginloaderbase.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     This file is part of libtdepim.
 
     Copyright (c) 2002,2004 Marc Mutz <mutz@kde.org>
diff --git a/libtdepim/pluginloaderbase.h b/libtdepim/pluginloaderbase.h
index 919a3121b..384ccf014 100644
--- a/libtdepim/pluginloaderbase.h
+++ b/libtdepim/pluginloaderbase.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     This file is part of libtdepim.
 
     Copyright (c) 2002,2004 Marc Mutz <mutz@kde.org>
diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp
index 061ea781f..d3a37003b 100644
--- a/libtdepim/progressdialog.cpp
+++ b/libtdepim/progressdialog.cpp
@@ -1,4 +1,4 @@
-/** -*- c++ -*-
+/*
  * progressdialog.cpp
  *
  *  Copyright (c) 2004 Till Adam <adam@kde.org>,
diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h
index 70d4034c4..b650d0ec6 100644
--- a/libtdepim/progressdialog.h
+++ b/libtdepim/progressdialog.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * progressdialog.h
  *
  *  Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp
index a3ed83d7d..7ba218c2a 100644
--- a/libtdepim/recentaddresses.cpp
+++ b/libtdepim/recentaddresses.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  Copyright (c) 2001-2003 Carsten Pfeiffer <pfeiffer@kde.org>
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h
index 4207105ba..774f1e061 100644
--- a/libtdepim/recentaddresses.h
+++ b/libtdepim/recentaddresses.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  Copyright (c) 2001-2003 Carsten Pfeiffer <pfeiffer@kde.org>
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/libtdepim/sidebarextension.cpp b/libtdepim/sidebarextension.cpp
index 862792813..9c5113dbb 100644
--- a/libtdepim/sidebarextension.cpp
+++ b/libtdepim/sidebarextension.cpp
@@ -36,5 +36,3 @@ SideBarExtension::~SideBarExtension()
 }
 
 #include "sidebarextension.moc"
-
-// vim: ts=2 sw=2 et
diff --git a/libtdepim/sidebarextension.h b/libtdepim/sidebarextension.h
index a8cf13dfc..e084ce081 100644
--- a/libtdepim/sidebarextension.h
+++ b/libtdepim/sidebarextension.h
@@ -65,5 +65,3 @@ namespace KParts
   };
 }
 #endif // SIDEBAREXTENSION_H
-
-// vim: ts=2 sw=2 et
diff --git a/libtdepim/ssllabel.cpp b/libtdepim/ssllabel.cpp
index fc876fad1..946b68f13 100644
--- a/libtdepim/ssllabel.cpp
+++ b/libtdepim/ssllabel.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *
diff --git a/libtdepim/ssllabel.h b/libtdepim/ssllabel.h
index 03a841bed..c4105fbe1 100644
--- a/libtdepim/ssllabel.h
+++ b/libtdepim/ssllabel.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *
diff --git a/libtdepim/weaver.cpp b/libtdepim/weaver.cpp
index b1dba8de7..5743b57ba 100644
--- a/libtdepim/weaver.cpp
+++ b/libtdepim/weaver.cpp
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file implements the Weaver, Job and Thread classes.
 
    $ Author: Mirko Boehm $
diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h
index d914d9801..3f0d1e734 100644
--- a/libtdepim/weaver.h
+++ b/libtdepim/weaver.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file declares the Weaver, Job and Thread classes.
 
    $ Author: Mirko Boehm $
diff --git a/libtdepim/weaverextensions.cpp b/libtdepim/weaverextensions.cpp
index 9859b6d6b..ad5b144c3 100644
--- a/libtdepim/weaverextensions.cpp
+++ b/libtdepim/weaverextensions.cpp
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file implements the Weaver Extensions basics.
 
    $ Author: Mirko Boehm $
diff --git a/libtdepim/weaverextensions.h b/libtdepim/weaverextensions.h
index 7c2cf1703..b107378e1 100644
--- a/libtdepim/weaverextensions.h
+++ b/libtdepim/weaverextensions.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file declares the Weaver Extensions basics.
 
    $ Author: Mirko Boehm $
diff --git a/libtdepim/weaverlogger.cpp b/libtdepim/weaverlogger.cpp
index e5164c804..0a1b5a957 100644
--- a/libtdepim/weaverlogger.cpp
+++ b/libtdepim/weaverlogger.cpp
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file implements the Thread Logger.
 
    $ Author: Mirko Boehm $
diff --git a/libtdepim/weaverlogger.h b/libtdepim/weaverlogger.h
index 962968a1f..54e7e0102 100644
--- a/libtdepim/weaverlogger.h
+++ b/libtdepim/weaverlogger.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file declares the Thread Logger.
 
    $ Author: Mirko Boehm $
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 3f0f9014f..178cd4780 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     text_vcard.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/tderesources/blogging/xmlrpcjob.h b/tderesources/blogging/xmlrpcjob.h
index d58384487..c03346a60 100644
--- a/tderesources/blogging/xmlrpcjob.h
+++ b/tderesources/blogging/xmlrpcjob.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 /* This file is part of the KDE libraries
     Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
     Based on the davjob:
diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp
index 4659bd46d..c9e03daaf 100644
--- a/tderesources/lib/folderlistview.cpp
+++ b/tderesources/lib/folderlistview.cpp
@@ -293,4 +293,3 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i
 //END
 
 #include "folderlistview.moc"
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/tderesources/lib/folderlistview.h b/tderesources/lib/folderlistview.h
index ce6243df0..08cadce6b 100644
--- a/tderesources/lib/folderlistview.h
+++ b/tderesources/lib/folderlistview.h
@@ -126,5 +126,3 @@ class FolderListItem : public TQCheckListItem
 
 
 #endif
-
-// kate: space-indent on; indent-width 2; replace-tabs on;