diff --git a/src/Config.h b/src/Config.h
index 5c33d25f9..4ddf5983f 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -2,7 +2,6 @@
 // taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2013, Paul Beckingham, Federico Hernandez.
-// All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Socket.h b/src/Socket.h
index 9e9ff3b36..c9f491029 100644
--- a/src/Socket.h
+++ b/src/Socket.h
@@ -24,6 +24,7 @@
 // http://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
+
 #ifndef INCLUDED_SOCKET
 #define INCLUDED_SOCKET
 
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index ee4efd7d6..cbfb752be 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <Context.h>
 #include <ColUrgency.h>
 #include <text.h>
diff --git a/src/i18n.h b/src/i18n.h
index 90cd28216..5df5ca3c8 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Strings that should be localized:
diff --git a/test/config.t.cpp b/test/config.t.cpp
index 4afdfde2b..5615e2613 100644
--- a/test/config.t.cpp
+++ b/test/config.t.cpp
@@ -2,7 +2,6 @@
 // taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2013, Paul Beckingham, Federico Hernandez.
-// All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/test/json.t.cpp b/test/json.t.cpp
index 39cb51757..c19a08748 100644
--- a/test/json.t.cpp
+++ b/test/json.t.cpp
@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <iostream>
 #include <JSON.h>
 #include <test.h>
diff --git a/test/json_test.cpp b/test/json_test.cpp
index ae90c8ca8..d2a266583 100644
--- a/test/json_test.cpp
+++ b/test/json_test.cpp
@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <iostream>
 #include <string.h>
 #include <File.h>
diff --git a/test/path.t.cpp b/test/path.t.cpp
index 8b3da3d26..026938f8a 100644
--- a/test/path.t.cpp
+++ b/test/path.t.cpp
@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <Context.h>
 #include <Path.h>
 #include <test.h>
diff --git a/test/view.t.cpp b/test/view.t.cpp
index 955734abd..e85fe289c 100644
--- a/test/view.t.cpp
+++ b/test/view.t.cpp
@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <iostream>
 #include <unistd.h>
 #include <stdio.h>