diff --git a/libc/config/linux/riscv64/entrypoints.txt b/libc/config/linux/riscv64/entrypoints.txt
--- a/libc/config/linux/riscv64/entrypoints.txt
+++ b/libc/config/linux/riscv64/entrypoints.txt
@@ -54,9 +54,6 @@
     libc.src.string.strdup
     libc.src.string.strerror
     libc.src.string.strerror_r
-    libc.src.string.strdup
-    libc.src.string.strerror
-    libc.src.string.strerror_r
     libc.src.string.strlcat
     libc.src.string.strlcpy
     libc.src.string.strlen
@@ -65,12 +62,10 @@
     libc.src.string.strncmp
     libc.src.string.strncpy
     libc.src.string.strndup
-    libc.src.string.strndup
     libc.src.string.strnlen
     libc.src.string.strpbrk
     libc.src.string.strrchr
     libc.src.string.strsignal
-    libc.src.string.strsignal
     libc.src.string.strspn
     libc.src.string.strstr
     libc.src.string.strtok
@@ -326,6 +321,9 @@
 
 if(LLVM_LIBC_FULL_BUILD)
   list(APPEND TARGET_LIBC_ENTRYPOINTS
+    # assert.h entrypoints
+    libc.src.assert.__assert_fail
+
     # network.h entrypoints
     libc.src.network.htonl
     libc.src.network.htons
@@ -349,6 +347,8 @@
     libc.src.stdio.ferror
     libc.src.stdio.ferror_unlocked
     libc.src.stdio.fgetc
+    libc.src.stdio.fgetc_unlocked
+    libc.src.stdio.fgets
     libc.src.stdio.fflush
     libc.src.stdio.fopen
     libc.src.stdio.fputc
@@ -357,20 +357,30 @@
     libc.src.stdio.fread
     libc.src.stdio.fread_unlocked
     libc.src.stdio.fseek
+    libc.src.stdio.ftell
     libc.src.stdio.funlockfile
     libc.src.stdio.fwrite
     libc.src.stdio.fwrite_unlocked
     libc.src.stdio.fprintf
+    libc.src.stdio.getc
+    libc.src.stdio.getc_unlocked
     libc.src.stdio.printf
+    libc.src.stdio.sscanf
+    libc.src.stdio.scanf
+    libc.src.stdio.fscanf
     libc.src.stdio.putc
     libc.src.stdio.putchar
     libc.src.stdio.puts
+    libc.src.stdio.setbuf
+    libc.src.stdio.setvbuf
     libc.src.stdio.stderr
     libc.src.stdio.stdin
     libc.src.stdio.stdout
+    libc.src.stdio.ungetc
 
     # stdlib.h entrypoints
     libc.src.stdlib._Exit
+    libc.src.stdlib.abort
     libc.src.stdlib.atexit
     libc.src.stdlib.exit
     libc.src.stdlib.getenv
@@ -412,6 +422,15 @@
 
     # unistd.h entrypoints
     libc.src.unistd.environ
+    libc.src.unistd.execv
+    libc.src.unistd.getopt
+    libc.src.unistd.optarg
+    libc.src.unistd.optind
+    libc.src.unistd.optopt
+    libc.src.unistd.opterr
+
+    # sys/select.h entrypoints
+    libc.src.sys.select.select
   )
 endif()
 
diff --git a/libc/config/linux/riscv64/headers.txt b/libc/config/linux/riscv64/headers.txt
--- a/libc/config/linux/riscv64/headers.txt
+++ b/libc/config/linux/riscv64/headers.txt
@@ -1,6 +1,9 @@
 set(TARGET_PUBLIC_HEADERS
+    libc.include.assert
     libc.include.ctype
     libc.include.errno
+    libc.include.fcntl
+    libc.include.fenv
     libc.include.inttypes
     libc.include.math
     libc.include.sched
@@ -8,5 +11,16 @@
     libc.include.stdio
     libc.include.stdlib
     libc.include.string
+    libc.include.termios
+    libc.include.threads
     libc.include.time
+    libc.include.unistd
+
+    libc.include.sys_mman
+    libc.include.sys_random
+    libc.include.sys_resource
+    libc.include.sys_select
+    libc.include.sys_stat
+    libc.include.sys_utsname
+    libc.include.sys_wait
 )