From 27bfb8170239bc27b57734e8adc4cfad1e0413f8 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sat, 13 Aug 2022 20:49:58 +0200
Subject: [PATCH] Everywhere: Refer to `dlfcn*.h` by its non-prefixed name

---
 Tests/LibELF/TestDlOpen.cpp                 | 2 +-
 Userland/Libraries/LibC/dlfcn.cpp           | 2 +-
 Userland/Libraries/LibC/regex.cpp           | 4 ++--
 Userland/Libraries/LibDl/dlfcn.cpp          | 4 ++--
 Userland/Libraries/LibELF/DynamicLinker.cpp | 4 ++--
 Userland/Libraries/LibELF/DynamicLoader.cpp | 4 ++--
 Userland/Libraries/LibELF/DynamicLoader.h   | 2 +-
 Userland/Libraries/LibGPU/Driver.cpp        | 6 +-----
 8 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Tests/LibELF/TestDlOpen.cpp b/Tests/LibELF/TestDlOpen.cpp
index ee78afb4bf5..cb4692fe222 100644
--- a/Tests/LibELF/TestDlOpen.cpp
+++ b/Tests/LibELF/TestDlOpen.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibDl/dlfcn.h>
 #include <LibTest/TestCase.h>
+#include <dlfcn.h>
 
 TEST_CASE(test_dlopen)
 {
diff --git a/Userland/Libraries/LibC/dlfcn.cpp b/Userland/Libraries/LibC/dlfcn.cpp
index 41c13a5f925..df611300e16 100644
--- a/Userland/Libraries/LibC/dlfcn.cpp
+++ b/Userland/Libraries/LibC/dlfcn.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibDl/dlfcn_integration.h>
+#include <dlfcn_integration.h>
 
 // These are used by libdl and are filled in by the dynamic loader.
 DlCloseFunction __dlclose;
diff --git a/Userland/Libraries/LibC/regex.cpp b/Userland/Libraries/LibC/regex.cpp
index 394abb708a8..f4ed51fc93d 100644
--- a/Userland/Libraries/LibC/regex.cpp
+++ b/Userland/Libraries/LibC/regex.cpp
@@ -5,8 +5,8 @@
  */
 
 #include <AK/Assertions.h>
-#include <LibDl/dlfcn.h>
-#include <LibDl/dlfcn_integration.h>
+#include <dlfcn.h>
+#include <dlfcn_integration.h>
 #include <pthread.h>
 #include <regex.h>
 
diff --git a/Userland/Libraries/LibDl/dlfcn.cpp b/Userland/Libraries/LibDl/dlfcn.cpp
index ae1e18fe005..076d0e17ecb 100644
--- a/Userland/Libraries/LibDl/dlfcn.cpp
+++ b/Userland/Libraries/LibDl/dlfcn.cpp
@@ -6,8 +6,8 @@
 
 #include <AK/String.h>
 #include <AK/Types.h>
-#include <LibDl/dlfcn.h>
-#include <LibDl/dlfcn_integration.h>
+#include <dlfcn.h>
+#include <dlfcn_integration.h>
 #include <string.h>
 
 // FIXME: use thread_local and a String once TLS works
diff --git a/Userland/Libraries/LibELF/DynamicLinker.cpp b/Userland/Libraries/LibELF/DynamicLinker.cpp
index 6df64da6a8c..f9b0880c8f4 100644
--- a/Userland/Libraries/LibELF/DynamicLinker.cpp
+++ b/Userland/Libraries/LibELF/DynamicLinker.cpp
@@ -19,13 +19,13 @@
 #include <LibC/link.h>
 #include <LibC/sys/mman.h>
 #include <LibC/unistd.h>
-#include <LibDl/dlfcn.h>
-#include <LibDl/dlfcn_integration.h>
 #include <LibELF/AuxiliaryVector.h>
 #include <LibELF/DynamicLinker.h>
 #include <LibELF/DynamicLoader.h>
 #include <LibELF/DynamicObject.h>
 #include <LibELF/Hashes.h>
+#include <dlfcn.h>
+#include <dlfcn_integration.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <string.h>
diff --git a/Userland/Libraries/LibELF/DynamicLoader.cpp b/Userland/Libraries/LibELF/DynamicLoader.cpp
index b09d4b625c4..6e9dae795a6 100644
--- a/Userland/Libraries/LibELF/DynamicLoader.cpp
+++ b/Userland/Libraries/LibELF/DynamicLoader.cpp
@@ -11,13 +11,13 @@
 #include <AK/Optional.h>
 #include <AK/QuickSort.h>
 #include <AK/StringBuilder.h>
-#include <LibDl/dlfcn.h>
-#include <LibDl/dlfcn_integration.h>
 #include <LibELF/DynamicLinker.h>
 #include <LibELF/DynamicLoader.h>
 #include <LibELF/Hashes.h>
 #include <LibELF/Validation.h>
 #include <assert.h>
+#include <dlfcn.h>
+#include <dlfcn_integration.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Userland/Libraries/LibELF/DynamicLoader.h b/Userland/Libraries/LibELF/DynamicLoader.h
index 3bc3fbf1ef6..fe16aef3e32 100644
--- a/Userland/Libraries/LibELF/DynamicLoader.h
+++ b/Userland/Libraries/LibELF/DynamicLoader.h
@@ -12,9 +12,9 @@
 #include <AK/RefCounted.h>
 #include <AK/String.h>
 #include <LibC/elf.h>
-#include <LibDl/dlfcn_integration.h>
 #include <LibELF/DynamicObject.h>
 #include <LibELF/Image.h>
+#include <dlfcn_integration.h>
 #include <sys/mman.h>
 
 namespace ELF {
diff --git a/Userland/Libraries/LibGPU/Driver.cpp b/Userland/Libraries/LibGPU/Driver.cpp
index b19c80dfd72..d1929787631 100644
--- a/Userland/Libraries/LibGPU/Driver.cpp
+++ b/Userland/Libraries/LibGPU/Driver.cpp
@@ -7,12 +7,8 @@
 #include <AK/HashMap.h>
 #include <AK/String.h>
 #include <AK/WeakPtr.h>
-#ifdef __serenity__
-#    include <LibDl/dlfcn.h>
-#else
-#    include <dlfcn.h>
-#endif
 #include <LibGPU/Driver.h>
+#include <dlfcn.h>
 
 namespace GPU {