diff --git a/native/jni/systemproperties/include/private/hacks.h b/native/jni/systemproperties/include/private/hacks.h
index 65f7feb5d..b30c16afd 100644
--- a/native/jni/systemproperties/include/private/hacks.h
+++ b/native/jni/systemproperties/include/private/hacks.h
@@ -13,8 +13,8 @@
 
 // Missing functions
 #define fsetxattr(...) syscall(__NR_fsetxattr, __VA_ARGS__)
-#define getline __getline
-ssize_t __getline(char **, size_t *, FILE *);
+#define getline compat_getline
+ssize_t compat_getline(char **, size_t *, FILE *);
 
 // Rename symbols
 #pragma redefine_extname __system_property_set _system_property_set2
diff --git a/native/jni/utils/missing.cpp b/native/jni/utils/missing.cpp
index f9d828005..dfcf271d4 100644
--- a/native/jni/utils/missing.cpp
+++ b/native/jni/utils/missing.cpp
@@ -10,83 +10,53 @@
 
 #include "missing.hpp"
 
-/* Original source: https://opensource.apple.com/source/cvs/cvs-19/cvs/lib/getline.c
- * License: GPL 2 or later
- * Adjusted to match POSIX */
-#define MIN_CHUNK 64
-ssize_t __getdelim(char **lineptr, size_t *n, int delim, FILE *stream) {
-	size_t nchars_avail;
-	char *read_pos;
+/* Original source: https://github.com/freebsd/freebsd/blob/master/contrib/file/src/getline.c
+ * License: BSD, full copyright notice please check original source */
 
-	if (!lineptr || !n || !stream) {
-		errno = EINVAL;
-		return -1;
-	}
+ssize_t compat_getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) {
+	char *ptr, *eptr;
 
-	if (!*lineptr) {
-		*n = MIN_CHUNK;
-		*lineptr = (char *) malloc(*n);
-		if (!*lineptr) {
-			errno = ENOMEM;
+	if (*buf == nullptr || *bufsiz == 0) {
+		*bufsiz = BUFSIZ;
+		if ((*buf = (char *) malloc(*bufsiz)) == nullptr)
 			return -1;
-		}
 	}
 
-	nchars_avail = *n;
-	read_pos = *lineptr;
-
-	for (;;) {
-		int save_errno;
-		int c = getc(stream);
-
-		save_errno = errno;
-
-		if (nchars_avail < 2) {
-			if (*n > MIN_CHUNK)
-				*n *= 2;
+	for (ptr = *buf, eptr = *buf + *bufsiz;;) {
+		int c = fgetc(fp);
+		if (c == -1) {
+			if (feof(fp))
+				return ptr == *buf ? -1 : ptr - *buf;
 			else
-				*n += MIN_CHUNK;
-
-			nchars_avail = *n + *lineptr - read_pos;
-			*lineptr = (char *) realloc(*lineptr, *n);
-			if (!*lineptr) {
-				errno = ENOMEM;
 				return -1;
-			}
-			read_pos = *n - nchars_avail + *lineptr;
 		}
-
-		if (ferror(stream)) {
-			errno = save_errno;
-			return -1;
+		*ptr++ = c;
+		if (c == delimiter) {
+			*ptr = '\0';
+			return ptr - *buf;
 		}
-
-		if (c == EOF) {
-			if (read_pos == *lineptr)
+		if (ptr + 2 >= eptr) {
+			char *nbuf;
+			size_t nbufsiz = *bufsiz * 2;
+			ssize_t d = ptr - *buf;
+			if ((nbuf = (char *) realloc(*buf, nbufsiz)) == nullptr)
 				return -1;
-			else
-				break;
+			*buf = nbuf;
+			*bufsiz = nbufsiz;
+			eptr = nbuf + nbufsiz;
+			ptr = nbuf + d;
 		}
-
-		*read_pos++ = c;
-		nchars_avail--;
-
-		if (c == delim)
-			break;
 	}
-
-	*read_pos = '\0';
-
-	return read_pos - *lineptr;
 }
 
-ssize_t __getline(char **lineptr, size_t *n, FILE *stream) {
-	return getdelim(lineptr, n, '\n', stream);
+ssize_t compat_getline(char **buf, size_t *bufsiz, FILE *fp) {
+	return getdelim(buf, bufsiz, '\n', fp);
 }
 
-/* mntent functions are copied from AOSP libc/bionic/mntent.cpp */
+/* Original source: https://android.googlesource.com/platform/bionic/+/master/libc/bionic/mntent.cpp
+ * License: AOSP, full copyright notice please check original source */
 
-struct mntent *__getmntent_r(FILE* fp, struct mntent* e, char* buf, int buf_len) {
+struct mntent *compat_getmntent_r(FILE* fp, struct mntent* e, char* buf, int buf_len) {
 	memset(e, 0, sizeof(*e));
 	while (fgets(buf, buf_len, fp) != nullptr) {
 		// Entries look like "proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0".
@@ -109,18 +79,18 @@ struct mntent *__getmntent_r(FILE* fp, struct mntent* e, char* buf, int buf_len)
 	return nullptr;
 }
 
-FILE *__setmntent(const char* path, const char* mode) {
+FILE *compat_setmntent(const char* path, const char* mode) {
 	return fopen(path, mode);
 }
 
-int __endmntent(FILE* fp) {
+int compat_endmntent(FILE* fp) {
 	if (fp != nullptr) {
 		fclose(fp);
 	}
 	return 1;
 }
 
-char *__hasmntopt(const struct mntent* mnt, const char* opt) {
+char *compat_hasmntopt(const struct mntent* mnt, const char* opt) {
 	char* token = mnt->mnt_opts;
 	char* const end = mnt->mnt_opts + strlen(mnt->mnt_opts);
 	const size_t optLen = strlen(opt);
diff --git a/native/jni/utils/missing.hpp b/native/jni/utils/missing.hpp
index 5ce56ea3f..14dc7f012 100644
--- a/native/jni/utils/missing.hpp
+++ b/native/jni/utils/missing.hpp
@@ -4,62 +4,65 @@
 #include <unistd.h>
 #include <mntent.h>
 
-#define getline       __getline
-#define getdelim      __getdelim
-#define setns         __setns
-#define unshare       __unshare
-#define accept4       __accept4
-#define dup3          __dup3
-#define readlinkat    __readlinkat
-#define symlinkat     __symlinkat
-#define linkat        __linkat
-#define inotify_init1 __inotify_init1
-#define getmntent_r   __getmntent_r
-#define setmntent     __setmntent
-#define endmntent     __endmntent
-#define hasmntopt     __hasmntopt
-#define faccessat     __faccessat
+// Missing libc functions
+#define getline       compat_getline
+#define getdelim      compat_getdelim
+#define getmntent_r   compat_getmntent_r
+#define setmntent     compat_setmntent
+#define endmntent     compat_endmntent
+#define hasmntopt     compat_hasmntopt
 
-ssize_t __getline(char **lineptr, size_t *n, FILE *stream);
-ssize_t __getdelim(char **lineptr, size_t *n, int delim, FILE *stream);
-struct mntent *__getmntent_r(FILE* fp, struct mntent* e, char* buf, int buf_len);
-FILE *__setmntent(const char* path, const char* mode);
-int __endmntent(FILE* fp);
-char *__hasmntopt(const struct mntent* mnt, const char* opt);
+// Missing syscall wrappers
+#define setns         compat_setns
+#define unshare       compat_unshare
+#define accept4       compat_accept4
+#define dup3          compat_dup3
+#define readlinkat    compat_readlinkat
+#define symlinkat     compat_symlinkat
+#define linkat        compat_linkat
+#define inotify_init1 compat_inotify_init1
+#define faccessat     compat_faccessat
 
-static inline int __setns(int fd, int nstype) {
+ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream);
+ssize_t compat_getdelim(char **lineptr, size_t *n, int delim, FILE *stream);
+struct mntent *compat_getmntent_r(FILE* fp, struct mntent* e, char* buf, int buf_len);
+FILE *compat_setmntent(const char* path, const char* mode);
+int compat_endmntent(FILE* fp);
+char *compat_hasmntopt(const struct mntent* mnt, const char* opt);
+
+static inline int compat_setns(int fd, int nstype) {
 	return syscall(__NR_setns, fd, nstype);
 }
 
-static inline int __unshare(int flags) {
+static inline int compat_unshare(int flags) {
 	return syscall(__NR_unshare, flags);
 }
 
-static inline int __accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags) {
+static inline int compat_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags) {
 	return syscall(__NR_accept4, sockfd, addr, addrlen, flags);
 }
 
-static inline int __dup3(int oldfd, int newfd, int flags) {
+static inline int compat_dup3(int oldfd, int newfd, int flags) {
 	return syscall(__NR_dup3, oldfd, newfd, flags);
 }
 
-static inline ssize_t __readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz) {
+static inline ssize_t compat_readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz) {
 	return syscall(__NR_readlinkat, dirfd, pathname, buf, bufsiz);
 }
 
-static inline int __symlinkat(const char *target, int newdirfd, const char *linkpath) {
+static inline int compat_symlinkat(const char *target, int newdirfd, const char *linkpath) {
 	return syscall(__NR_symlinkat, target, newdirfd, linkpath);
 }
 
-static inline int __linkat(int olddirfd, const char *oldpath,
+static inline int compat_linkat(int olddirfd, const char *oldpath,
 		int newdirfd, const char *newpath, int flags) {
 	return syscall(__NR_linkat, olddirfd, oldpath, newdirfd, newpath, flags);
 }
 
-static inline int __inotify_init1(int flags) {
+static inline int compat_inotify_init1(int flags) {
 	return syscall(__NR_inotify_init1, flags);
 }
 
-static inline int __faccessat(int dirfd, const char *pathname, int mode, int flags) {
+static inline int compat_faccessat(int dirfd, const char *pathname, int mode, int flags) {
 	return syscall(__NR_faccessat, dirfd, pathname, mode, flags);
 }