From 37fc6c117c1a7537f5ba0de69e027a78cbf31af2 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Sun, 8 Mar 2020 12:05:14 +0100
Subject: [PATCH] Userspace: Add missing #includes now that AK/StdLibExtras.h
 is smaller

---
 Applications/FileManager/PropertiesDialog.cpp |  1 +
 Applications/FileManager/main.cpp             |  1 +
 Applications/Help/main.cpp                    |  3 ++-
 Applications/HexEditor/HexEditorWidget.cpp    |  1 +
 Applications/TextEditor/TextEditorWidget.cpp  |  1 +
 DevTools/HackStudio/EditorWrapper.h           |  1 +
 DevTools/HackStudio/TerminalWrapper.cpp       |  3 ++-
 Libraries/LibAudio/Buffer.h                   | 11 ++++++-----
 Libraries/LibC/grp.cpp                        |  1 +
 Libraries/LibC/malloc.cpp                     |  1 +
 Libraries/LibC/pwd.cpp                        |  1 +
 Libraries/LibCore/ArgsParser.cpp              |  1 +
 Libraries/LibCore/DirIterator.h               |  1 +
 Libraries/LibCore/IODevice.cpp                |  1 +
 Libraries/LibCore/SocketAddress.h             |  1 +
 Libraries/LibCore/SyscallUtils.h              |  1 +
 Libraries/LibELF/ELFDynamicLoader.cpp         |  4 ++--
 Libraries/LibELF/ELFDynamicObject.cpp         |  1 +
 Libraries/LibELF/ELFImage.cpp                 |  1 +
 Libraries/LibELF/ELFLoader.cpp                |  7 ++++---
 Libraries/LibGUI/FilePicker.cpp               |  1 +
 Libraries/LibGfx/Bitmap.cpp                   |  1 +
 Libraries/LibGfx/Font.cpp                     |  5 +++--
 Libraries/LibGfx/GIFLoader.cpp                |  1 +
 Libraries/LibGfx/Painter.cpp                  | 15 ++++++++-------
 Libraries/LibGfx/Palette.cpp                  |  1 +
 Libraries/LibGfx/Point.h                      |  1 +
 Libraries/LibGfx/Rect.h                       |  1 +
 Libraries/LibMarkdown/MDText.cpp              |  1 +
 Libraries/LibPthread/pthread.cpp              |  1 +
 Libraries/LibVT/Terminal.cpp                  |  1 +
 Servers/WindowServer/Compositor.cpp           |  1 +
 Servers/WindowServer/main.cpp                 |  1 +
 Userland/allocate.cpp                         |  1 +
 Userland/cal.cpp                              |  1 +
 Userland/disk_benchmark.cpp                   |  5 +++--
 Userland/head.cpp                             |  2 +-
 Userland/ifconfig.cpp                         |  1 +
 Userland/md.cpp                               |  1 +
 Userland/mount.cpp                            |  1 +
 Userland/pidof.cpp                            |  1 +
 Userland/sleep.cpp                            |  1 +
 Userland/sort.cpp                             |  3 ++-
 Userland/su.cpp                               |  1 +
 44 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/Applications/FileManager/PropertiesDialog.cpp b/Applications/FileManager/PropertiesDialog.cpp
index 3421b71c667..616736ba9c7 100644
--- a/Applications/FileManager/PropertiesDialog.cpp
+++ b/Applications/FileManager/PropertiesDialog.cpp
@@ -35,6 +35,7 @@
 #include <limits.h>
 #include <pwd.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
 PropertiesDialog::PropertiesDialog(GUI::FileSystemModel& model, String path, bool disable_rename, Window* parent_window)
diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp
index d035abef55e..d5dba49ab76 100644
--- a/Applications/FileManager/main.cpp
+++ b/Applications/FileManager/main.cpp
@@ -55,6 +55,7 @@
 #include <LibGUI/Window.h>
 #include <signal.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
 int main(int argc, char** argv)
diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp
index d9b9f304175..6e58b50eb84 100644
--- a/Applications/Help/main.cpp
+++ b/Applications/Help/main.cpp
@@ -40,13 +40,14 @@
 #include <LibGUI/ToolBar.h>
 #include <LibGUI/TreeView.h>
 #include <LibGUI/Window.h>
