diff --git a/Applications/PixelPaint/EllipseTool.cpp b/Applications/PixelPaint/EllipseTool.cpp
index e4914f03b2b..bdad687e656 100644
--- a/Applications/PixelPaint/EllipseTool.cpp
+++ b/Applications/PixelPaint/EllipseTool.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Rect.h>
-#include <math.h>
+#include <LibM/math.h>
 
 namespace PixelPaint {
 
diff --git a/Applications/PixelPaint/LineTool.cpp b/Applications/PixelPaint/LineTool.cpp
index 8dd2d0a4f1b..dd1133aa772 100644
--- a/Applications/PixelPaint/LineTool.cpp
+++ b/Applications/PixelPaint/LineTool.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/Action.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
-#include <math.h>
+#include <LibM/math.h>
 
 namespace PixelPaint {
 
diff --git a/Applications/PixelPaint/RectangleTool.cpp b/Applications/PixelPaint/RectangleTool.cpp
index 4eaffd29bb4..84d5e3937ec 100644
--- a/Applications/PixelPaint/RectangleTool.cpp
+++ b/Applications/PixelPaint/RectangleTool.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Rect.h>
-#include <math.h>
+#include <LibM/math.h>
 
 namespace PixelPaint {
 
diff --git a/Applications/PixelPaint/SprayTool.cpp b/Applications/PixelPaint/SprayTool.cpp
index 85a6200f978..0a685e36e0f 100644
--- a/Applications/PixelPaint/SprayTool.cpp
+++ b/Applications/PixelPaint/SprayTool.cpp
@@ -33,7 +33,7 @@
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Bitmap.h>
-#include <math.h>
+#include <LibM/math.h>
 #include <stdio.h>
 
 namespace PixelPaint {
diff --git a/Applications/SoundPlayer/SampleWidget.cpp b/Applications/SoundPlayer/SampleWidget.cpp
index b3884a175a8..5decd2b8b9a 100644
--- a/Applications/SoundPlayer/SampleWidget.cpp
+++ b/Applications/SoundPlayer/SampleWidget.cpp
@@ -27,7 +27,7 @@
 #include "SampleWidget.h"
 #include <LibAudio/Buffer.h>
 #include <LibGUI/Painter.h>
-#include <math.h>
+#include <LibM/math.h>
 
 SampleWidget::SampleWidget()
 {
diff --git a/Applications/SoundPlayer/SoundPlayerWidget.cpp b/Applications/SoundPlayer/SoundPlayerWidget.cpp
index 59012835819..0b416c0833b 100644
--- a/Applications/SoundPlayer/SoundPlayerWidget.cpp
+++ b/Applications/SoundPlayer/SoundPlayerWidget.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/MessageBox.h>
-#include <math.h>
+#include <LibM/math.h>
 
 SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtr<Audio::ClientConnection> connection)
     : m_window(window)
diff --git a/Libraries/LibGfx/FloatPoint.h b/Libraries/LibGfx/FloatPoint.h
index 3cfa7103a57..59b10a06c03 100644
--- a/Libraries/LibGfx/FloatPoint.h
+++ b/Libraries/LibGfx/FloatPoint.h
@@ -30,7 +30,7 @@
 #include <AK/String.h>
 #include <LibGfx/Orientation.h>
 #include <LibGfx/Point.h>
-#include <math.h>
+#include <LibM/math.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibGfx/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp
index 264175e58d1..a7e3f89407b 100644
--- a/Libraries/LibGfx/GIFLoader.cpp
+++ b/Libraries/LibGfx/GIFLoader.cpp
@@ -30,7 +30,7 @@
 #include <AK/MappedFile.h>
 #include <AK/NonnullOwnPtrVector.h>
 #include <LibGfx/GIFLoader.h>
-#include <math.h>
+#include <LibM/math.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -546,7 +546,7 @@ GIFImageDecoderPlugin::GIFImageDecoderPlugin(const u8* data, size_t size)
     m_context->data_size = size;
 }
 
-GIFImageDecoderPlugin::~GIFImageDecoderPlugin() { }
+GIFImageDecoderPlugin::~GIFImageDecoderPlugin() {}
 
 IntSize GIFImageDecoderPlugin::size()
 {
diff --git a/Libraries/LibGfx/ICOLoader.cpp b/Libraries/LibGfx/ICOLoader.cpp
index c75aae04b27..3026ce0f9d6 100644
--- a/Libraries/LibGfx/ICOLoader.cpp
+++ b/Libraries/LibGfx/ICOLoader.cpp
@@ -32,7 +32,7 @@
 #include <AK/Types.h>
 #include <LibGfx/ICOLoader.h>
 #include <LibGfx/PNGLoader.h>
-#include <math.h>
+#include <LibM/math.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/Libraries/LibGfx/JPGLoader.cpp b/Libraries/LibGfx/JPGLoader.cpp
index c7b40c8d2bc..57772534d29 100644
--- a/Libraries/LibGfx/JPGLoader.cpp
+++ b/Libraries/LibGfx/JPGLoader.cpp
@@ -33,7 +33,7 @@
 #include <AK/Vector.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/JPGLoader.h>
-#include <math.h>
+#include <Libraries/LibM/math.h>
 
 #define JPG_DBG 0
 #define jpg_dbg(x) \
diff --git a/Libraries/LibGfx/PNGLoader.cpp b/Libraries/LibGfx/PNGLoader.cpp
index b4743d4bb49..e732ac2e243 100644
--- a/Libraries/LibGfx/PNGLoader.cpp
+++ b/Libraries/LibGfx/PNGLoader.cpp
@@ -30,7 +30,7 @@
 #include <AK/NetworkOrdered.h>
 #include <LibCore/puff.h>
 #include <LibGfx/PNGLoader.h>
-#include <math.h>
+#include <LibM/math.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/Libraries/LibGfx/Point.h b/Libraries/LibGfx/Point.h
index 9603625ef8d..9ba78a97445 100644
--- a/Libraries/LibGfx/Point.h
+++ b/Libraries/LibGfx/Point.h
@@ -31,7 +31,7 @@
 #include <LibGfx/Orientation.h>
 #include <LibGfx/Forward.h>
 #include <LibIPC/Forward.h>
-#include <math.h>
+#include <LibM/math.h>
 #include <stdlib.h>
 
 namespace Gfx {
diff --git a/Libraries/LibGfx/Rect.h b/Libraries/LibGfx/Rect.h
index 6105491f829..94d133d846a 100644
--- a/Libraries/LibGfx/Rect.h
+++ b/Libraries/LibGfx/Rect.h
@@ -30,7 +30,7 @@
 #include <LibGfx/Point.h>
 #include <LibGfx/Size.h>
 #include <LibGfx/TextAlignment.h>
-#include <math.h>
+#include <LibM/math.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibM/math.cpp b/Libraries/LibM/math.cpp
index 9d98d8439b8..d83dbecd644 100644
--- a/Libraries/LibM/math.cpp
+++ b/Libraries/LibM/math.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <LibC/assert.h>
-#include <math.h>
+#include <LibM/math.h>
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/Userland/du.cpp b/Userland/du.cpp
index 65352af28eb..475f2004a8c 100644
--- a/Userland/du.cpp
+++ b/Userland/du.cpp
@@ -33,7 +33,7 @@
 #include <LibCore/DirIterator.h>
 #include <LibCore/File.h>
 #include <LibCore/Object.h>
-#include <math.h>
+#include <LibM/math.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/Userland/functrace.cpp b/Userland/functrace.cpp
index 53b714e4830..69a5283068e 100644
--- a/Userland/functrace.cpp
+++ b/Userland/functrace.cpp
@@ -38,7 +38,7 @@
 #include <LibCore/File.h>
 #include <LibDebug/DebugSession.h>
 #include <LibELF/Image.h>
-#include <math.h>
+#include <LibM/math.h>
 #include <LibX86/Disassembler.h>
 #include <LibX86/Instruction.h>
 #include <signal.h>