From 0b96e1a218b700448adf3c016ab25c11f207f6f6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@hadrons.org>
Date: Tue, 3 Jan 2012 07:32:53 +0100
Subject: [PATCH] Remove deprecated compatibility includes in headers

---
 include/bsd/bsd.h    |  5 -----
 include/bsd/stdlib.h | 11 -----------
 include/bsd/string.h |  9 ---------
 3 files changed, 25 deletions(-)

diff --git a/include/bsd/bsd.h b/include/bsd/bsd.h
index c083805..b46056a 100644
--- a/include/bsd/bsd.h
+++ b/include/bsd/bsd.h
@@ -41,9 +41,4 @@
 #include <bsd/getopt.h>
 #include <bsd/md5.h>
 
-/* FIXME: Will be removed in the future. */
-#ifndef LIBBSD_DISABLE_DEPRECATED
-#include <time.h>
-#endif
-
 #endif
diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index 217a416..5253183 100644
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -46,17 +46,6 @@
 #include <bsd/libutil.h>
 #endif
 
-/* FIXME: Temporary inclusions to avoid API breakage, will be removed soon. */
-#ifndef LIBBSD_DISABLE_DEPRECATED
-#ifdef LIBBSD_OVERLAY
-#include <stdio.h>
-#include <unistd.h>
-#else
-#include <bsd/stdio.h>
-#include <bsd/unistd.h>
-#endif
-#endif
-
 __BEGIN_DECLS
 u_int32_t arc4random();
 void arc4random_stir();
diff --git a/include/bsd/string.h b/include/bsd/string.h
index fb7d4a7..be811f3 100644
--- a/include/bsd/string.h
+++ b/include/bsd/string.h
@@ -36,15 +36,6 @@
 #include <string.h>
 #endif
 
-#ifndef LIBBSD_DISABLE_DEPRECATED
-/* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */
-#ifdef LIBBSD_OVERLAY
-#include <stdio.h>
-#else
-#include <bsd/stdio.h>
-#endif
-#endif
-
 __BEGIN_DECLS
 size_t strlcpy(char *dst, const char *src, size_t siz);
 size_t strlcat(char *dst, const char *src, size_t siz);