diff --git a/conduits/docconduit/pilotDOCBookmark.h b/conduits/docconduit/pilotDOCBookmark.h
index fe511fc..7302e5b 100644
--- a/conduits/docconduit/pilotDOCBookmark.h
+++ b/conduits/docconduit/pilotDOCBookmark.h
@@ -1,4 +1,4 @@
-/* pilotDOCBookmark.h	-*- C++ -*-		KPilot
+/* pilotDOCBookmark.h			KPilot
 **
 ** Copyright (C) 2003 by Reinhold Kainhofer
 **
diff --git a/conduits/docconduit/pilotDOCEntry.h b/conduits/docconduit/pilotDOCEntry.h
index 4ecaf19..fd9364d 100644
--- a/conduits/docconduit/pilotDOCEntry.h
+++ b/conduits/docconduit/pilotDOCEntry.h
@@ -1,4 +1,4 @@
-/* pilotDOCEntry.h	-*- C++ -*-		KPilot
+/* pilotDOCEntry.h			KPilot
 **
 ** Copyright (C) 2002 by Reinhold Kainhofer
 **
diff --git a/conduits/docconduit/pilotDOCHead.h b/conduits/docconduit/pilotDOCHead.h
index aeb7fb5..1a42376 100644
--- a/conduits/docconduit/pilotDOCHead.h
+++ b/conduits/docconduit/pilotDOCHead.h
@@ -1,4 +1,4 @@
-/* pilotDOCHead.h	-*- C++ -*-		KPilot
+/* pilotDOCHead.h			KPilot
 **
 ** Copyright (C) 2002 by Reinhold Kainhofer
 **
diff --git a/conduits/vcalconduit/vcal-conduit.cc b/conduits/vcalconduit/vcal-conduit.cc
index 2cdc5d3..36c394d 100644
--- a/conduits/vcalconduit/vcal-conduit.cc
+++ b/conduits/vcalconduit/vcal-conduit.cc
@@ -302,8 +302,3 @@ VCalConduitSettings *VCalConduit::theConfig()
 VCalConduitSettings *VCalConduit::config() {
 	return theConfig();
 }
-
-
-
-// vim: ts=4:sw=4:noexpandtab:
-
diff --git a/doc/kpilot/index.docbook b/doc/kpilot/index.docbook
index e787e5a..506116b 100644
--- a/doc/kpilot/index.docbook
+++ b/doc/kpilot/index.docbook
@@ -271,10 +271,3 @@ Documentation copyright 2004,2005 Carlos Leonhard Woelz
 
 &documentation.index;
 </book>
-<!--
-Local Variables:
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
-
diff --git a/kpilot/addressEditor.cc b/kpilot/addressEditor.cc
index 47f9a3a..c9e4f9b 100644
--- a/kpilot/addressEditor.cc
+++ b/kpilot/addressEditor.cc
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /* KPilot
 **
 ** Copyright (C) 2000 by Dan Pilone
diff --git a/kpilot/addressEditor.h b/kpilot/addressEditor.h
index 134ebbb..20a7c4c 100644
--- a/kpilot/addressEditor.h
+++ b/kpilot/addressEditor.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /* addressEditor.h		KPilot
 **
 ** Copyright (C) 1998-2000 by Dan Pilone
diff --git a/kpilot/kpilotui.rc b/kpilot/kpilotui.rc
index d5e6ac4..21bf8dc 100644
--- a/kpilot/kpilotui.rc
+++ b/kpilot/kpilotui.rc
@@ -40,14 +40,3 @@
 </ToolBar>
 
 </kpartgui>
-
-
-<!--
-Local Variables:
-mode: xml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-general-insert-case: lower
-End:
--->
-
diff --git a/kpilot/todoEditor.cc b/kpilot/todoEditor.cc
index d7017bb..00f5c45 100644
--- a/kpilot/todoEditor.cc
+++ b/kpilot/todoEditor.cc
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /* KPilot
 **
 ** Copyright (C) 2000 by Dan Pilone
diff --git a/kpilot/todoEditor.h b/kpilot/todoEditor.h
index e8d2acf..bc56014 100644
--- a/kpilot/todoEditor.h
+++ b/kpilot/todoEditor.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /* todoEditor.h		KPilot
 **
 ** Copyright (C) 1998-2000 by Dan Pilone
diff --git a/lib/pilotDateEntry.h b/lib/pilotDateEntry.h
index 765a562..4d33693 100644
--- a/lib/pilotDateEntry.h
+++ b/lib/pilotDateEntry.h
@@ -1,6 +1,6 @@
 #ifndef _KPILOT_PILOTDATEENTRY_H
 #define _KPILOT_PILOTDATEENTRY_H
-/* pilotDateEntry.h	-*- C++ -*-	KPilot
+/* pilotDateEntry.h		KPilot
 **
 ** Copyright (C) 1998-2001 by Dan Pilone
 ** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/lib/pilotTodoEntry.h b/lib/pilotTodoEntry.h
index 999bb1f..89f0e06 100644
--- a/lib/pilotTodoEntry.h
+++ b/lib/pilotTodoEntry.h
@@ -1,6 +1,6 @@
 #ifndef _KPILOT_PILOTTODOENTRY_H
 #define _KPILOT_PILOTTODOENTRY_H
-/* pilotTodoEntry.h	-*- C++ -*-		KPilot
+/* pilotTodoEntry.h			KPilot
 **
 ** Copyright (C) 1998-2001 by Dan Pilone
 ** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>