diff --git a/aarch64/fenv.c b/aarch64/fenv.c
index 8a1ca57d..8ed85576 100644
--- a/aarch64/fenv.c
+++ b/aarch64/fenv.c
@@ -36,7 +36,7 @@
  * Hopefully the system ID byte is immutable, so it's valid to use
  * this as a default environment.
  */
-const fenv_t __fe_dfl_env = 0;
+const fenv_t __fe_dfl_env = {0};
 
 extern inline int feclearexcept(int __excepts);
 extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts);
diff --git a/include/openlibm_fenv_aarch64.h b/include/openlibm_fenv_aarch64.h
index c7cb712f..5cf0e49b 100644
--- a/include/openlibm_fenv_aarch64.h
+++ b/include/openlibm_fenv_aarch64.h
@@ -36,8 +36,8 @@
 #endif
 
 /* The high 32 bits contain fpcr, low 32 contain fpsr. */
-typedef	__uint64_t	fenv_t;
-typedef	__uint64_t	fexcept_t;
+typedef	uint64_t	fenv_t;
+typedef	uint64_t	fexcept_t;
 
 /* Exception flags */
 #define	FE_INVALID	0x00000001
@@ -158,8 +158,8 @@ fesetround(int __round)
 __fenv_static inline int
 fegetenv(fenv_t *__envp)
 {
-	__uint64_t fpcr;
-	__uint64_t fpsr;
+	uint64_t fpcr;
+	uint64_t fpsr;
 
 	__mrs_fpcr(fpcr);
 	__mrs_fpsr(fpsr);
@@ -179,7 +179,7 @@ feholdexcept(fenv_t *__envp)
 	__msr_fpcr(__r);
 
 	__mrs_fpsr(__r);
-	*__envp |= (__uint32_t)__r;
+	*__envp |= (uint32_t)__r;
 	__r &= ~(_ENABLE_MASK);
 	__msr_fpsr(__r);
 	return (0);
@@ -190,7 +190,7 @@ fesetenv(const fenv_t *__envp)
 {
 
 	__msr_fpcr((*__envp) >> 32);
-	__msr_fpsr((fenv_t)(__uint32_t)*__envp);
+	__msr_fpsr((fenv_t)(uint32_t)*__envp);
 	return (0);
 }