diff --git a/fx_s4716_longlong.h b/fx_s4716_longlong.h
index 02b8d5e0ea1e65c4ff35e41e5ef02824f025fbb0..339514299081d41dd4153bb5a6fed22be8f60bf5 100644
--- a/fx_s4716_longlong.h
+++ b/fx_s4716_longlong.h
@@ -1,9 +1,9 @@
-typedef long long fx_s4716;
-
-#define FX_S4716_LONGLONG_MUL1(a, b) (((a) * (b)) >> 16)
-#define FX_S4716_LONGLONG_MUL2(a, b) ((a >> 8) * (b >> 8))
-#define FX_S4716_LONGLONG_MUL3(a, b) (((a >> 4) * (b >> 4)) >> 8)
-
-#define FX_S4716_LONGLONG_DIV1(a, b) ((a << 16) / (b))
-#define FX_S4716_LONGLONG_DIV2(a, b) (((a << 8) / (b)) << 8)
-#define FX_S4716_LONGLONG_DIV3(a, b) (((a << 4) / (b >> 4)) << 8)
+typedef long long fx_s4716;
+
+#define FX_S4716_LONGLONG_MUL1(a, b) (((a) * (b)) >> 16)
+#define FX_S4716_LONGLONG_MUL2(a, b) ((a >> 8) * (b >> 8))
+#define FX_S4716_LONGLONG_MUL3(a, b) (((a >> 4) * (b >> 4)) >> 8)
+
+#define FX_S4716_LONGLONG_DIV1(a, b) ((a << 16) / (b))
+#define FX_S4716_LONGLONG_DIV2(a, b) (((a << 8) / (b)) << 8)
+#define FX_S4716_LONGLONG_DIV3(a, b) (((a << 12) / (b)) << 4)