diff --git a/sprout/cmath.hpp b/sprout/cmath.hpp
index eeaf2814..11a04603 100644
--- a/sprout/cmath.hpp
+++ b/sprout/cmath.hpp
@@ -6,9 +6,10 @@
 #include <sprout/math/trigonometric.hpp>
 #include <sprout/math/hyperbolic.hpp>
 #include <sprout/math/exponential.hpp>
-#include <sprout/math/floating_point.hpp>
 #include <sprout/math/power.hpp>
-#include <sprout/math/operations.hpp>
 #include <sprout/math/nearest.hpp>
+#include <sprout/math/remainders.hpp>
+#include <sprout/math/minmax.hpp>
+#include <sprout/math/muladd.hpp>
 
 #endif	// #ifndef SPROUT_CMATH_HPP
diff --git a/sprout/math/exponential.hpp b/sprout/math/exponential.hpp
index 95602a4f..40628bd1 100644
--- a/sprout/math/exponential.hpp
+++ b/sprout/math/exponential.hpp
@@ -10,5 +10,7 @@
 #include <sprout/math/log10.hpp>
 #include <sprout/math/log2.hpp>
 #include <sprout/math/log1p.hpp>
+#include <sprout/math/log1p.hpp>
+#include <sprout/math/floating_point.hpp>
 
 #endif	// #ifndef SPROUT_MATH_EXPONENTIAL_HPP
diff --git a/sprout/math/functions.hpp b/sprout/math/functions.hpp
index e73c3cdd..011cbfca 100644
--- a/sprout/math/functions.hpp
+++ b/sprout/math/functions.hpp
@@ -6,10 +6,11 @@
 #include <sprout/math/trigonometric.hpp>
 #include <sprout/math/hyperbolic.hpp>
 #include <sprout/math/exponential.hpp>
-#include <sprout/math/floating_point.hpp>
 #include <sprout/math/power.hpp>
-#include <sprout/math/operations.hpp>
 #include <sprout/math/nearest.hpp>
+#include <sprout/math/remainders.hpp>
+#include <sprout/math/minmax.hpp>
+#include <sprout/math/muladd.hpp>
 #include <sprout/math/common_factor.hpp>
 #include <sprout/math/factorial.hpp>
 #include <sprout/math/bernoulli.hpp>
diff --git a/sprout/math/minmax.hpp b/sprout/math/minmax.hpp
new file mode 100644
index 00000000..a86929bd
--- /dev/null
+++ b/sprout/math/minmax.hpp
@@ -0,0 +1,9 @@
+#ifndef SPROUT_MATH_MINMAX_HPP
+#define SPROUT_MATH_MINMAX_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/math/fmax.hpp>
+#include <sprout/math/fmin.hpp>
+#include <sprout/math/fdim.hpp>
+
+#endif	// #ifndef SPROUT_MATH_MINMAX_HPP
diff --git a/sprout/math/muladd.hpp b/sprout/math/muladd.hpp
new file mode 100644
index 00000000..e1a80d0c
--- /dev/null
+++ b/sprout/math/muladd.hpp
@@ -0,0 +1,7 @@
+#ifndef SPROUT_MATH_MULADD_HPP
+#define SPROUT_MATH_MULADD_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/math/fma.hpp>
+
+#endif	// #ifndef SPROUT_MATH_MULADD_HPP
diff --git a/sprout/math/operations.hpp b/sprout/math/operations.hpp
deleted file mode 100644
index 085233ac..00000000
--- a/sprout/math/operations.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef SPROUT_MATH_OPERATIONS_HPP
-#define SPROUT_MATH_OPERATIONS_HPP
-
-#include <sprout/config.hpp>
-#include <sprout/math/abs.hpp>
-#include <sprout/math/fabs.hpp>
-#include <sprout/math/fma.hpp>
-#include <sprout/math/fmax.hpp>
-#include <sprout/math/fmin.hpp>
-#include <sprout/math/fdim.hpp>
-#include <sprout/math/fmod.hpp>
-#include <sprout/math/reminder.hpp>
-#include <sprout/math/quotient.hpp>
-#include <sprout/math/rem_quo.hpp>
-
-#endif	// #ifndef SPROUT_MATH_OPERATIONS_HPP
diff --git a/sprout/math/power.hpp b/sprout/math/power.hpp
index 21219308..dfe9854d 100644
--- a/sprout/math/power.hpp
+++ b/sprout/math/power.hpp
@@ -7,5 +7,7 @@
 #include <sprout/math/pow.hpp>
 #include <sprout/math/log_a.hpp>
 #include <sprout/math/hypot.hpp>
+#include <sprout/math/abs.hpp>
+#include <sprout/math/fabs.hpp>
 
 #endif	// #ifndef SPROUT_MATH_POWER_HPP
diff --git a/sprout/math/reminder.hpp b/sprout/math/remainder.hpp
similarity index 100%
rename from sprout/math/reminder.hpp
rename to sprout/math/remainder.hpp
diff --git a/sprout/math/remainders.hpp b/sprout/math/remainders.hpp
new file mode 100644
index 00000000..33501f54
--- /dev/null
+++ b/sprout/math/remainders.hpp
@@ -0,0 +1,10 @@
+#ifndef SPROUT_MATH_REMAINDERS_HPP
+#define SPROUT_MATH_REMAINDERS_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/math/fmod.hpp>
+#include <sprout/math/remainder.hpp>
+#include <sprout/math/quotient.hpp>
+#include <sprout/math/rem_quo.hpp>
+
+#endif	// #ifndef SPROUT_MATH_REMAINDERS_HPP