+#include <LibMarkdown/MDDocument.h>
 #include <LibWeb/HtmlView.h>
 #include <LibWeb/Layout/LayoutNode.h>
 #include <LibWeb/Parser/CSSParser.h>
 #include <LibWeb/Parser/HTMLParser.h>
-#include <LibMarkdown/MDDocument.h>
 #include <libgen.h>
 #include <stdio.h>
+#include <string.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/Applications/HexEditor/HexEditorWidget.cpp b/Applications/HexEditor/HexEditorWidget.cpp
index 22c81bfde4f..3f1b6964331 100644
--- a/Applications/HexEditor/HexEditorWidget.cpp
+++ b/Applications/HexEditor/HexEditorWidget.cpp
@@ -43,6 +43,7 @@
 #include <LibGUI/TextEditor.h>
 #include <LibGUI/ToolBar.h>
 #include <stdio.h>
+#include <string.h>
 
 HexEditorWidget::HexEditorWidget()
 {
diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp
index 4da323de9ca..a51c7c04f62 100644
--- a/Applications/TextEditor/TextEditorWidget.cpp
+++ b/Applications/TextEditor/TextEditorWidget.cpp
@@ -45,6 +45,7 @@
 #include <LibGUI/TextEditor.h>
 #include <LibGUI/ToolBar.h>
 #include <LibGfx/Font.h>
+#include <string.h>
 
 TextEditorWidget::TextEditorWidget()
 {
diff --git a/DevTools/HackStudio/EditorWrapper.h b/DevTools/HackStudio/EditorWrapper.h
index 0aaccf4cec9..9cf89472228 100644
--- a/DevTools/HackStudio/EditorWrapper.h
+++ b/DevTools/HackStudio/EditorWrapper.h
@@ -27,6 +27,7 @@
 #pragma once
 
 #include <LibGUI/Widget.h>
+#include <string.h>
 
 class Editor;
 
diff --git a/DevTools/HackStudio/TerminalWrapper.cpp b/DevTools/HackStudio/TerminalWrapper.cpp
index 920a8c99a54..7f7a904010e 100644
--- a/DevTools/HackStudio/TerminalWrapper.cpp
+++ b/DevTools/HackStudio/TerminalWrapper.cpp
@@ -35,6 +35,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -142,7 +143,7 @@ void TerminalWrapper::run_command(const String& command)
 
         auto parts = command.split(' ');
         ASSERT(!parts.is_empty());
-        const char** args = (const char**) calloc(parts.size() + 1, sizeof(const char*));
+        const char** args = (const char**)calloc(parts.size() + 1, sizeof(const char*));
         for (size_t i = 0; i < parts.size(); i++) {
             args[i] = parts[i].characters();
         }
diff --git a/Libraries/LibAudio/Buffer.h b/Libraries/LibAudio/Buffer.h
index 230099b850e..8a9542b2818 100644
--- a/Libraries/LibAudio/Buffer.h
+++ b/Libraries/LibAudio/Buffer.h
@@ -27,9 +27,10 @@
 #pragma once
 
 #include <AK/ByteBuffer.h>
+#include <AK/SharedBuffer.h>
 #include <AK/Types.h>
 #include <AK/Vector.h>
-#include <AK/SharedBuffer.h>
+#include <string.h>
 
 namespace Audio {
 
@@ -126,15 +127,15 @@ public:
 
 private:
     explicit Buffer(Vector<Sample>&& samples)
-        : m_buffer(*SharedBuffer::create_with_size(samples.size() * sizeof(Sample))),
-        m_sample_count(samples.size())
+        : m_buffer(*SharedBuffer::create_with_size(samples.size() * sizeof(Sample)))
+        , m_sample_count(samples.size())
     {
         memcpy(m_buffer->data(), samples.data(), samples.size() * sizeof(Sample));
     }
 
     explicit Buffer(NonnullRefPtr<SharedBuffer>&& buffer, int sample_count)
-        : m_buffer(move(buffer)),
-        m_sample_count(sample_count)
+        : m_buffer(move(buffer))
+        , m_sample_count(sample_count)
     {
     }
 
diff --git a/Libraries/LibC/grp.cpp b/Libraries/LibC/grp.cpp
index 76e69ae9693..6d66e76268d 100644
--- a/Libraries/LibC/grp.cpp
+++ b/Libraries/LibC/grp.cpp
@@ -29,6 +29,7 @@
 #include <grp.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
diff --git a/Libraries/LibC/malloc.cpp b/Libraries/LibC/malloc.cpp
index 0c1ddd388bb..500788c89b8 100644
--- a/Libraries/LibC/malloc.cpp
+++ b/Libraries/LibC/malloc.cpp
@@ -34,6 +34,7 @@
 #include <serenity.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/mman.h>
 
 // FIXME: Thread safety.
diff --git a/Libraries/LibC/pwd.cpp b/Libraries/LibC/pwd.cpp
index 00bf40476e7..683f4a7d503 100644
--- a/Libraries/LibC/pwd.cpp
+++ b/Libraries/LibC/pwd.cpp
@@ -29,6 +29,7 @@
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
diff --git a/Libraries/LibCore/ArgsParser.cpp b/Libraries/LibCore/ArgsParser.cpp
index 18591d4cf99..18e42011f17 100644
--- a/Libraries/LibCore/ArgsParser.cpp
+++ b/Libraries/LibCore/ArgsParser.cpp
@@ -29,6 +29,7 @@
 #include <getopt.h>
 #include <limits.h>
 #include <stdio.h>
+#include <string.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/DirIterator.h b/Libraries/LibCore/DirIterator.h
index 184dda654fd..b3a2c5a5bdd 100644
--- a/Libraries/LibCore/DirIterator.h
+++ b/Libraries/LibCore/DirIterator.h
@@ -28,6 +28,7 @@
 
 #include <AK/String.h>
 #include <dirent.h>
+#include <string.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/IODevice.cpp b/Libraries/LibCore/IODevice.cpp
index 3e8f97776d0..a727f522b2b 100644
--- a/Libraries/LibCore/IODevice.cpp
+++ b/Libraries/LibCore/IODevice.cpp
@@ -30,6 +30,7 @@
 #include <LibCore/SyscallUtils.h>
 #include <errno.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/Libraries/LibCore/SocketAddress.h b/Libraries/LibCore/SocketAddress.h
index 04892bf11c3..40339074c13 100644
--- a/Libraries/LibCore/SocketAddress.h
+++ b/Libraries/LibCore/SocketAddress.h
@@ -29,6 +29,7 @@
 #include <AK/IPv4Address.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
diff --git a/Libraries/LibCore/SyscallUtils.h b/Libraries/LibCore/SyscallUtils.h
index 3aff3bfe99b..59b7d76b089 100644
--- a/Libraries/LibCore/SyscallUtils.h
+++ b/Libraries/LibCore/SyscallUtils.h
@@ -29,6 +29,7 @@
 #include <AK/LogStream.h>
 #include <AK/StdLibExtras.h>
 #include <errno.h>
+#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/Libraries/LibELF/ELFDynamicLoader.cpp b/Libraries/LibELF/ELFDynamicLoader.cpp
index 8e75e7ba1cd..836972237e0 100644
--- a/Libraries/LibELF/ELFDynamicLoader.cpp
+++ b/Libraries/LibELF/ELFDynamicLoader.cpp
@@ -32,6 +32,7 @@
 #include <mman.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define DYNAMIC_LOAD_DEBUG
 //#define DYNAMIC_LOAD_VERBOSE
@@ -163,8 +164,7 @@ void ELFDynamicLoader::load_program_headers(const ELFImage& elf_image)
                 text_region_ptr = &region;
             else
                 data_region_ptr = &region;
-        }
-        else if (region.is_dynamic()) {
+        } else if (region.is_dynamic()) {
             dynamic_region_desired_vaddr = region.desired_load_address();
         }
     });
