diff --git a/drd/drd.h b/drd/drd.h
index 5f21aabcb..6301a31e9 100644
--- a/drd/drd.h
+++ b/drd/drd.h
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
-
 /*
   ----------------------------------------------------------------
 
diff --git a/drd/drd_barrier.c b/drd/drd_barrier.c
index a6e9e6a5c..33e32aa79 100644
--- a/drd/drd_barrier.c
+++ b/drd/drd_barrier.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_barrier.h b/drd/drd_barrier.h
index 0af536b17..6e0f29979 100644
--- a/drd/drd_barrier.h
+++ b/drd/drd_barrier.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_basics.h b/drd/drd_basics.h
index fda3b8934..d14b7f8ce 100644
--- a/drd/drd_basics.h
+++ b/drd/drd_basics.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of DRD, a thread error detector.
 
diff --git a/drd/drd_bitmap.c b/drd/drd_bitmap.c
index 329796794..7470b9321 100644
--- a/drd/drd_bitmap.c
+++ b/drd/drd_bitmap.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_bitmap.h b/drd/drd_bitmap.h
index 85bb767b0..372c78732 100644
--- a/drd/drd_bitmap.h
+++ b/drd/drd_bitmap.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_bitmap2_node.c b/drd/drd_bitmap2_node.c
index 9be00aa8f..3deb644c2 100644
--- a/drd/drd_bitmap2_node.c
+++ b/drd/drd_bitmap2_node.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_clientobj.c b/drd/drd_clientobj.c
index 43198cbfd..bd829a9de 100644
--- a/drd/drd_clientobj.c
+++ b/drd/drd_clientobj.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_clientobj.h b/drd/drd_clientobj.h
index 11e39f604..63dd104f3 100644
--- a/drd/drd_clientobj.h
+++ b/drd/drd_clientobj.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_clientreq.c b/drd/drd_clientreq.c
index ba0a5a449..3173282be 100644
--- a/drd/drd_clientreq.c
+++ b/drd/drd_clientreq.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_clientreq.h b/drd/drd_clientreq.h
index 3b8d1d56c..5d2b0904f 100644
--- a/drd/drd_clientreq.h
+++ b/drd/drd_clientreq.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_cond.c b/drd/drd_cond.c
index 023d4637f..5ed0f3344 100644
--- a/drd/drd_cond.c
+++ b/drd/drd_cond.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_cond.h b/drd/drd_cond.h
index 4e82411d2..a3b031d3c 100644
--- a/drd/drd_cond.h
+++ b/drd/drd_cond.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_darwin_intercepts.c b/drd/drd_darwin_intercepts.c
index 0dec939cf..06f6a2aba 100644
--- a/drd/drd_darwin_intercepts.c
+++ b/drd/drd_darwin_intercepts.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_error.c b/drd/drd_error.c
index 1a8c9d3f7..16f46e888 100644
--- a/drd/drd_error.c
+++ b/drd/drd_error.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_error.h b/drd/drd_error.h
index d11b59974..738e7891e 100644
--- a/drd/drd_error.h
+++ b/drd/drd_error.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_hb.c b/drd/drd_hb.c
index a05265a49..1e522900e 100644
--- a/drd/drd_hb.c
+++ b/drd/drd_hb.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_hb.h b/drd/drd_hb.h
index 7b69082e2..ee8dd9483 100644
--- a/drd/drd_hb.h
+++ b/drd/drd_hb.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_load_store.c b/drd/drd_load_store.c
index 09800c333..30fe9f887 100644
--- a/drd/drd_load_store.c
+++ b/drd/drd_load_store.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_load_store.h b/drd/drd_load_store.h
index c67e285d4..64c8ab92e 100644
--- a/drd/drd_load_store.h
+++ b/drd/drd_load_store.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_main.c b/drd/drd_main.c
index d18a26cbc..5a7b2b2e8 100644
--- a/drd/drd_main.c
+++ b/drd/drd_main.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_malloc_wrappers.c b/drd/drd_malloc_wrappers.c
index 026b3b8d4..6eaa6746b 100644
--- a/drd/drd_malloc_wrappers.c
+++ b/drd/drd_malloc_wrappers.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_malloc_wrappers.h b/drd/drd_malloc_wrappers.h
index e10fb27ed..63bf4c4aa 100644
--- a/drd/drd_malloc_wrappers.h
+++ b/drd/drd_malloc_wrappers.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_mutex.c b/drd/drd_mutex.c
index c9392ee74..29aa84241 100644
--- a/drd/drd_mutex.c
+++ b/drd/drd_mutex.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_mutex.h b/drd/drd_mutex.h
index d2c05d3be..d2e51e431 100644
--- a/drd/drd_mutex.h
+++ b/drd/drd_mutex.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_pthread_intercepts.c b/drd/drd_pthread_intercepts.c
index f34540f40..abb5f0e20 100644
--- a/drd/drd_pthread_intercepts.c
+++ b/drd/drd_pthread_intercepts.c
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
-
 /*--------------------------------------------------------------------*/
 /*--- Client-space code for DRD.          drd_pthread_intercepts.c ---*/
 /*--------------------------------------------------------------------*/
