diff --git a/dev-libs/wiringpi/wiringpi-9999.ebuild b/dev-libs/wiringpi/wiringpi-9999.ebuild
index 7df5ffe..602a469 100644
--- a/dev-libs/wiringpi/wiringpi-9999.ebuild
+++ b/dev-libs/wiringpi/wiringpi-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 2015-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=6
 
diff --git a/dev-python/pysoundfile/pysoundfile-0.8.0.ebuild b/dev-python/pysoundfile/pysoundfile-0.8.0.ebuild
index 7bbeaaa..204d57f 100644
--- a/dev-python/pysoundfile/pysoundfile-0.8.0.ebuild
+++ b/dev-python/pysoundfile/pysoundfile-0.8.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/media-fonts/firacode/firacode-1.200.ebuild b/media-fonts/firacode/firacode-1.200.ebuild
index bd545f3..5c6108c 100644
--- a/media-fonts/firacode/firacode-1.200.ebuild
+++ b/media-fonts/firacode/firacode-1.200.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=6
 
diff --git a/media-fonts/sans-bullshit-sans/sans-bullshit-sans-0.1.ebuild b/media-fonts/sans-bullshit-sans/sans-bullshit-sans-0.1.ebuild
index b41b375..e2173cb 100644
--- a/media-fonts/sans-bullshit-sans/sans-bullshit-sans-0.1.ebuild
+++ b/media-fonts/sans-bullshit-sans/sans-bullshit-sans-0.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=6
 
diff --git a/net-misc/fb-client/fb-client-2.0.1.ebuild b/net-misc/fb-client/fb-client-2.0.1.ebuild
index 4f309dd..56fd2da 100644
--- a/net-misc/fb-client/fb-client-2.0.1.ebuild
+++ b/net-misc/fb-client/fb-client-2.0.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=6
 
diff --git a/net-misc/fb-client/fb-client-2.0.2.ebuild b/net-misc/fb-client/fb-client-2.0.2.ebuild
index 4f309dd..56fd2da 100644
--- a/net-misc/fb-client/fb-client-2.0.2.ebuild
+++ b/net-misc/fb-client/fb-client-2.0.2.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=6
 
diff --git a/net-misc/fb-client/fb-client-2.0.3.ebuild b/net-misc/fb-client/fb-client-2.0.3.ebuild
index 4f309dd..56fd2da 100644
--- a/net-misc/fb-client/fb-client-2.0.3.ebuild
+++ b/net-misc/fb-client/fb-client-2.0.3.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=6
 
diff --git a/net-misc/fb-client/fb-client-9999.ebuild b/net-misc/fb-client/fb-client-9999.ebuild
index a8a8fc1..3d0f843 100644
--- a/net-misc/fb-client/fb-client-9999.ebuild
+++ b/net-misc/fb-client/fb-client-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=6