Remove deprecated compatibility includes in headers

diff --git a/include/bsd/bsd.h b/include/bsd/bsd.h
index c0838057a40fe9e94db88e037eb95374381be9c8..b46056a317e3f97cd1425953d61fb0c6a8574b7d 100644 (file)
--- 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 217a4162f3cf91e514f9930f867175c1f5a83ac3..5253183e24ef0d39a855e3f8166bdcd84d902fb2 100644 (file)
--- 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 fb7d4a7396f1cdbc6766782b9ee86e76a79c14fb..be811f3033d8a824a9c83729d5490b90194e5214 100644 (file)
--- 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);