diff --git a/drd/drd_qtcore_intercepts.c b/drd/drd_qtcore_intercepts.c
index bd55fa44b..23c7d9e39 100644
--- a/drd/drd_qtcore_intercepts.c
+++ b/drd/drd_qtcore_intercepts.c
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
-
 /*--------------------------------------------------------------------*/
 /*--- Client-space code for drd.           drd_qtcore_intercepts.c ---*/
 /*--------------------------------------------------------------------*/
diff --git a/drd/drd_rwlock.c b/drd/drd_rwlock.c
index 8e13c6611..1662d8c28 100644
--- a/drd/drd_rwlock.c
+++ b/drd/drd_rwlock.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_rwlock.h b/drd/drd_rwlock.h
index 291402746..c51a22990 100644
--- a/drd/drd_rwlock.h
+++ b/drd/drd_rwlock.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_segment.c b/drd/drd_segment.c
index a8d11454f..c3f8d31d5 100644
--- a/drd/drd_segment.c
+++ b/drd/drd_segment.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_segment.h b/drd/drd_segment.h
index 8eeceb9d2..5d980cec3 100644
--- a/drd/drd_segment.h
+++ b/drd/drd_segment.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_semaphore.c b/drd/drd_semaphore.c
index 0b7065f2e..72c74dd07 100644
--- a/drd/drd_semaphore.c
+++ b/drd/drd_semaphore.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_semaphore.h b/drd/drd_semaphore.h
index 07ebf3913..1f5930080 100644
--- a/drd/drd_semaphore.h
+++ b/drd/drd_semaphore.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_strmem_intercepts.c b/drd/drd_strmem_intercepts.c
index f944ef6ec..d8d742b90 100644
--- a/drd/drd_strmem_intercepts.c
+++ b/drd/drd_strmem_intercepts.c
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
-
 /*--------------------------------------------------------------------*/
 /*--- Replacements for strlen() and strnlen(), which run on the    ---*/
 /*--- simulated CPU.                                               ---*/
diff --git a/drd/drd_suppression.c b/drd/drd_suppression.c
index bf0041183..d308f7d73 100644
--- a/drd/drd_suppression.c
+++ b/drd/drd_suppression.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_suppression.h b/drd/drd_suppression.h
index 94cc34f0c..15fc8ed3b 100644
--- a/drd/drd_suppression.h
+++ b/drd/drd_suppression.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 #ifndef __PUB_CORE_DRD_H
 #define __PUB_CORE_DRD_H
 
