Merge "strdupa and strndupa are no longer used."
diff --git a/bionic-fixup/AndroidFixup.h b/bionic-fixup/AndroidFixup.h
index 6e2f26f..83d2952 100644
--- a/bionic-fixup/AndroidFixup.h
+++ b/bionic-fixup/AndroidFixup.h
@@ -17,10 +17,6 @@
#ifndef ANDROID_FIXUP_H
#define ANDROID_FIXUP_H
-/* These two don't seem like things we want in bionic, but elfutils uses every crazy thing. */
-#define strdupa(s) strcpy(alloca(strlen(s) + 1), s)
-#define strndupa(s, n) strncpy(alloca(strnlen(s, n) + 1), s, n)
-
static inline void *rawmemchr(const void *s, int c)
{
const unsigned char *ptr = s;
diff --git a/bionic-fixup/argp.h b/bionic-fixup/argp.h
index 784a040..fe53b6d 100644
--- a/bionic-fixup/argp.h
+++ b/bionic-fixup/argp.h
@@ -20,10 +20,6 @@
// We don't have an implementation, but elfutils unconditionally includes this,
// and relies on its transitive includes in places.
-#include <ctype.h>
#include <errno.h>
-#include <getopt.h>
-#include <limits.h>
-#include <stdio.h>
#endif /* ELFUTILS_ARGP_H */
