2 files changed, 1 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a0dd182f8..a64ea46a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,7 @@
    the list is DH group exchange, but that causes a bit more traffic which can
    mean that the tests flip bits in the initial exchange rather than the MACed
    traffic and we get different errors to what the tests look for.
+ - (dtucker) [openbsd-compat/getopt.h] Remove unneeded bits.
 
 20130516
  - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be 
diff --git a/openbsd-compat/getopt.h b/openbsd-compat/getopt.h
index 0311b078b..8eb12447e 100644
--- a/openbsd-compat/getopt.h
+++ b/openbsd-compat/getopt.h
@@ -33,8 +33,6 @@
 #ifndef _GETOPT_H_
 #define _GETOPT_H_
 
-#include <sys/cdefs.h>
-
 /*
  * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
  */
@@ -56,7 +54,6 @@ struct option {
         int val;
 };
 
-__BEGIN_DECLS
 int      getopt_long(int, char * const *, const char *,
             const struct option *, int *);
 int      getopt_long_only(int, char * const *, const char *,
@@ -73,6 +70,5 @@ extern   int optopt;
 extern   int optreset;
 extern   char *suboptarg;               /* getsubopt(3) external variable */
 #endif
-__END_DECLS
  
 #endif /* !_GETOPT_H_ */