diff --git a/sys/dev/em/e1000_80003es2lan.c b/sys/dev/em/e1000_80003es2lan.c
index 5e28aaf5ef9..4eedc528d73 100644
--- a/sys/dev/em/e1000_80003es2lan.c
+++ b/sys/dev/em/e1000_80003es2lan.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /* e1000_80003es2lan
  */
diff --git a/sys/dev/em/e1000_80003es2lan.h b/sys/dev/em/e1000_80003es2lan.h
index 3d975856648..2b219ca9e56 100644
--- a/sys/dev/em/e1000_80003es2lan.h
+++ b/sys/dev/em/e1000_80003es2lan.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_80003ES2LAN_H_
diff --git a/sys/dev/em/e1000_82540.c b/sys/dev/em/e1000_82540.c
index dd38d24cbd7..7867b2fd9f9 100644
--- a/sys/dev/em/e1000_82540.c
+++ b/sys/dev/em/e1000_82540.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82540
diff --git a/sys/dev/em/e1000_82541.c b/sys/dev/em/e1000_82541.c
index d6a5b148700..25481de4f26 100644
--- a/sys/dev/em/e1000_82541.c
+++ b/sys/dev/em/e1000_82541.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82541
diff --git a/sys/dev/em/e1000_82541.h b/sys/dev/em/e1000_82541.h
index 2e8cf4391d7..166a7c3ba9f 100644
--- a/sys/dev/em/e1000_82541.h
+++ b/sys/dev/em/e1000_82541.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_82541_H_
diff --git a/sys/dev/em/e1000_82542.c b/sys/dev/em/e1000_82542.c
index 7ef4ad9f323..56cfdd292db 100644
--- a/sys/dev/em/e1000_82542.c
+++ b/sys/dev/em/e1000_82542.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82542 (rev 1 & 2)
diff --git a/sys/dev/em/e1000_82543.c b/sys/dev/em/e1000_82543.c
index 7a7147c2cf5..34efae54105 100644
--- a/sys/dev/em/e1000_82543.c
+++ b/sys/dev/em/e1000_82543.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82543
diff --git a/sys/dev/em/e1000_82543.h b/sys/dev/em/e1000_82543.h
index 05d05f83290..53a946e79bc 100644
--- a/sys/dev/em/e1000_82543.h
+++ b/sys/dev/em/e1000_82543.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_82543_H_
diff --git a/sys/dev/em/e1000_82571.c b/sys/dev/em/e1000_82571.c
index a48e7aac924..959027e9f33 100644
--- a/sys/dev/em/e1000_82571.c
+++ b/sys/dev/em/e1000_82571.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82571
diff --git a/sys/dev/em/e1000_82571.h b/sys/dev/em/e1000_82571.h
index f388d96023f..b36c3fa0696 100644
--- a/sys/dev/em/e1000_82571.h
+++ b/sys/dev/em/e1000_82571.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_82571_H_
diff --git a/sys/dev/em/e1000_82575.c b/sys/dev/em/e1000_82575.c
index ed91b1f6fb4..65eeb12276c 100644
--- a/sys/dev/em/e1000_82575.c
+++ b/sys/dev/em/e1000_82575.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_82575
diff --git a/sys/dev/em/e1000_82575.h b/sys/dev/em/e1000_82575.h
index 505316fb816..072e0002a4a 100644
--- a/sys/dev/em/e1000_82575.h
+++ b/sys/dev/em/e1000_82575.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_82575_H_
diff --git a/sys/dev/em/e1000_api.c b/sys/dev/em/e1000_api.c
index 7a778f528ec..1d05ee4f18e 100644
--- a/sys/dev/em/e1000_api.c
+++ b/sys/dev/em/e1000_api.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 #include "e1000_mac.h"
diff --git a/sys/dev/em/e1000_api.h b/sys/dev/em/e1000_api.h
index 33ff807279e..13f9d89f5ef 100644
--- a/sys/dev/em/e1000_api.h
+++ b/sys/dev/em/e1000_api.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_API_H_
diff --git a/sys/dev/em/e1000_defines.h b/sys/dev/em/e1000_defines.h
index 3c96fdf3ba9..5969d7497ac 100644
--- a/sys/dev/em/e1000_defines.h
+++ b/sys/dev/em/e1000_defines.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_DEFINES_H_
diff --git a/sys/dev/em/e1000_hw.h b/sys/dev/em/e1000_hw.h
index 99ff50486ab..ed3b0e9b30b 100644
--- a/sys/dev/em/e1000_hw.h
+++ b/sys/dev/em/e1000_hw.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_HW_H_
diff --git a/sys/dev/em/e1000_ich8lan.c b/sys/dev/em/e1000_ich8lan.c
index 00893c7caea..912b949fe2b 100644
--- a/sys/dev/em/e1000_ich8lan.c
+++ b/sys/dev/em/e1000_ich8lan.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 /* e1000_ich8lan
diff --git a/sys/dev/em/e1000_ich8lan.h b/sys/dev/em/e1000_ich8lan.h
index edf924221be..93123d4e861 100644
--- a/sys/dev/em/e1000_ich8lan.h
+++ b/sys/dev/em/e1000_ich8lan.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_ICH8LAN_H_
diff --git a/sys/dev/em/e1000_mac.c b/sys/dev/em/e1000_mac.c
index 5566cc3d9ef..9f0f1b839aa 100644
--- a/sys/dev/em/e1000_mac.c
+++ b/sys/dev/em/e1000_mac.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 #include "e1000_mac.h"
diff --git a/sys/dev/em/e1000_mac.h b/sys/dev/em/e1000_mac.h
index a2969a95f2b..b41e897e3db 100644
--- a/sys/dev/em/e1000_mac.h
+++ b/sys/dev/em/e1000_mac.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_MAC_H_
diff --git a/sys/dev/em/e1000_manage.c b/sys/dev/em/e1000_manage.c
index 8efaab3367c..9a0342d99f0 100644
--- a/sys/dev/em/e1000_manage.c
+++ b/sys/dev/em/e1000_manage.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 #include "e1000_manage.h"
diff --git a/sys/dev/em/e1000_manage.h b/sys/dev/em/e1000_manage.h
index 45ec64800ab..e34108c5adc 100644
--- a/sys/dev/em/e1000_manage.h
+++ b/sys/dev/em/e1000_manage.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_MANAGE_H_
diff --git a/sys/dev/em/e1000_nvm.c b/sys/dev/em/e1000_nvm.c
index a64bd4c95c9..19224354b3a 100644
--- a/sys/dev/em/e1000_nvm.c
+++ b/sys/dev/em/e1000_nvm.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 #include "e1000_nvm.h"
diff --git a/sys/dev/em/e1000_nvm.h b/sys/dev/em/e1000_nvm.h
index b6b8c4a905a..572dc680a46 100644
--- a/sys/dev/em/e1000_nvm.h
+++ b/sys/dev/em/e1000_nvm.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_NVM_H_
diff --git a/sys/dev/em/e1000_osdep.h b/sys/dev/em/e1000_osdep.h
index 3ff2becb921..fe20a341d2e 100644
--- a/sys/dev/em/e1000_osdep.h
+++ b/sys/dev/em/e1000_osdep.h
@@ -30,7 +30,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _FREEBSD_OS_H_
diff --git a/sys/dev/em/e1000_phy.c b/sys/dev/em/e1000_phy.c
index 057e3fb5281..18f5252f8d5 100644
--- a/sys/dev/em/e1000_phy.c
+++ b/sys/dev/em/e1000_phy.c
@@ -30,7 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 
 #include "e1000_phy.h"
diff --git a/sys/dev/em/e1000_phy.h b/sys/dev/em/e1000_phy.h
index 0eace24db6a..eb9632c8c79 100644
--- a/sys/dev/em/e1000_phy.h
+++ b/sys/dev/em/e1000_phy.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_PHY_H_
diff --git a/sys/dev/em/e1000_regs.h b/sys/dev/em/e1000_regs.h
index 57a8e6bdee2..1f75021d99f 100644
--- a/sys/dev/em/e1000_regs.h
+++ b/sys/dev/em/e1000_regs.h
@@ -30,7 +30,10 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 
 #ifndef _E1000_REGS_H_
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c
index 68ee5269c46..90ba2ed7583 100644
--- a/sys/dev/em/if_em.c
+++ b/sys/dev/em/if_em.c
@@ -31,7 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-$FreeBSD$
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
diff --git a/sys/dev/em/if_em.h b/sys/dev/em/if_em.h
index c41b065c367..b54f779130c 100644
--- a/sys/dev/em/if_em.h
+++ b/sys/dev/em/if_em.h
@@ -30,7 +30,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-$FreeBSD$
+
+/*
+ * $FreeBSD$
+ */
 
 #ifndef _EM_H_DEFINED_
 #define _EM_H_DEFINED_