diff --git a/Libraries/LibELF/ELFDynamicObject.cpp b/Libraries/LibELF/ELFDynamicObject.cpp
index 5a98a0ae043..385de9e3bec 100644
--- a/Libraries/LibELF/ELFDynamicObject.cpp
+++ b/Libraries/LibELF/ELFDynamicObject.cpp
@@ -29,6 +29,7 @@
 #include <LibELF/ELFDynamicObject.h>
 #include <LibELF/exec_elf.h>
 #include <stdio.h>
+#include <string.h>
 
 static const char* name_for_dtag(Elf32_Sword d_tag);
 
diff --git a/Libraries/LibELF/ELFImage.cpp b/Libraries/LibELF/ELFImage.cpp
index 76274225109..6344639c877 100644
--- a/Libraries/LibELF/ELFImage.cpp
+++ b/Libraries/LibELF/ELFImage.cpp
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <AK/Memory.h>
 #include <AK/StringBuilder.h>
 #include <LibELF/ELFImage.h>
 
diff --git a/Libraries/LibELF/ELFLoader.cpp b/Libraries/LibELF/ELFLoader.cpp
index 8849ac56a7f..e5a30b31fe4 100644
--- a/Libraries/LibELF/ELFLoader.cpp
+++ b/Libraries/LibELF/ELFLoader.cpp
@@ -26,13 +26,14 @@
 
 #include "ELFLoader.h"
 #include <AK/Demangle.h>
