diff --git a/sprout/algorithm/cxx14.hpp b/sprout/algorithm/cxx14.hpp
index 8a12fb0e..7fed3d41 100644
--- a/sprout/algorithm/cxx14.hpp
+++ b/sprout/algorithm/cxx14.hpp
@@ -62,7 +62,7 @@
 #include <sprout/algorithm/cxx14/copy_while.hpp>
 #include <sprout/algorithm/cxx14/copy_until.hpp>
 #include <sprout/algorithm/cxx14/clamp_range.hpp>
-#include <sprout/algorithm/fixed/random_swap.hpp>
+#include <sprout/algorithm/cxx14/random_swap.hpp>
 #include <sprout/algorithm/cxx14/bogo_sort.hpp>
 #include <sprout/algorithm/cxx14/bozo_sort.hpp>
 
diff --git a/sprout/numeric/dft/fixed/sinusoid.hpp b/sprout/numeric/dft/fixed/sinusoid.hpp
index 463d44d8..94ce2bf3 100644
--- a/sprout/numeric/dft/fixed/sinusoid.hpp
+++ b/sprout/numeric/dft/fixed/sinusoid.hpp
@@ -33,7 +33,6 @@ namespace sprout {
 				typename sprout::container_traits<Container>::size_type size
 				)
 			{
-				typedef typename sprout::container_traits<Container>::value_type value_type;
 				return sprout::remake<Container>(
 					cont, size,
 					(Indexes >= offset && Indexes < offset + size
@@ -51,7 +50,6 @@ namespace sprout {
 				typename sprout::container_traits<Container>::value_type const& phase
 				)
 			{
-				typedef typename sprout::container_traits<Container>::value_type value_type;
 				return sprout::fixed::detail::sinusoid_impl(
 					cont,
 					sprout::detail::sinusoid_value_d(frequency, sprout::size(cont)),
diff --git a/sprout/range/algorithm/cxx14/move_backward.hpp b/sprout/range/algorithm/cxx14/move_backward.hpp
index 91e321d7..21138bea 100644
--- a/sprout/range/algorithm/cxx14/move_backward.hpp
+++ b/sprout/range/algorithm/cxx14/move_backward.hpp
@@ -6,7 +6,7 @@
   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 #ifndef SPROUT_RANGE_ALGORITHM_CXX14_MOVE_BACKWARD_HPP
-#define SPROUT_RANGE_ALGORITHM_CXX14_COPY_BACKWARD_HPP
+#define SPROUT_RANGE_ALGORITHM_CXX14_MOVE_BACKWARD_HPP
 
 #include <sprout/config.hpp>
 #include <sprout/container/functions.hpp>
@@ -30,4 +30,4 @@ namespace sprout {
 	}	// namespace range
 }	// namespace sprout
 
-#endif	// #ifndef SPROUT_RANGE_ALGORITHM_CXX14_COPY_BACKWARD_HPP
+#endif	// #ifndef SPROUT_RANGE_ALGORITHM_CXX14_MOVE_BACKWARD_HPP