diff --git a/src/add-caldav-object.c b/src/add-caldav-object.c
index 68a4377..0b4377d 100644
--- a/src/add-caldav-object.c
+++ b/src/add-caldav-object.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/add-caldav-object.h b/src/add-caldav-object.h
index 0756e74..e6aa00f 100644
--- a/src/add-caldav-object.h
+++ b/src/add-caldav-object.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/caldav-utils.c b/src/caldav-utils.c
index aa3f02e..7a219a2 100644
--- a/src/caldav-utils.c
+++ b/src/caldav-utils.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/caldav-utils.h b/src/caldav-utils.h
index 02c84d7..dc3ac75 100644
--- a/src/caldav-utils.h
+++ b/src/caldav-utils.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/caldav.c b/src/caldav.c
index a097946..e37efe0 100644
--- a/src/caldav.c
+++ b/src/caldav.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/caldav.h b/src/caldav.h
index 98f0acc..e6a4a26 100644
--- a/src/caldav.h
+++ b/src/caldav.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /**
  * @file caldav.h
  * @brief interface to the caldav library.
diff --git a/src/delete-caldav-object.c b/src/delete-caldav-object.c
index c634e47..2e1a587 100644
--- a/src/delete-caldav-object.c
+++ b/src/delete-caldav-object.c
@@ -1,4 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/delete-caldav-object.h b/src/delete-caldav-object.h
index cddf711..5ba1431 100644
--- a/src/delete-caldav-object.h
+++ b/src/delete-caldav-object.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/get-caldav-report.c b/src/get-caldav-report.c
index d916259..8102306 100644
--- a/src/get-caldav-report.c
+++ b/src/get-caldav-report.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4 smarttab: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/get-caldav-report.h b/src/get-caldav-report.h
index f769685..f8d04da 100644
--- a/src/get-caldav-report.h
+++ b/src/get-caldav-report.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/get-display-name.c b/src/get-display-name.c
index 8fc0ff8..112bc01 100644
--- a/src/get-display-name.c
+++ b/src/get-display-name.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4 smarttab: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/get-display-name.h b/src/get-display-name.h
index 5c80272..9ffadaa 100644
--- a/src/get-display-name.h
+++ b/src/get-display-name.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/get-freebusy-report.c b/src/get-freebusy-report.c
index f75ab92..3adc03f 100644
--- a/src/get-freebusy-report.c
+++ b/src/get-freebusy-report.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4 smarttab: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/get-freebusy-report.h b/src/get-freebusy-report.h
index 6c52c51..cb0d7f9 100644
--- a/src/get-freebusy-report.h
+++ b/src/get-freebusy-report.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/lock-caldav-object.c b/src/lock-caldav-object.c
index 30f2d20..24aae5f 100644
--- a/src/lock-caldav-object.c
+++ b/src/lock-caldav-object.c
@@ -1,4 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/lock-caldav-object.h b/src/lock-caldav-object.h
index bfcd4ad..c53d38c 100644
--- a/src/lock-caldav-object.h
+++ b/src/lock-caldav-object.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/modify-caldav-object.c b/src/modify-caldav-object.c
index ff03256..3c42ab6 100644
--- a/src/modify-caldav-object.c
+++ b/src/modify-caldav-object.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/modify-caldav-object.h b/src/modify-caldav-object.h
index 4171f91..91de702 100644
--- a/src/modify-caldav-object.h
+++ b/src/modify-caldav-object.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/options-caldav-server.c b/src/options-caldav-server.c
index 1d97d04..b4008a2 100644
--- a/src/options-caldav-server.c
+++ b/src/options-caldav-server.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/options-caldav-server.h b/src/options-caldav-server.h
index d17cba2..58bc7a7 100644
--- a/src/options-caldav-server.h
+++ b/src/options-caldav-server.h
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /* Copyright (c) 2008 Michael Rasmussen (mir@datanom.net)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/test/unittest/libunit.c b/test/unittest/libunit.c
index b0be673..b46971f 100644
--- a/test/unittest/libunit.c
+++ b/test/unittest/libunit.c
@@ -1,5 +1,3 @@
-/* vim: set textwidth=80 tabstop=4: */
-
 /*
 //      libunit.c
 //