8 files changed, 8 insertions, 23 deletions
diff --git a/sys/crypto/cmac.h b/sys/crypto/cmac.h
index d90ff1cabe2..de0ec840d42 100644
--- a/sys/crypto/cmac.h
+++ b/sys/crypto/cmac.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmac.h,v 1.1 2008/08/12 15:43:00 damien Exp $	*/
+/*	$OpenBSD: cmac.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -29,8 +29,6 @@ typedef struct _AES_CMAC_CTX {
 	u_int		M_n;
 } AES_CMAC_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	 AES_CMAC_Init(AES_CMAC_CTX *);
 void	 AES_CMAC_SetKey(AES_CMAC_CTX *, const u_int8_t [AES_CMAC_KEY_LENGTH]);
diff --git a/sys/crypto/des_locl.h b/sys/crypto/des_locl.h
index 44c9289973f..e65658037a1 100644
--- a/sys/crypto/des_locl.h
+++ b/sys/crypto/des_locl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: des_locl.h,v 1.3 2005/06/13 10:56:44 hshoexer Exp $	*/
+/*	$OpenBSD: des_locl.h,v 1.4 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /* lib/des/des_locl.h */
 /* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
@@ -50,7 +50,6 @@
 #ifndef HEADER_DES_LOCL_H
 #define HEADER_DES_LOCL_H
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/systm.h>
 
diff --git a/sys/crypto/gmac.h b/sys/crypto/gmac.h
index ce26faf2863..94c1247bbd7 100644
--- a/sys/crypto/gmac.h
+++ b/sys/crypto/gmac.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gmac.h,v 1.1 2010/09/22 11:54:23 mikeb Exp $	*/
+/*	$OpenBSD: gmac.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2010 Mike Belopuhov <mike@vantronix.net>
@@ -37,8 +37,6 @@ typedef struct _AES_GMAC_CTX {
 	int		rounds;
 } AES_GMAC_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	AES_GMAC_Init(AES_GMAC_CTX *);
 void	AES_GMAC_Setkey(AES_GMAC_CTX *, const uint8_t *, uint16_t);
diff --git a/sys/crypto/hmac.h b/sys/crypto/hmac.h
index 99b1dd63b99..886bb49d0f0 100644
--- a/sys/crypto/hmac.h
+++ b/sys/crypto/hmac.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hmac.h,v 1.2 2008/09/06 22:23:20 djm Exp $	*/
+/*	$OpenBSD: hmac.h,v 1.3 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -37,8 +37,6 @@ typedef struct _HMAC_SHA256_CTX {
 	u_int		key_len;
 } HMAC_SHA256_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 
 void	 HMAC_MD5_Init(HMAC_MD5_CTX *, const u_int8_t *, u_int)
diff --git a/sys/crypto/key_wrap.h b/sys/crypto/key_wrap.h
index 4c984e13d9d..f91ce5f4c06 100644
--- a/sys/crypto/key_wrap.h
+++ b/sys/crypto/key_wrap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key_wrap.h,v 1.1 2008/08/12 15:43:00 damien Exp $	*/
+/*	$OpenBSD: key_wrap.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -23,8 +23,6 @@ typedef struct _aes_key_wrap_ctx {
 	rijndael_ctx	ctx;
 } aes_key_wrap_ctx;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 
 void	aes_key_wrap_set_key(aes_key_wrap_ctx *, const u_int8_t *, size_t);
diff --git a/sys/crypto/md5.h b/sys/crypto/md5.h
index b629c3e81bd..99d60316ea5 100644
--- a/sys/crypto/md5.h
+++ b/sys/crypto/md5.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md5.h,v 1.1 2004/05/07 14:42:26 millert Exp $	*/
+/*	$OpenBSD: md5.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*
  * This code implements the MD5 message-digest algorithm.
@@ -24,8 +24,6 @@ typedef struct MD5Context {
 	u_int8_t buffer[MD5_BLOCK_LENGTH];	/* input buffer */
 } MD5_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	 MD5Init(MD5_CTX *);
 void	 MD5Update(MD5_CTX *, const u_int8_t *, size_t)
diff --git a/sys/crypto/michael.h b/sys/crypto/michael.h
index 3b7c435842e..79018d89784 100644
--- a/sys/crypto/michael.h
+++ b/sys/crypto/michael.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: michael.h,v 1.1 2006/03/21 18:40:54 reyk Exp $	*/
+/*	$OpenBSD: michael.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -30,8 +30,6 @@ typedef struct michael_context {
 	u_int		michael_count;
 } MICHAEL_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	 michael_init(MICHAEL_CTX *);
 void	 michael_update(MICHAEL_CTX *, const u_int8_t *, u_int)
diff --git a/sys/crypto/sha2.h b/sys/crypto/sha2.h
index c9e7500821f..6bbdb80b79e 100644
--- a/sys/crypto/sha2.h
+++ b/sys/crypto/sha2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sha2.h,v 1.3 2008/09/06 22:23:20 djm Exp $	*/
+/*	$OpenBSD: sha2.h,v 1.4 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*
  * FILE:	sha2.h
@@ -60,8 +60,6 @@ typedef struct _SHA2_CTX {
 	u_int8_t	buffer[SHA512_BLOCK_LENGTH];
 } SHA2_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void SHA256Init(SHA2_CTX *);
 void SHA256Update(SHA2_CTX *, const u_int8_t *, size_t)