diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h
index f772949d85..d8d9cbe1c9 100644
--- a/include/f_pc/f_pc_manager.h
+++ b/include/f_pc/f_pc_manager.h
@@ -9,7 +9,11 @@
 #include "f_pc/f_pc_stdcreate_req.h"
 #include "f_pc/f_pc_searcher.h"
 
+#if TARGET_PC
+enum : u32 {
+#else
 enum {
+#endif
     fpcM_UNK_PROCESS_ID_e = 0xFFFFFFFE,
     fpcM_ERROR_PROCESS_ID_e = 0xFFFFFFFF,
 };
diff --git a/include/global.h b/include/global.h
index 94a2c9dc6e..36fb40dfb1 100644
--- a/include/global.h
+++ b/include/global.h
@@ -83,7 +83,11 @@ extern int __abs(int);
 void* __memcpy(void*, const void*, int);
 #endif
 
-#ifdef _MSVC_LANG
+#ifndef M_PI
+#define M_PI 3.14159265358979323846f
+#endif
+
+#if defined(_MSVC_LANG) && !defined(__clang__)
 inline int __builtin_clz(unsigned int v) {
     int count = 32;
     while (v != 0) {
@@ -94,7 +98,6 @@ inline int __builtin_clz(unsigned int v) {
 }
 
 #define COMPOUND_LITERAL(x)
-#define M_PI 3.14159265358979323846f
 #else
 
 #define COMPOUND_LITERAL(x) (x)
diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp
index 93bfd80296..493d788a52 100644
--- a/src/d/actor/d_a_alink.cpp
+++ b/src/d/actor/d_a_alink.cpp
@@ -1467,7 +1467,7 @@ static f32 l_ladderAnmBaseTransY = 102.00054168701172f;
 
 static dCcD_SrcCyl l_cylSrc = {
     {
-        {0, {{AT_TYPE_WOLF_ATTACK, 3, 0x1A}, {0xD8FFFDFF, 5}, 0x73}},
+        {0, {{(u32)AT_TYPE_WOLF_ATTACK, 3, 0x1A}, {0xD8FFFDFF, 5}, 0x73}},
         {dCcD_SE_WOLF_BITE, 3, 1, 0, {1}},
         {dCcD_SE_NONE, 6, 0, 0, {0}},
         {0},