Include the correct deprecated headeres when using the overlay

include/bsd/cdefs.h

@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/sys/cdefs.h> or libbsd-overlay.pc instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <sys/cdefs.h>
+#else
 #include <bsd/sys/cdefs.h>
+#endif
 
 #endif
 

include/bsd/ip_icmp.h

@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/netinet/ip_icmp.h> or libbsd-overlay.pc instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <netinet/ip_icmp.h>
+#else
 #include <bsd/netinet/ip_icmp.h>
+#endif
 
 #endif
 

include/bsd/queue.h

@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/sys/queue.h> or libbsd-overlay.pc instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <sys/queue.h>
+#else
 #include <bsd/sys/queue.h>
+#endif
 
 #endif
 

include/bsd/random.h

@@ -33,7 +33,11 @@
 #warning "Deprecated header, use <bsd/stdlib.h> instead."
 #endif
 
+#ifdef LIBBSD_OVERLAY
+#include <stdlib.h>
+#else
 #include <bsd/stdlib.h>
+#endif
 
 #endif
 

include/bsd/stdlib.h

@@ -48,9 +48,14 @@
 
 /* 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();

include/bsd/string.h

@@ -38,8 +38,12 @@
 
 #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);