diff --git a/drd/drd_thread.c b/drd/drd_thread.c
index 93fe6a274..2a6270a97 100644
--- a/drd/drd_thread.c
+++ b/drd/drd_thread.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_thread.h b/drd/drd_thread.h
index b5f284332..ae36216db 100644
--- a/drd/drd_thread.h
+++ b/drd/drd_thread.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_thread_bitmap.h b/drd/drd_thread_bitmap.h
index 1303d1445..007df47b9 100644
--- a/drd/drd_thread_bitmap.h
+++ b/drd/drd_thread_bitmap.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_vc.c b/drd/drd_vc.c
index 88d541f73..39b6a7fcf 100644
--- a/drd/drd_vc.c
+++ b/drd/drd_vc.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/drd_vc.h b/drd/drd_vc.h
index 7ce2c6503..1086e26c5 100644
--- a/drd/drd_vc.h
+++ b/drd/drd_vc.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/pub_drd_bitmap.h b/drd/pub_drd_bitmap.h
index 80a02bcd7..c476d46e5 100644
--- a/drd/pub_drd_bitmap.h
+++ b/drd/pub_drd_bitmap.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
diff --git a/drd/tests/annotate_hb_err.c b/drd/tests/annotate_hb_err.c
index 3ed15b9a7..0013eafdf 100644
--- a/drd/tests/annotate_hb_err.c
+++ b/drd/tests/annotate_hb_err.c
@@ -45,9 +45,3 @@ int main(int argc, char** argv)
   fprintf(stderr, "Done.\n");
   return 0;
 }
-
-/*
- * Local variables:
- * c-basic-offset: 2
- * End:
- */
diff --git a/drd/tests/annotate_hb_race.c b/drd/tests/annotate_hb_race.c
index 14970f182..4aa5a380e 100644
--- a/drd/tests/annotate_hb_race.c
+++ b/drd/tests/annotate_hb_race.c
@@ -46,9 +46,3 @@ int main(int argc, char** argv)
 
   return 0;
 }
-
-/*
- * Local variables:
- * c-basic-offset: 2
- * End:
- */
diff --git a/drd/tests/annotate_smart_pointer.cpp b/drd/tests/annotate_smart_pointer.cpp
index 862ecb0ef..bcf3a7840 100644
--- a/drd/tests/annotate_smart_pointer.cpp
+++ b/drd/tests/annotate_smart_pointer.cpp
@@ -330,7 +330,3 @@ int main(int argc, char** argv)
   std::cerr << "Done.\n";
   return 0;
 }
-
-// Local variables:
-// c-basic-offset: 2
-// End:
diff --git a/drd/tests/free_is_write.c b/drd/tests/free_is_write.c
index 899a853a4..056e4172e 100644
--- a/drd/tests/free_is_write.c
+++ b/drd/tests/free_is_write.c
@@ -62,9 +62,3 @@ int main(int argc, char **argv)
 
   return 0;
 }
-
-/*
- * Local variables:
- * c-basic-offset: 2
- * End:
- */
diff --git a/drd/tests/pth_barrier_thr_cr.c b/drd/tests/pth_barrier_thr_cr.c
index 57502b74a..ab14f9048 100644
--- a/drd/tests/pth_barrier_thr_cr.c
+++ b/drd/tests/pth_barrier_thr_cr.c
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-basic-offset: 2; indent-tabs-mode: nil; -*- */
 /*
  * Test program that triggers pthread_barrier_wait() where each
  * pthread_barrier_wait() call is invoked by another thread. This is the only
diff --git a/drd/tests/unified_annotations.h b/drd/tests/unified_annotations.h
index 13259d6fc..4973e8f98 100644
--- a/drd/tests/unified_annotations.h
+++ b/drd/tests/unified_annotations.h
@@ -62,9 +62,3 @@ static __inline__ void U_AnnotateHappensAfter(void *addr)
 
 
 #endif /* _UNIFIED_ANNOTATIONS_H_ */
-
-/*
- * Local variables:
- * c-basic-offset: 2
- * End:
- */