diff --git a/legacy/eina/src/include/eina_inline_f16p16.x b/legacy/eina/src/include/eina_inline_f16p16.x
index f7420ba1ad..e16d188dce 100644
--- a/legacy/eina/src/include/eina_inline_f16p16.x
+++ b/legacy/eina/src/include/eina_inline_f16p16.x
@@ -35,7 +35,7 @@ eina_f16p16_sub(Eina_F16p16 a, Eina_F16p16 b)
 static inline Eina_F16p16
 eina_f16p16_mul(Eina_F16p16 a, Eina_F16p16 b)
 {
-   return ((int64_t)a * (int64_t)b) >> 16;
+   return (Eina_F16p16)(((int64_t)a * (int64_t)b) >> 16);
 }
 
 static inline Eina_F16p16
diff --git a/legacy/eina/src/include/eina_inline_f8p24.x b/legacy/eina/src/include/eina_inline_f8p24.x
index ded0e3b9dc..f80bf6149c 100644
--- a/legacy/eina/src/include/eina_inline_f8p24.x
+++ b/legacy/eina/src/include/eina_inline_f8p24.x
@@ -35,7 +35,7 @@ eina_f8p24_sub(Eina_F8p24 a, Eina_F8p24 b)
 static inline Eina_F8p24
 eina_f8p24_mul(Eina_F8p24 a, Eina_F8p24 b)
 {
-   return ((int64_t) a * (int64_t) b) >> 24;
+   return (Eina_F8p24)(((int64_t) a * (int64_t) b) >> 24);
 }
 
 static inline Eina_F8p24
diff --git a/legacy/eina/src/include/eina_inline_fp.x b/legacy/eina/src/include/eina_inline_fp.x
index ac0a52ab61..b767b2b4f9 100644
--- a/legacy/eina/src/include/eina_inline_fp.x
+++ b/legacy/eina/src/include/eina_inline_fp.x
@@ -29,7 +29,7 @@ eina_f32p32_int_from(int32_t v)
 static inline int32_t
 eina_f32p32_int_to(Eina_F32p32 v)
 {
-   return v >> 32;
+   return (int32_t)(v >> 32);
 }
 
 static inline Eina_F32p32