diff --git a/softfloat/softfloat.h b/softfloat/softfloat.h
index 72daccb1..ce6c38ab 100644
--- a/softfloat/softfloat.h
+++ b/softfloat/softfloat.h
@@ -157,7 +157,6 @@ uint_fast64_t f16_to_ui64_r_minMag( float16_t, bool );
 int_fast32_t f16_to_i32_r_minMag( float16_t, bool );
 int_fast64_t f16_to_i64_r_minMag( float16_t, bool );
 float32_t f16_to_f32( float16_t );
-float32_t bf16_to_f32( bfloat16_t );
 float64_t f16_to_f64( float16_t );
 #ifdef SOFTFLOAT_FAST_INT64
 extFloat80_t f16_to_extF80( float16_t );
@@ -186,6 +185,11 @@ uint_fast16_t f16_classify( float16_t );
 float16_t f16_rsqrte7( float16_t );
 float16_t f16_recip7( float16_t );
 
+/*----------------------------------------------------------------------------
+| BFloat16 operations.
+*----------------------------------------------------------------------------*/
+float32_t bf16_to_f32( bfloat16_t );
+
 /*----------------------------------------------------------------------------
 | 32-bit (single-precision) floating-point operations.
 *----------------------------------------------------------------------------*/
@@ -199,8 +203,8 @@ uint_fast32_t f32_to_ui32_r_minMag( float32_t, bool );
 uint_fast64_t f32_to_ui64_r_minMag( float32_t, bool );
 int_fast32_t f32_to_i32_r_minMag( float32_t, bool );
 int_fast64_t f32_to_i64_r_minMag( float32_t, bool );
-float16_t f32_to_f16( float32_t );
 bfloat16_t f32_to_bf16( float32_t );
+float16_t f32_to_f16( float32_t );
 float64_t f32_to_f64( float32_t );
 #ifdef SOFTFLOAT_FAST_INT64
 extFloat80_t f32_to_extF80( float32_t );
diff --git a/softfloat/softfloat.mk.in b/softfloat/softfloat.mk.in
index 9c780ac7..1e8611a3 100644
--- a/softfloat/softfloat.mk.in
+++ b/softfloat/softfloat.mk.in
@@ -1,6 +1,7 @@
 softfloat_subproject_deps =
 
 softfloat_c_srcs = \
+	bf16_to_f32.c \
 	f128_add.c \
 	f128_classify.c \
 	f128_div.c \
@@ -45,7 +46,6 @@ softfloat_c_srcs = \
 	f16_sqrt.c \
 	f16_sub.c \
 	f16_to_f128.c \
-	bf16_to_f32.c \
 	f16_to_f32.c \
 	f16_to_f64.c \
 	f16_to_i8.c \
@@ -76,8 +76,8 @@ softfloat_c_srcs = \
 	f32_roundToInt.c \
 	f32_sqrt.c \
 	f32_sub.c \
-	f32_to_f128.c \
 	f32_to_bf16.c \
+	f32_to_f128.c \
 	f32_to_f16.c \
 	f32_to_f64.c \
 	f32_to_i16.c \