+#include <AK/Memory.h>
 #include <AK/QuickSort.h>
 
 #ifdef KERNEL
-#include <Kernel/VM/MemoryManager.h>
-#define do_memcpy copy_to_user
+#    include <Kernel/VM/MemoryManager.h>
+#    define do_memcpy copy_to_user
 #else
-#define do_memcpy memcpy
+#    define do_memcpy memcpy
 #endif
 
 //#define ELFLOADER_DEBUG
diff --git a/Libraries/LibGUI/FilePicker.cpp b/Libraries/LibGUI/FilePicker.cpp
index 575fb47c291..82e5aa63021 100644
--- a/Libraries/LibGUI/FilePicker.cpp
+++ b/Libraries/LibGUI/FilePicker.cpp
@@ -38,6 +38,7 @@
 #include <LibGUI/SortingProxyModel.h>
 #include <LibGUI/TextBox.h>
 #include <LibGUI/ToolBar.h>
+#include <string.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGfx/Bitmap.cpp b/Libraries/LibGfx/Bitmap.cpp
index fa1db07ad75..cda0ad656b2 100644
--- a/Libraries/LibGfx/Bitmap.cpp
+++ b/Libraries/LibGfx/Bitmap.cpp
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <AK/Memory.h>
 #include <AK/SharedBuffer.h>
 #include <AK/String.h>
 #include <LibGfx/Bitmap.h>
diff --git a/Libraries/LibGfx/Font.cpp b/Libraries/LibGfx/Font.cpp
index 9d815964a37..409d581a3e4 100644
--- a/Libraries/LibGfx/Font.cpp
+++ b/Libraries/LibGfx/Font.cpp
@@ -25,8 +25,8 @@
  */
 
 #include "Font.h"
-#include "Emoji.h"
 #include "Bitmap.h"
+#include "Emoji.h"
 #include <AK/BufferStream.h>
 #include <AK/MappedFile.h>
 #include <AK/StdLibExtras.h>
@@ -35,9 +35,10 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <unistd.h>
-#include <stdlib.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibGfx/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp
index 2c8c1afd39a..a0c86479294 100644
--- a/Libraries/LibGfx/GIFLoader.cpp
+++ b/Libraries/LibGfx/GIFLoader.cpp
@@ -31,6 +31,7 @@
 #include <AK/NonnullOwnPtrVector.h>
 #include <LibGfx/GIFLoader.h>
 #include <stdio.h>
+#include <string.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibGfx/Painter.cpp b/Libraries/LibGfx/Painter.cpp
index 0faa88ad71d..93e01de82b7 100644
--- a/Libraries/LibGfx/Painter.cpp
+++ b/Libraries/LibGfx/Painter.cpp
@@ -25,10 +25,11 @@
  */
 
 #include "Painter.h"
+#include "Bitmap.h"
 #include "Emoji.h"
 #include "Font.h"
-#include "Bitmap.h"
 #include <AK/Assertions.h>
+#include <AK/Memory.h>
 #include <AK/StdLibExtras.h>
 #include <AK/StringBuilder.h>
 #include <AK/Utf8View.h>
