diff --git a/libs/libc/misc/Make.defs b/libs/libc/misc/Make.defs
index 8d26b67616..e1331fc47c 100644
--- a/libs/libc/misc/Make.defs
+++ b/libs/libc/misc/Make.defs
@@ -23,21 +23,11 @@
 CSRCS += lib_umask.c lib_utsname.c
 CSRCS += lib_xorshift128.c lib_tea_encrypt.c lib_tea_decrypt.c
 
-ifneq ($(CONFIG_STDIO_DISABLE_BUFFERING),y)
-CSRCS += lib_filesem.c
-endif
-
 # Support for platforms that do not have long long types
 
 CSRCS += lib_umul32.c lib_umul64.c lib_umul32x64.c
 CSRCS += lib_uadd32x64.c lib_uadd64.c lib_usub64x32.c lib_usub64.c
 
-# Add C files that depend on file OR socket descriptors
-
-ifeq ($(CONFIG_FILE_STREAM),y)
-CSRCS += lib_stream.c
-endif
-
 ifeq ($(CONFIG_PIPES),y)
 CSRCS += lib_mkfifo.c
 endif
diff --git a/libs/libc/stdio/Make.defs b/libs/libc/stdio/Make.defs
index c26054424f..a1ba9ecb6f 100644
--- a/libs/libc/stdio/Make.defs
+++ b/libs/libc/stdio/Make.defs
@@ -32,11 +32,11 @@ CSRCS += lib_libsnoflush.c lib_libvsprintf.c lib_ultoa_invert.c
 ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
 CSRCS += lib_dtoa_engine.c lib_dtoa_data.c
 endif
+CSRCS += lib_tempnam.c lib_tmpnam.c
 
 # The remaining sources files depend upon C streams
 
 ifeq ($(CONFIG_FILE_STREAM),y)
-
 CSRCS += lib_fopen.c lib_freopen.c lib_fclose.c lib_fread.c lib_libfread.c
 CSRCS += lib_fseek.c lib_fseeko.c lib_ftell.c lib_ftello.c lib_fsetpos.c
 CSRCS += lib_getdelim.c lib_fgetpos.c lib_getc.c lib_getchar.c lib_fgetc.c
@@ -49,14 +49,9 @@ CSRCS += lib_stdsostream.c lib_perror.c lib_feof.c lib_ferror.c
 CSRCS += lib_rawinstream.c lib_rawoutstream.c lib_rawsistream.c
 CSRCS += lib_rawsostream.c lib_remove.c lib_rewind.c lib_clearerr.c
 CSRCS += lib_scanf.c lib_vscanf.c lib_fscanf.c lib_vfscanf.c lib_tmpfile.c
-CSRCS += lib_setbuf.c lib_setvbuf.c
-
+CSRCS += lib_setbuf.c lib_setvbuf.c lib_libstream.c lib_libfilesem.c
 endif
 
-CSRCS += lib_tempnam.c lib_tmpnam.c
-
-# Other support that depends on specific, configured features.
-
 # Add the stdio directory to the build
 
 DEPPATH += --dep-path stdio
diff --git a/libs/libc/misc/lib_filesem.c b/libs/libc/stdio/lib_libfilesem.c
similarity index 99%
rename from libs/libc/misc/lib_filesem.c
rename to libs/libc/stdio/lib_libfilesem.c
index bbe63b3279..a67a89dbfb 100644
--- a/libs/libc/misc/lib_filesem.c
+++ b/libs/libc/stdio/lib_libfilesem.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/misc/lib_filesem.c
+ * libs/libc/stdio/lib_libfilesem.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/libs/libc/misc/lib_stream.c b/libs/libc/stdio/lib_libstream.c
similarity index 99%
rename from libs/libc/misc/lib_stream.c
rename to libs/libc/stdio/lib_libstream.c
index a749af07e6..b59bf3dca5 100644
--- a/libs/libc/misc/lib_stream.c
+++ b/libs/libc/stdio/lib_libstream.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/misc/lib_stream.c
+ * libs/libc/stdio/lib_libstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with