diff --git a/src/common/linux/dump_stabs.h b/src/common/linux/dump_stabs.h
index a7dbc50f..ca547b69 100644
--- a/src/common/linux/dump_stabs.h
+++ b/src/common/linux/dump_stabs.h
@@ -1,4 +1,6 @@
-// Copyright (c) 2009, Google Inc.                      -*- mode: C++ -*-
+// -*- mode: C++ -*-
+
+// Copyright (c) 2009, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/src/common/linux/module.h b/src/common/linux/module.h
index a20780a3..ef9e114b 100644
--- a/src/common/linux/module.h
+++ b/src/common/linux/module.h
@@ -1,4 +1,6 @@
-// Copyright (c) 2009, Google Inc.             -*- mode: c++ -*-
+// -*- mode: c++ -*-
+
+// Copyright (c) 2009, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/src/common/linux/stabs_reader.h b/src/common/linux/stabs_reader.h
index c542d2cf..2465942b 100644
--- a/src/common/linux/stabs_reader.h
+++ b/src/common/linux/stabs_reader.h
@@ -1,4 +1,6 @@
-// Copyright 2009 Google Inc. All Rights Reserved.  -*- mode: c++ -*-
+// -*- mode: c++ -*-
+
+// Copyright 2009 Google Inc. All Rights Reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
diff --git a/src/google_breakpad/processor/source_line_resolver_interface.h b/src/google_breakpad/processor/source_line_resolver_interface.h
index 27aa3c93..6f4cf1a7 100644
--- a/src/google_breakpad/processor/source_line_resolver_interface.h
+++ b/src/google_breakpad/processor/source_line_resolver_interface.h
@@ -1,4 +1,6 @@
-// Copyright (c) 2006, Google Inc.                      -*- mode: C++ -*-
+// -*- mode: C++ -*-
+
+// Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without