diff --git a/reactos/dll/directx/dsound/dsound.rbuild b/reactos/dll/directx/dsound/dsound.rbuild
index 41453e41c93..fa66e5b99a9 100644
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@@ -6,6 +6,7 @@
.
include/reactos/wine
+
wine
uuid
ntdll
diff --git a/reactos/dll/win32/gdiplus/gdiplus.rbuild b/reactos/dll/win32/gdiplus/gdiplus.rbuild
index cc07c8c5d35..eb28fd84e9f 100644
--- a/reactos/dll/win32/gdiplus/gdiplus.rbuild
+++ b/reactos/dll/win32/gdiplus/gdiplus.rbuild
@@ -6,6 +6,7 @@
.
include/reactos/wine
+
brush.c
customlinecap.c
font.c
diff --git a/reactos/dll/win32/jscript/jscript.rbuild b/reactos/dll/win32/jscript/jscript.rbuild
index f61a869af0b..4d31ff6f513 100644
--- a/reactos/dll/win32/jscript/jscript.rbuild
+++ b/reactos/dll/win32/jscript/jscript.rbuild
@@ -8,6 +8,7 @@
.
include/reactos/wine
+
jsglobal
wine
diff --git a/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild b/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
index ce52f5871dd..0d72ab3f339 100644
--- a/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
+++ b/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
@@ -1,8 +1,6 @@
-
-
.
samplerate.c
src_linear.c
diff --git a/reactos/subsystems/win32/win32k/objects/arc.c b/reactos/subsystems/win32/win32k/objects/arc.c
index 4cb7a55cf83..17d7f26d73e 100644
--- a/reactos/subsystems/win32/win32k/objects/arc.c
+++ b/reactos/subsystems/win32/win32k/objects/arc.c
@@ -1,4 +1,6 @@
#include
+#define _USE_MATH_DEFINES
+#include
#define NDEBUG
#include
diff --git a/reactos/subsystems/win32/win32k/objects/drawing.c b/reactos/subsystems/win32/win32k/objects/drawing.c
index 8b794938446..351c081731a 100755
--- a/reactos/subsystems/win32/win32k/objects/drawing.c
+++ b/reactos/subsystems/win32/win32k/objects/drawing.c
@@ -50,6 +50,8 @@ SUCH DAMAGE.
*/
#include
+#define _USE_MATH_DEFINES
+#include
#define NDEBUG
#include
diff --git a/reactos/subsystems/win32/win32k/objects/path.c b/reactos/subsystems/win32/win32k/objects/path.c
index 8a9010ced68..801e8e598c8 100644
--- a/reactos/subsystems/win32/win32k/objects/path.c
+++ b/reactos/subsystems/win32/win32k/objects/path.c
@@ -33,7 +33,8 @@
*/
#include
-#include "math.h"
+#define _USE_MATH_DEFINES
+#include
#define NDEBUG
#include
diff --git a/reactos/subsystems/win32/win32k/pch.h b/reactos/subsystems/win32/win32k/pch.h
index 8a39b1dba58..479f00a195e 100644
--- a/reactos/subsystems/win32/win32k/pch.h
+++ b/reactos/subsystems/win32/win32k/pch.h
@@ -70,10 +70,6 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
/* Undocumented stuff */
typedef DRIVEROBJ *PDRIVEROBJ;
-#ifndef M_PI
-#define M_PI 3.14159265358979323846f
-#define M_PI_2 1.57079632679489661923
-#endif
/* User heap */
extern HANDLE GlobalUserHeap;