diff --git a/ChangeLog b/ChangeLog
index 8cfee82..9ae095d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-14  Guillem Jover  <guillem@debian.org>
+
+	* include/bsd/stdlib.h: Remove <sys/types.h> and <stdio.h>.
+	* include/bsd/getopt.h: Protect header from multiple inclusion.
+
 2006-02-14  Guillem Jover  <guillem@debian.org>
 
 	* include/bsd/bsd.h: Remove commented out macros.
diff --git a/include/bsd/getopt.h b/include/bsd/getopt.h
index bf78f01..0df89da 100644
--- a/include/bsd/getopt.h
+++ b/include/bsd/getopt.h
@@ -1,4 +1,10 @@
+#ifndef LIBBSD_GETOPT_H
+#define LIBBSD_GETOPT_H
+
 #include <getopt.h>
+
 extern int optreset;
 
 int bsd_getopt (int, char **, char *);
+
+#endif
diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index 4881e57..ee358b6 100644
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -1,9 +1,6 @@
 #ifndef LIBBSD_STDLIB_H
 #define LIBBSD_STDLIB_H
 
-#include <sys/types.h>
-#include <stdio.h>
-
 const char *fmtcheck(const char *, const char *);
 
 #endif