@@ -38,15 +39,15 @@
 #include <unistd.h>
 
 #if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC optimize("O3")
+#    pragma GCC optimize("O3")
 #endif
 
 #ifndef ALWAYS_INLINE
-#if __has_attribute(always_inline)
-#define ALWAYS_INLINE __attribute__((always_inline))
-#else
-#define ALWAYS_INLINE inline
-#endif
+#    if __has_attribute(always_inline)
+#        define ALWAYS_INLINE __attribute__((always_inline))
+#    else
+#        define ALWAYS_INLINE inline
+#    endif
 #endif
 
 namespace Gfx {
diff --git a/Libraries/LibGfx/Palette.cpp b/Libraries/LibGfx/Palette.cpp
index 904b7722abb..b288f345b4b 100644
--- a/Libraries/LibGfx/Palette.cpp
+++ b/Libraries/LibGfx/Palette.cpp
@@ -27,6 +27,7 @@
 #include <AK/Badge.h>
 #include <AK/SharedBuffer.h>
 #include <LibGfx/Palette.h>
+#include <string.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibGfx/Point.h b/Libraries/LibGfx/Point.h
index 410865775d7..4007642d2a5 100644
--- a/Libraries/LibGfx/Point.h
+++ b/Libraries/LibGfx/Point.h
@@ -29,6 +29,7 @@
 #include <AK/Forward.h>
 #include <AK/StdLibExtras.h>
 #include <LibGfx/Orientation.h>
+#include <stdlib.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibGfx/Rect.h b/Libraries/LibGfx/Rect.h
index 2e3a9702bb4..d9109067f4c 100644
--- a/Libraries/LibGfx/Rect.h
+++ b/Libraries/LibGfx/Rect.h
@@ -31,6 +31,7 @@
 #include <LibGfx/Point.h>
 #include <LibGfx/Size.h>
 #include <LibGfx/TextAlignment.h>
+#include <stdlib.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibMarkdown/MDText.cpp b/Libraries/LibMarkdown/MDText.cpp
index f0b7dc15b8a..cb67d0840d8 100644
--- a/Libraries/LibMarkdown/MDText.cpp
+++ b/Libraries/LibMarkdown/MDText.cpp
@@ -26,6 +26,7 @@
 
 #include <AK/StringBuilder.h>
 #include <LibMarkdown/MDText.h>
+#include <string.h>
 
 static String unescape(const StringView& text)
 {
diff --git a/Libraries/LibPthread/pthread.cpp b/Libraries/LibPthread/pthread.cpp
index edae9f0c6a8..b4eb0572494 100644
--- a/Libraries/LibPthread/pthread.cpp
+++ b/Libraries/LibPthread/pthread.cpp
@@ -33,6 +33,7 @@
 #include <serenity.h>
 #include <signal.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/Libraries/LibVT/Terminal.cpp b/Libraries/LibVT/Terminal.cpp
index 23406aac6f8..01df69a956f 100644
--- a/Libraries/LibVT/Terminal.cpp
+++ b/Libraries/LibVT/Terminal.cpp
@@ -26,6 +26,7 @@
 
 #include <AK/StringBuilder.h>
 #include <LibVT/Terminal.h>
+#include <string.h>
 
 //#define TERMINAL_DEBUG
 
diff --git a/Servers/WindowServer/Compositor.cpp b/Servers/WindowServer/Compositor.cpp
index 519d8671164..a821855a16b 100644
--- a/Servers/WindowServer/Compositor.cpp
+++ b/Servers/WindowServer/Compositor.cpp
@@ -30,6 +30,7 @@
 #include "Screen.h"
 #include "Window.h"
 #include "WindowManager.h"
+#include <AK/Memory.h>
 #include <LibCore/Timer.h>
 #include <LibGfx/Font.h>
 #include <LibGfx/Painter.h>
diff --git a/Servers/WindowServer/main.cpp b/Servers/WindowServer/main.cpp
index e2c688f932f..9165a5cf8fc 100644
--- a/Servers/WindowServer/main.cpp
+++ b/Servers/WindowServer/main.cpp
@@ -35,6 +35,7 @@
 #include <LibGfx/SystemTheme.h>
 #include <signal.h>
 #include <stdio.h>
+#include <string.h>
 
 int main(int, char**)
 {
diff --git a/Userland/allocate.cpp b/Userland/allocate.cpp
index 131cade5ff9..dbda7e926c9 100644
--- a/Userland/allocate.cpp
+++ b/Userland/allocate.cpp
@@ -27,6 +27,7 @@
 #include <AK/String.h>
 #include <LibCore/ElapsedTimer.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
 void usage(void)
diff --git a/Userland/cal.cpp b/Userland/cal.cpp
index 552cab0111d..8329645a107 100644
--- a/Userland/cal.cpp
+++ b/Userland/cal.cpp
@@ -26,6 +26,7 @@
 
 #include <LibCore/ArgsParser.h>
 #include <stdio.h>
+#include <string.h>
 #include <time.h>
 
 const int line_width = 70;
diff --git a/Userland/disk_benchmark.cpp b/Userland/disk_benchmark.cpp
index 94f18d32d41..59798cd1762 100644
--- a/Userland/disk_benchmark.cpp
+++ b/Userland/disk_benchmark.cpp
@@ -29,12 +29,13 @@
 #include <AK/Types.h>
 #include <AK/Vector.h>
 #include <LibCore/ElapsedTimer.h>
+#include <fcntl.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 struct Result {
     u64 write_bps;
diff --git a/Userland/head.cpp b/Userland/head.cpp
index db78e803b0a..e6fcfd3b4bc 100644
--- a/Userland/head.cpp
+++ b/Userland/head.cpp
@@ -26,10 +26,10 @@
 
 #include <AK/StdLibExtras.h>
 #include <LibCore/ArgsParser.h>
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 int head(const String& filename, bool print_filename, int line_count, int char_count);
 
diff --git a/Userland/ifconfig.cpp b/Userland/ifconfig.cpp
index 7a26c6ffef0..dc7791beeeb 100644
--- a/Userland/ifconfig.cpp
+++ b/Userland/ifconfig.cpp
@@ -32,6 +32,7 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
diff --git a/Userland/md.cpp b/Userland/md.cpp
index f0f5ee576ec..d9e77a8c227 100644
--- a/Userland/md.cpp
+++ b/Userland/md.cpp
@@ -29,6 +29,7 @@
 #include <LibCore/File.h>
 #include <LibMarkdown/MDDocument.h>
 #include <stdio.h>
+#include <string.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/Userland/mount.cpp b/Userland/mount.cpp
index dc4149a9599..314588a1976 100644
--- a/Userland/mount.cpp
+++ b/Userland/mount.cpp
@@ -30,6 +30,7 @@
 #include <LibCore/ArgsParser.h>
 #include <LibCore/File.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
 int parse_options(const StringView& options)
diff --git a/Userland/pidof.cpp b/Userland/pidof.cpp
index 2a11481e077..9066a5a1b6c 100644
--- a/Userland/pidof.cpp
+++ b/Userland/pidof.cpp
@@ -32,6 +32,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 static int pid_of(const String& process_name, bool single_shot, bool omit_pid, pid_t pid)
diff --git a/Userland/sleep.cpp b/Userland/sleep.cpp
index 8c7b9f92f42..e4b40f05d74 100644
--- a/Userland/sleep.cpp
+++ b/Userland/sleep.cpp
@@ -27,6 +27,7 @@
 #include <AK/String.h>
 #include <signal.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
 void handle_sigint(int)
diff --git a/Userland/sort.cpp b/Userland/sort.cpp
index 009069dca59..a8fa559fbe6 100644
--- a/Userland/sort.cpp
+++ b/Userland/sort.cpp
@@ -24,11 +24,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <AK/String.h>
 #include <AK/QuickSort.h>
+#include <AK/String.h>
 #include <AK/Vector.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 int main(int argc, char** argv)
 {
diff --git a/Userland/su.cpp b/Userland/su.cpp
index 0085974aa0e..7529af6efe5 100644
--- a/Userland/su.cpp
+++ b/Userland/su.cpp
@@ -29,6 +29,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
 extern "C" int main(int, char**);