diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28573fea24..5641c5b437 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,7 @@ if (DEBUG)
           ${LIBDL_INCLUDE_DIRS})
       set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${LIBBFD_LIBRARIES}
           ${LIBDL_LIBRARIES})
-      add_definitions(-DHAS_BFD_DL)
+      add_definitions(-DMLPACK_HAS_BFD_DL)
     else()
       message(WARNING "No libBFD and/or libDL has been found!")
     endif()
diff --git a/src/mlpack/CMakeLists.txt b/src/mlpack/CMakeLists.txt
index 840bd4f194..58fa1530c1 100644
--- a/src/mlpack/CMakeLists.txt
+++ b/src/mlpack/CMakeLists.txt
@@ -14,9 +14,9 @@ install(FILES
     "${CMAKE_CURRENT_SOURCE_DIR}/prereqs.hpp"
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mlpack/")
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/core" DESTINATION
-    "${CMAKE_INSTALL_INCLUDEDIR}/mlpack/core")
+    "${CMAKE_INSTALL_INCLUDEDIR}/mlpack")
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/methods" DESTINATION
-    "${CMAKE_INSTALL_INCLUDEDIR}/mlpack/methods")
+    "${CMAKE_INSTALL_INCLUDEDIR}/mlpack")
 
 # Extract the version number.
 file(READ "${CMAKE_CURRENT_SOURCE_DIR}/core/util/version.hpp"
diff --git a/src/mlpack/bindings/R/tests/test_r_binding_main.cpp b/src/mlpack/bindings/R/tests/test_r_binding_main.cpp
index 4bf0643da6..ff5bd0805a 100644
--- a/src/mlpack/bindings/R/tests/test_r_binding_main.cpp
+++ b/src/mlpack/bindings/R/tests/test_r_binding_main.cpp
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME test_R_binding
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/bindings/go/tests/test_go_binding_main.cpp b/src/mlpack/bindings/go/tests/test_go_binding_main.cpp
index 270a863d5f..53f11fc93f 100644
--- a/src/mlpack/bindings/go/tests/test_go_binding_main.cpp
+++ b/src/mlpack/bindings/go/tests/test_go_binding_main.cpp
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME test_go_binding
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/bindings/julia/tests/test_julia_binding_main.cpp b/src/mlpack/bindings/julia/tests/test_julia_binding_main.cpp
index 3c674dcd42..853191e578 100644
--- a/src/mlpack/bindings/julia/tests/test_julia_binding_main.cpp
+++ b/src/mlpack/bindings/julia/tests/test_julia_binding_main.cpp
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME test_julia_binding
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/bindings/python/CMakeLists.txt b/src/mlpack/bindings/python/CMakeLists.txt
index a14477b7b1..c122181d78 100644
--- a/src/mlpack/bindings/python/CMakeLists.txt
+++ b/src/mlpack/bindings/python/CMakeLists.txt
@@ -157,9 +157,10 @@ get_property(CYTHON_INCLUDE_DIRECTORIES DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 set (CYTHON_INCLDIRS "${CYTHON_INCLUDE_DIRECTORIES}")
 
 # By default, Python appears to compile with -DNDEBUG, but if we are in debug
-# mode we don't want that.  We also want to disable HAS_BFD_DL if it is set.
+# mode we don't want that.  We also want to disable MLPACK_HAS_BFD_DL if it is
+# set.
 if (DEBUG)
-  set(DISABLE_CFLAGS "NDEBUG;HAS_BFD_DL" PARENT_SCOPE)
+  set(DISABLE_CFLAGS "NDEBUG;MLPACK_HAS_BFD_DL" PARENT_SCOPE)
 endif ()
 
 add_custom_target(python ALL DEPENDS mlpack)
diff --git a/src/mlpack/bindings/python/tests/test_python_binding_main.cpp b/src/mlpack/bindings/python/tests/test_python_binding_main.cpp
index ce14d78428..3384238eff 100644
--- a/src/mlpack/bindings/python/tests/test_python_binding_main.cpp
+++ b/src/mlpack/bindings/python/tests/test_python_binding_main.cpp
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME test_python_binding
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/core.hpp b/src/mlpack/core.hpp
index 1bed82c1eb..39749ec824 100644
--- a/src/mlpack/core.hpp
+++ b/src/mlpack/core.hpp
@@ -75,7 +75,7 @@
 #include <mlpack/core/math/math.hpp>
 
 // mlpack::backtrace only for linux
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
   #include <mlpack/core/util/backtrace.hpp>
 #endif
 
diff --git a/src/mlpack/core/util/backtrace.hpp b/src/mlpack/core/util/backtrace.hpp
index ed58a839b7..613b697c57 100644
--- a/src/mlpack/core/util/backtrace.hpp
+++ b/src/mlpack/core/util/backtrace.hpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
   #include <execinfo.h>
   #include <signal.h>
   #include <unistd.h>
@@ -77,7 +77,7 @@ namespace mlpack {
 class Backtrace
 {
  public:
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
   /**
    * Constructor initialize fields and call GetAddress to retrieve addresses
    * for each frame of backtrace.
@@ -126,7 +126,7 @@ class Backtrace
   Frames frame;
   std::vector<Frames> stack;
 
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
   // Binary File Descriptor objects.
   bfd* abfd;          // Descriptor datastructure.
   asymbol **syms;     // Symbols datastructure.
diff --git a/src/mlpack/core/util/backtrace_impl.hpp b/src/mlpack/core/util/backtrace_impl.hpp
index a3eea2bf7f..ca1fe15785 100644
--- a/src/mlpack/core/util/backtrace_impl.hpp
+++ b/src/mlpack/core/util/backtrace_impl.hpp
@@ -16,7 +16,7 @@
 
 namespace mlpack {
 
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
 inline Backtrace::Backtrace(int maxDepth)
 {
   frame.address = NULL;
@@ -39,7 +39,7 @@ inline Backtrace::Backtrace()
 }
 #endif
 
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
 inline void Backtrace::GetAddress(int maxDepth)
 {
   void* trace[maxDepth];
@@ -131,7 +131,7 @@ inline std::string Backtrace::ToString()
 {
   std::string stackStr;
 
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
   std::ostringstream lineOss;
   std::ostringstream it;
 
diff --git a/src/mlpack/core/util/log_impl.hpp b/src/mlpack/core/util/log_impl.hpp
index e55e7f7d8c..a0b176f800 100644
--- a/src/mlpack/core/util/log_impl.hpp
+++ b/src/mlpack/core/util/log_impl.hpp
@@ -14,7 +14,7 @@
 
 #include "log.hpp"
 
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
   #include "backtrace.hpp"
 #endif
 
@@ -26,7 +26,7 @@ inline void Log::Assert(bool condition, const std::string& message)
 {
   if (!condition)
   {
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
     Backtrace bt;
 
     Log::Debug << bt.ToString();
diff --git a/src/mlpack/core/util/prefixedoutstream.hpp b/src/mlpack/core/util/prefixedoutstream.hpp
index fddf90439f..bca5639444 100644
--- a/src/mlpack/core/util/prefixedoutstream.hpp
+++ b/src/mlpack/core/util/prefixedoutstream.hpp
@@ -55,7 +55,7 @@ class PrefixedOutStream
    * @param fatal If true, a std::runtime_error exception is thrown after
    *     printing a newline.
    * @param backtrace If true, attempt to print a backtrace (will only be
-   *     done if HAS_BFD_DL is defined).
+   *     done if MLPACK_HAS_BFD_DL is defined).
    */
   PrefixedOutStream(std::ostream& destination,
                     const char* prefix,
@@ -118,8 +118,8 @@ class PrefixedOutStream
   //! Discards input, prints nothing if true.
   bool ignoreInput;
 
-  //! If true, on a fatal error, a backtrace will be printed if HAS_BFD_DL is
-  //! defined.
+  //! If true, on a fatal error, a backtrace will be printed if
+  //! MLPACK_HAS_BFD_DL is ! defined.
   bool backtrace;
 
  private:
diff --git a/src/mlpack/core/util/prefixedoutstream_impl.hpp b/src/mlpack/core/util/prefixedoutstream_impl.hpp
index bce0b0f4cd..015d39bfeb 100644
--- a/src/mlpack/core/util/prefixedoutstream_impl.hpp
+++ b/src/mlpack/core/util/prefixedoutstream_impl.hpp
@@ -16,7 +16,7 @@
 // Just in case it hasn't been included.
 #include "prefixedoutstream.hpp"
 
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
   #include "backtrace.hpp"
 #endif
 
@@ -222,7 +222,7 @@ PrefixedOutStream::BaseLogic(const T& val)
       destination << std::endl;
 
     // Print a backtrace, if we can.
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
     if (fatal && !ignoreInput && backtrace)
     {
       size_t nl;
@@ -354,7 +354,7 @@ PrefixedOutStream::BaseLogic(const T& val)
       destination << std::endl;
 
     // Print a backtrace, if we can.
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
     if (fatal && !ignoreInput)
     {
       size_t nl;
diff --git a/src/mlpack/methods/adaboost.hpp b/src/mlpack/methods/adaboost.hpp
new file mode 100644
index 0000000000..7313f7916f
--- /dev/null
+++ b/src/mlpack/methods/adaboost.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file adaboost.hpp
+ *
+ * Convenience include for mlpack/methods/adaboost/adaboost.hpp
+ */
+#ifndef MLPACK_ADABOOST_HPP
+#define MLPACK_ADABOOST_HPP
+
+#include "adaboost/adaboost.hpp"
+
+#endif
diff --git a/src/mlpack/methods/adaboost/adaboost_classify_main.cpp b/src/mlpack/methods/adaboost/adaboost_classify_main.cpp
index c3458dd35e..d8d29cce80 100644
--- a/src/mlpack/methods/adaboost/adaboost_classify_main.cpp
+++ b/src/mlpack/methods/adaboost/adaboost_classify_main.cpp
@@ -33,9 +33,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME adaboost_classify
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/adaboost/adaboost_main.cpp b/src/mlpack/methods/adaboost/adaboost_main.cpp
index 54df0b644e..f88d0ce103 100644
--- a/src/mlpack/methods/adaboost/adaboost_main.cpp
+++ b/src/mlpack/methods/adaboost/adaboost_main.cpp
@@ -33,9 +33,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME adaboost
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/adaboost/adaboost_probabilities_main.cpp b/src/mlpack/methods/adaboost/adaboost_probabilities_main.cpp
index 5873880b66..6bec53c74b 100644
--- a/src/mlpack/methods/adaboost/adaboost_probabilities_main.cpp
+++ b/src/mlpack/methods/adaboost/adaboost_probabilities_main.cpp
@@ -33,9 +33,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME adaboost_probabilities
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/adaboost/adaboost_train_main.cpp b/src/mlpack/methods/adaboost/adaboost_train_main.cpp
index 1d3155ee5e..5975be7b7e 100644
--- a/src/mlpack/methods/adaboost/adaboost_train_main.cpp
+++ b/src/mlpack/methods/adaboost/adaboost_train_main.cpp
@@ -34,9 +34,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME adaboost_train
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/amf.hpp b/src/mlpack/methods/amf.hpp
new file mode 100644
index 0000000000..5eca6d6702
--- /dev/null
+++ b/src/mlpack/methods/amf.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file amf.hpp
+ *
+ * Convenience include for mlpack/methods/amf/amf.hpp
+ */
+#ifndef MLPACK_AMF_HPP
+#define MLPACK_AMF_HPP
+
+#include "amf/amf.hpp"
+
+#endif
diff --git a/src/mlpack/methods/ann.hpp b/src/mlpack/methods/ann.hpp
new file mode 100644
index 0000000000..4ae2acd4bb
--- /dev/null
+++ b/src/mlpack/methods/ann.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file ann.hpp
+ *
+ * Convenience include for mlpack/methods/ann/ann.hpp
+ */
+#ifndef MLPACK_ANN_HPP
+#define MLPACK_ANN_HPP
+
+#include "ann/ann.hpp"
+
+#endif
diff --git a/src/mlpack/methods/approx_kfn.hpp b/src/mlpack/methods/approx_kfn.hpp
new file mode 100644
index 0000000000..7e3750ab47
--- /dev/null
+++ b/src/mlpack/methods/approx_kfn.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file approx_kfn.hpp
+ *
+ * Convenience include for mlpack/methods/approx_kfn/approx_kfn.hpp
+ */
+#ifndef MLPACK_APPROX_KFN_HPP
+#define MLPACK_APPROX_KFN_HPP
+
+#include "approx_kfn/approx_kfn.hpp"
+
+#endif
diff --git a/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp b/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp
index 48b7e80713..4f0897a9ad 100644
--- a/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp
+++ b/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME approx_kfn
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/bayesian_linear_regression.hpp b/src/mlpack/methods/bayesian_linear_regression.hpp
new file mode 100644
index 0000000000..5433c4b74f
--- /dev/null
+++ b/src/mlpack/methods/bayesian_linear_regression.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file bayesian_linear_regression.hpp
+ *
+ * Convenience include for mlpack/methods/bayesian_linear_regression/bayesian_linear_regression.hpp
+ */
+#ifndef MLPACK_BAYESIAN_LINEAR_REGRESSION_HPP
+#define MLPACK_BAYESIAN_LINEAR_REGRESSION_HPP
+
+#include "bayesian_linear_regression/bayesian_linear_regression.hpp"
+
+#endif
diff --git a/src/mlpack/methods/bayesian_linear_regression/bayesian_linear_regression_main.cpp b/src/mlpack/methods/bayesian_linear_regression/bayesian_linear_regression_main.cpp
index 94c780324f..7cb0657ce4 100644
--- a/src/mlpack/methods/bayesian_linear_regression/bayesian_linear_regression_main.cpp
+++ b/src/mlpack/methods/bayesian_linear_regression/bayesian_linear_regression_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME bayesian_linear_regression
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/bias_svd.hpp b/src/mlpack/methods/bias_svd.hpp
new file mode 100644
index 0000000000..a370da4f15
--- /dev/null
+++ b/src/mlpack/methods/bias_svd.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file bias_svd.hpp
+ *
+ * Convenience include for mlpack/methods/bias_svd/bias_svd.hpp
+ */
+#ifndef MLPACK_BIAS_SVD_HPP
+#define MLPACK_BIAS_SVD_HPP
+
+#include "bias_svd/bias_svd.hpp"
+
+#endif
diff --git a/src/mlpack/methods/block_krylov_svd.hpp b/src/mlpack/methods/block_krylov_svd.hpp
new file mode 100644
index 0000000000..38e7c776ec
--- /dev/null
+++ b/src/mlpack/methods/block_krylov_svd.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file block_krylov_svd.hpp
+ *
+ * Convenience include for mlpack/methods/block_krylov_svd/block_krylov_svd.hpp
+ */
+#ifndef MLPACK_BLOCK_KRYLOV_SVD_HPP
+#define MLPACK_BLOCK_KRYLOV_SVD_HPP
+
+#include "block_krylov_svd/block_krylov_svd.hpp"
+
+#endif
diff --git a/src/mlpack/methods/cf.hpp b/src/mlpack/methods/cf.hpp
new file mode 100644
index 0000000000..df92b8de28
--- /dev/null
+++ b/src/mlpack/methods/cf.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file cf.hpp
+ *
+ * Convenience include for mlpack/methods/cf/cf.hpp
+ */
+#ifndef MLPACK_CF_HPP
+#define MLPACK_CF_HPP
+
+#include "cf/cf.hpp"
+
+#endif
diff --git a/src/mlpack/methods/cf/cf_main.cpp b/src/mlpack/methods/cf/cf_main.cpp
index 41b44a9a06..35f4a59d0f 100644
--- a/src/mlpack/methods/cf/cf_main.cpp
+++ b/src/mlpack/methods/cf/cf_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME cf
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/dbscan.hpp b/src/mlpack/methods/dbscan.hpp
new file mode 100644
index 0000000000..5607203747
--- /dev/null
+++ b/src/mlpack/methods/dbscan.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file dbscan.hpp
+ *
+ * Convenience include for mlpack/methods/dbscan/dbscan.hpp
+ */
+#ifndef MLPACK_DBSCAN_HPP
+#define MLPACK_DBSCAN_HPP
+
+#include "dbscan/dbscan.hpp"
+
+#endif
diff --git a/src/mlpack/methods/dbscan/dbscan_main.cpp b/src/mlpack/methods/dbscan/dbscan_main.cpp
index 544d334abb..beb650fbb6 100644
--- a/src/mlpack/methods/dbscan/dbscan_main.cpp
+++ b/src/mlpack/methods/dbscan/dbscan_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME dbscan
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/decision_tree.hpp b/src/mlpack/methods/decision_tree.hpp
new file mode 100644
index 0000000000..549e11ec21
--- /dev/null
+++ b/src/mlpack/methods/decision_tree.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file decision_tree.hpp
+ *
+ * Convenience include for mlpack/methods/decision_tree/decision_tree.hpp
+ */
+#ifndef MLPACK_DECISION_TREE_HPP
+#define MLPACK_DECISION_TREE_HPP
+
+#include "decision_tree/decision_tree.hpp"
+
+#endif
diff --git a/src/mlpack/methods/decision_tree/decision_tree_main.cpp b/src/mlpack/methods/decision_tree/decision_tree_main.cpp
index 8333247e35..2fd35dd67b 100644
--- a/src/mlpack/methods/decision_tree/decision_tree_main.cpp
+++ b/src/mlpack/methods/decision_tree/decision_tree_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME decision_tree
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/det.hpp b/src/mlpack/methods/det.hpp
new file mode 100644
index 0000000000..bf4ead4c39
--- /dev/null
+++ b/src/mlpack/methods/det.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file det.hpp
+ *
+ * Convenience include for mlpack/methods/det/det.hpp
+ */
+#ifndef MLPACK_DET_HPP
+#define MLPACK_DET_HPP
+
+#include "det/det.hpp"
+
+#endif
diff --git a/src/mlpack/methods/det/det_main.cpp b/src/mlpack/methods/det/det_main.cpp
index d5c1cd8f15..b63925832b 100644
--- a/src/mlpack/methods/det/det_main.cpp
+++ b/src/mlpack/methods/det/det_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME det
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/emst.hpp b/src/mlpack/methods/emst.hpp
new file mode 100644
index 0000000000..503c815e47
--- /dev/null
+++ b/src/mlpack/methods/emst.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file emst.hpp
+ *
+ * Convenience include for mlpack/methods/emst/emst.hpp
+ */
+#ifndef MLPACK_EMST_HPP
+#define MLPACK_EMST_HPP
+
+#include "emst/emst.hpp"
+
+#endif
diff --git a/src/mlpack/methods/emst/emst_main.cpp b/src/mlpack/methods/emst/emst_main.cpp
index b440181d32..61992817f8 100644
--- a/src/mlpack/methods/emst/emst_main.cpp
+++ b/src/mlpack/methods/emst/emst_main.cpp
@@ -26,9 +26,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME emst
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/fastmks.hpp b/src/mlpack/methods/fastmks.hpp
new file mode 100644
index 0000000000..131c702c5d
--- /dev/null
+++ b/src/mlpack/methods/fastmks.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file fastmks.hpp
+ *
+ * Convenience include for mlpack/methods/fastmks/fastmks.hpp
+ */
+#ifndef MLPACK_FASTMKS_HPP
+#define MLPACK_FASTMKS_HPP
+
+#include "fastmks/fastmks.hpp"
+
+#endif
diff --git a/src/mlpack/methods/fastmks/fastmks_main.cpp b/src/mlpack/methods/fastmks/fastmks_main.cpp
index f1e2122be1..862123b789 100644
--- a/src/mlpack/methods/fastmks/fastmks_main.cpp
+++ b/src/mlpack/methods/fastmks/fastmks_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME fastmks
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/gmm.hpp b/src/mlpack/methods/gmm.hpp
new file mode 100644
index 0000000000..fbe0667632
--- /dev/null
+++ b/src/mlpack/methods/gmm.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file gmm.hpp
+ *
+ * Convenience include for mlpack/methods/gmm/gmm.hpp
+ */
+#ifndef MLPACK_GMM_HPP
+#define MLPACK_GMM_HPP
+
+#include "gmm/gmm.hpp"
+
+#endif
diff --git a/src/mlpack/methods/gmm/gmm_generate_main.cpp b/src/mlpack/methods/gmm/gmm_generate_main.cpp
index 61b774b7bb..0df2117cc1 100644
--- a/src/mlpack/methods/gmm/gmm_generate_main.cpp
+++ b/src/mlpack/methods/gmm/gmm_generate_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME gmm_generate
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/gmm/gmm_probability_main.cpp b/src/mlpack/methods/gmm/gmm_probability_main.cpp
index 347a4ee0b1..77eaf93c4d 100644
--- a/src/mlpack/methods/gmm/gmm_probability_main.cpp
+++ b/src/mlpack/methods/gmm/gmm_probability_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME gmm_probability
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/gmm/gmm_train_main.cpp b/src/mlpack/methods/gmm/gmm_train_main.cpp
index 9d8da8639c..23b6b088f4 100644
--- a/src/mlpack/methods/gmm/gmm_train_main.cpp
+++ b/src/mlpack/methods/gmm/gmm_train_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME gmm_train
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/hmm.hpp b/src/mlpack/methods/hmm.hpp
new file mode 100644
index 0000000000..cb92cde7d1
--- /dev/null
+++ b/src/mlpack/methods/hmm.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file hmm.hpp
+ *
+ * Convenience include for mlpack/methods/hmm/hmm.hpp
+ */
+#ifndef MLPACK_HMM_HPP
+#define MLPACK_HMM_HPP
+
+#include "hmm/hmm.hpp"
+
+#endif
diff --git a/src/mlpack/methods/hmm/hmm_generate_main.cpp b/src/mlpack/methods/hmm/hmm_generate_main.cpp
index ccea373cf6..01e2f92435 100644
--- a/src/mlpack/methods/hmm/hmm_generate_main.cpp
+++ b/src/mlpack/methods/hmm/hmm_generate_main.cpp
@@ -13,9 +13,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME hmm_generate
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/hmm/hmm_loglik_main.cpp b/src/mlpack/methods/hmm/hmm_loglik_main.cpp
index 1fc41aaef3..147063e867 100644
--- a/src/mlpack/methods/hmm/hmm_loglik_main.cpp
+++ b/src/mlpack/methods/hmm/hmm_loglik_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME hmm_loglik
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/hmm/hmm_train_main.cpp b/src/mlpack/methods/hmm/hmm_train_main.cpp
index a65d2c1f07..ff358d3be2 100644
--- a/src/mlpack/methods/hmm/hmm_train_main.cpp
+++ b/src/mlpack/methods/hmm/hmm_train_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME hmm_train
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/hmm/hmm_viterbi_main.cpp b/src/mlpack/methods/hmm/hmm_viterbi_main.cpp
index 6a99ab2e3b..32900d3c47 100644
--- a/src/mlpack/methods/hmm/hmm_viterbi_main.cpp
+++ b/src/mlpack/methods/hmm/hmm_viterbi_main.cpp
@@ -12,9 +12,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME hmm_viterbi
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/hoeffding_trees.hpp b/src/mlpack/methods/hoeffding_trees.hpp
new file mode 100644
index 0000000000..5355f8ce28
--- /dev/null
+++ b/src/mlpack/methods/hoeffding_trees.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file hoeffding_trees.hpp
+ *
+ * Convenience include for mlpack/methods/hoeffding_trees/hoeffding_trees.hpp
+ */
+#ifndef MLPACK_HOEFFDING_TREES_HPP
+#define MLPACK_HOEFFDING_TREES_HPP
+
+#include "hoeffding_trees/hoeffding_trees.hpp"
+
+#endif
diff --git a/src/mlpack/methods/hoeffding_trees/hoeffding_tree_main.cpp b/src/mlpack/methods/hoeffding_trees/hoeffding_tree_main.cpp
index e60f6c36e6..50a229eb7f 100644
--- a/src/mlpack/methods/hoeffding_trees/hoeffding_tree_main.cpp
+++ b/src/mlpack/methods/hoeffding_trees/hoeffding_tree_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME hoeffding_tree
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/kde.hpp b/src/mlpack/methods/kde.hpp
new file mode 100644
index 0000000000..90b222f464
--- /dev/null
+++ b/src/mlpack/methods/kde.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file kde.hpp
+ *
+ * Convenience include for mlpack/methods/kde/kde.hpp
+ */
+#ifndef MLPACK_KDE_HPP
+#define MLPACK_KDE_HPP
+
+#include "kde/kde.hpp"
+
+#endif
diff --git a/src/mlpack/methods/kde/kde_main.cpp b/src/mlpack/methods/kde/kde_main.cpp
index 62f6436724..55b946b0df 100644
--- a/src/mlpack/methods/kde/kde_main.cpp
+++ b/src/mlpack/methods/kde/kde_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME kde
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/kernel_pca.hpp b/src/mlpack/methods/kernel_pca.hpp
new file mode 100644
index 0000000000..f2acd1d721
--- /dev/null
+++ b/src/mlpack/methods/kernel_pca.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file kernel_pca.hpp
+ *
+ * Convenience include for mlpack/methods/kernel_pca/kernel_pca.hpp
+ */
+#ifndef MLPACK_KERNEL_PCA_HPP
+#define MLPACK_KERNEL_PCA_HPP
+
+#include "kernel_pca/kernel_pca.hpp"
+
+#endif
diff --git a/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp b/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp
index ef3af4ad0d..07f2669b6c 100644
--- a/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp
+++ b/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME kernel_pca
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/kmeans.hpp b/src/mlpack/methods/kmeans.hpp
new file mode 100644
index 0000000000..996e879829
--- /dev/null
+++ b/src/mlpack/methods/kmeans.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file kmeans.hpp
+ *
+ * Convenience include for mlpack/methods/kmeans/kmeans.hpp
+ */
+#ifndef MLPACK_KMEANS_HPP
+#define MLPACK_KMEANS_HPP
+
+#include "kmeans/kmeans.hpp"
+
+#endif
diff --git a/src/mlpack/methods/kmeans/kmeans_main.cpp b/src/mlpack/methods/kmeans/kmeans_main.cpp
index 897ba57062..99c43e0168 100644
--- a/src/mlpack/methods/kmeans/kmeans_main.cpp
+++ b/src/mlpack/methods/kmeans/kmeans_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME kmeans
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/lars.hpp b/src/mlpack/methods/lars.hpp
new file mode 100644
index 0000000000..dd8b8cd476
--- /dev/null
+++ b/src/mlpack/methods/lars.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file lars.hpp
+ *
+ * Convenience include for mlpack/methods/lars/lars.hpp
+ */
+#ifndef MLPACK_LARS_HPP
+#define MLPACK_LARS_HPP
+
+#include "lars/lars.hpp"
+
+#endif
diff --git a/src/mlpack/methods/lars/lars_main.cpp b/src/mlpack/methods/lars/lars_main.cpp
index e6fd184019..6fd22cb173 100644
--- a/src/mlpack/methods/lars/lars_main.cpp
+++ b/src/mlpack/methods/lars/lars_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME lars
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/linear_regression.hpp b/src/mlpack/methods/linear_regression.hpp
new file mode 100644
index 0000000000..2ea035c7fc
--- /dev/null
+++ b/src/mlpack/methods/linear_regression.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file linear_regression.hpp
+ *
+ * Convenience include for mlpack/methods/linear_regression/linear_regression.hpp
+ */
+#ifndef MLPACK_LINEAR_REGRESSION_HPP
+#define MLPACK_LINEAR_REGRESSION_HPP
+
+#include "linear_regression/linear_regression.hpp"
+
+#endif
diff --git a/src/mlpack/methods/linear_regression/linear_regression_main.cpp b/src/mlpack/methods/linear_regression/linear_regression_main.cpp
index 91f3368bc6..7399e5770c 100644
--- a/src/mlpack/methods/linear_regression/linear_regression_main.cpp
+++ b/src/mlpack/methods/linear_regression/linear_regression_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME linear_regression
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/linear_regression/linear_regression_predict_main.cpp b/src/mlpack/methods/linear_regression/linear_regression_predict_main.cpp
index e1cd09d21e..d97d1c6305 100644
--- a/src/mlpack/methods/linear_regression/linear_regression_predict_main.cpp
+++ b/src/mlpack/methods/linear_regression/linear_regression_predict_main.cpp
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME linear_regression_predict
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/linear_regression/linear_regression_train_main.cpp b/src/mlpack/methods/linear_regression/linear_regression_train_main.cpp
index 0fe6dddca8..82ca85b3f4 100644
--- a/src/mlpack/methods/linear_regression/linear_regression_train_main.cpp
+++ b/src/mlpack/methods/linear_regression/linear_regression_train_main.cpp
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME linear_regression_train
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/linear_svm.hpp b/src/mlpack/methods/linear_svm.hpp
new file mode 100644
index 0000000000..88d257b452
--- /dev/null
+++ b/src/mlpack/methods/linear_svm.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file linear_svm.hpp
+ *
+ * Convenience include for mlpack/methods/linear_svm/linear_svm.hpp
+ */
+#ifndef MLPACK_LINEAR_SVM_HPP
+#define MLPACK_LINEAR_SVM_HPP
+
+#include "linear_svm/linear_svm.hpp"
+
+#endif
diff --git a/src/mlpack/methods/linear_svm/linear_svm_main.cpp b/src/mlpack/methods/linear_svm/linear_svm_main.cpp
index 40cc2f2282..dccb7ae66f 100644
--- a/src/mlpack/methods/linear_svm/linear_svm_main.cpp
+++ b/src/mlpack/methods/linear_svm/linear_svm_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME linear_svm
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/lmnn.hpp b/src/mlpack/methods/lmnn.hpp
new file mode 100644
index 0000000000..713826aaee
--- /dev/null
+++ b/src/mlpack/methods/lmnn.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file lmnn.hpp
+ *
+ * Convenience include for mlpack/methods/lmnn/lmnn.hpp
+ */
+#ifndef MLPACK_LMNN_HPP
+#define MLPACK_LMNN_HPP
+
+#include "lmnn/lmnn.hpp"
+
+#endif
diff --git a/src/mlpack/methods/lmnn/lmnn_main.cpp b/src/mlpack/methods/lmnn/lmnn_main.cpp
index 56682a82e5..7ab8c4798e 100644
--- a/src/mlpack/methods/lmnn/lmnn_main.cpp
+++ b/src/mlpack/methods/lmnn/lmnn_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME lmnn
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/local_coordinate_coding.hpp b/src/mlpack/methods/local_coordinate_coding.hpp
new file mode 100644
index 0000000000..633c1b2a0c
--- /dev/null
+++ b/src/mlpack/methods/local_coordinate_coding.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file local_coordinate_coding.hpp
+ *
+ * Convenience include for mlpack/methods/local_coordinate_coding/local_coordinate_coding.hpp
+ */
+#ifndef MLPACK_LOCAL_COORDINATE_CODING_HPP
+#define MLPACK_LOCAL_COORDINATE_CODING_HPP
+
+#include "local_coordinate_coding/local_coordinate_coding.hpp"
+
+#endif
diff --git a/src/mlpack/methods/local_coordinate_coding/local_coordinate_coding_main.cpp b/src/mlpack/methods/local_coordinate_coding/local_coordinate_coding_main.cpp
index a93e14f0dc..5adb94a1fe 100644
--- a/src/mlpack/methods/local_coordinate_coding/local_coordinate_coding_main.cpp
+++ b/src/mlpack/methods/local_coordinate_coding/local_coordinate_coding_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME local_coordinate_coding
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/logistic_regression.hpp b/src/mlpack/methods/logistic_regression.hpp
new file mode 100644
index 0000000000..e7be82387b
--- /dev/null
+++ b/src/mlpack/methods/logistic_regression.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file logistic_regression.hpp
+ *
+ * Convenience include for mlpack/methods/logistic_regression/logistic_regression.hpp
+ */
+#ifndef MLPACK_LOGISTIC_REGRESSION_HPP
+#define MLPACK_LOGISTIC_REGRESSION_HPP
+
+#include "logistic_regression/logistic_regression.hpp"
+
+#endif
diff --git a/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp b/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp
index 3504a31976..81b9624a90 100644
--- a/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp
+++ b/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME logistic_regression
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/lsh.hpp b/src/mlpack/methods/lsh.hpp
new file mode 100644
index 0000000000..611bda913e
--- /dev/null
+++ b/src/mlpack/methods/lsh.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file lsh.hpp
+ *
+ * Convenience include for mlpack/methods/lsh/lsh.hpp
+ */
+#ifndef MLPACK_LSH_HPP
+#define MLPACK_LSH_HPP
+
+#include "lsh/lsh.hpp"
+
+#endif
diff --git a/src/mlpack/methods/lsh/lsh_main.cpp b/src/mlpack/methods/lsh/lsh_main.cpp
index 1de208e279..14f1da9175 100644
--- a/src/mlpack/methods/lsh/lsh_main.cpp
+++ b/src/mlpack/methods/lsh/lsh_main.cpp
@@ -12,9 +12,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME lsh
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/matrix_completion.hpp b/src/mlpack/methods/matrix_completion.hpp
new file mode 100644
index 0000000000..c97664fdc4
--- /dev/null
+++ b/src/mlpack/methods/matrix_completion.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file matrix_completion.hpp
+ *
+ * Convenience include for mlpack/methods/matrix_completion/matrix_completion.hpp
+ */
+#ifndef MLPACK_MATRIX_COMPLETION_HPP
+#define MLPACK_MATRIX_COMPLETION_HPP
+
+#include "matrix_completion/matrix_completion.hpp"
+
+#endif
diff --git a/src/mlpack/methods/mean_shift.hpp b/src/mlpack/methods/mean_shift.hpp
new file mode 100644
index 0000000000..adbb8636b8
--- /dev/null
+++ b/src/mlpack/methods/mean_shift.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file mean_shift.hpp
+ *
+ * Convenience include for mlpack/methods/mean_shift/mean_shift.hpp
+ */
+#ifndef MLPACK_MEAN_SHIFT_HPP
+#define MLPACK_MEAN_SHIFT_HPP
+
+#include "mean_shift/mean_shift.hpp"
+
+#endif
diff --git a/src/mlpack/methods/mean_shift/mean_shift_main.cpp b/src/mlpack/methods/mean_shift/mean_shift_main.cpp
index 29dedde3ad..6893dcf6a4 100644
--- a/src/mlpack/methods/mean_shift/mean_shift_main.cpp
+++ b/src/mlpack/methods/mean_shift/mean_shift_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME mean_shift
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/naive_bayes.hpp b/src/mlpack/methods/naive_bayes.hpp
new file mode 100644
index 0000000000..704ea2a544
--- /dev/null
+++ b/src/mlpack/methods/naive_bayes.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file naive_bayes.hpp
+ *
+ * Convenience include for mlpack/methods/naive_bayes/naive_bayes.hpp
+ */
+#ifndef MLPACK_NAIVE_BAYES_HPP
+#define MLPACK_NAIVE_BAYES_HPP
+
+#include "naive_bayes/naive_bayes.hpp"
+
+#endif
diff --git a/src/mlpack/methods/naive_bayes/nbc_main.cpp b/src/mlpack/methods/naive_bayes/nbc_main.cpp
index 79212253aa..dd00f1d97f 100644
--- a/src/mlpack/methods/naive_bayes/nbc_main.cpp
+++ b/src/mlpack/methods/naive_bayes/nbc_main.cpp
@@ -14,9 +14,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME nbc
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/nca.hpp b/src/mlpack/methods/nca.hpp
new file mode 100644
index 0000000000..0234a07a69
--- /dev/null
+++ b/src/mlpack/methods/nca.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file nca.hpp
+ *
+ * Convenience include for mlpack/methods/nca/nca.hpp
+ */
+#ifndef MLPACK_NCA_HPP
+#define MLPACK_NCA_HPP
+
+#include "nca/nca.hpp"
+
+#endif
diff --git a/src/mlpack/methods/nca/nca_main.cpp b/src/mlpack/methods/nca/nca_main.cpp
index e7b80792ab..d8d039d7ba 100644
--- a/src/mlpack/methods/nca/nca_main.cpp
+++ b/src/mlpack/methods/nca/nca_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME nca
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/neighbor_search.hpp b/src/mlpack/methods/neighbor_search.hpp
new file mode 100644
index 0000000000..9774a6a06b
--- /dev/null
+++ b/src/mlpack/methods/neighbor_search.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file neighbor_search.hpp
+ *
+ * Convenience include for mlpack/methods/neighbor_search/neighbor_search.hpp
+ */
+#ifndef MLPACK_NEIGHBOR_SEARCH_HPP
+#define MLPACK_NEIGHBOR_SEARCH_HPP
+
+#include "neighbor_search/neighbor_search.hpp"
+
+#endif
diff --git a/src/mlpack/methods/neighbor_search/kfn_main.cpp b/src/mlpack/methods/neighbor_search/kfn_main.cpp
index bda529acf1..f8e562c312 100644
--- a/src/mlpack/methods/neighbor_search/kfn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/kfn_main.cpp
@@ -12,9 +12,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME kfn
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/neighbor_search/knn_main.cpp b/src/mlpack/methods/neighbor_search/knn_main.cpp
index 0c56a63ea5..0679e6375c 100644
--- a/src/mlpack/methods/neighbor_search/knn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/knn_main.cpp
@@ -12,9 +12,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME knn
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/nmf.hpp b/src/mlpack/methods/nmf.hpp
new file mode 100644
index 0000000000..1ccfb89ddd
--- /dev/null
+++ b/src/mlpack/methods/nmf.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file nmf.hpp
+ *
+ * Convenience include for mlpack/methods/nmf/nmf.hpp
+ */
+#ifndef MLPACK_NMF_HPP
+#define MLPACK_NMF_HPP
+
+#include "nmf/nmf.hpp"
+
+#endif
diff --git a/src/mlpack/methods/nmf/nmf_main.cpp b/src/mlpack/methods/nmf/nmf_main.cpp
index db4123f9a1..749b44138b 100644
--- a/src/mlpack/methods/nmf/nmf_main.cpp
+++ b/src/mlpack/methods/nmf/nmf_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME nmf
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/nystroem_method.hpp b/src/mlpack/methods/nystroem_method.hpp
new file mode 100644
index 0000000000..889bdbc3f5
--- /dev/null
+++ b/src/mlpack/methods/nystroem_method.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file nystroem_method.hpp
+ *
+ * Convenience include for mlpack/methods/nystroem_method/nystroem_method.hpp
+ */
+#ifndef MLPACK_NYSTROEM_METHOD_HPP
+#define MLPACK_NYSTROEM_METHOD_HPP
+
+#include "nystroem_method/nystroem_method.hpp"
+
+#endif
diff --git a/src/mlpack/methods/pca.hpp b/src/mlpack/methods/pca.hpp
new file mode 100644
index 0000000000..6a9a039855
--- /dev/null
+++ b/src/mlpack/methods/pca.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file pca.hpp
+ *
+ * Convenience include for mlpack/methods/pca/pca.hpp
+ */
+#ifndef MLPACK_PCA_HPP
+#define MLPACK_PCA_HPP
+
+#include "pca/pca.hpp"
+
+#endif
diff --git a/src/mlpack/methods/pca/pca_main.cpp b/src/mlpack/methods/pca/pca_main.cpp
index 1c9e9ba541..d8f2c01458 100644
--- a/src/mlpack/methods/pca/pca_main.cpp
+++ b/src/mlpack/methods/pca/pca_main.cpp
@@ -12,9 +12,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME pca
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/perceptron.hpp b/src/mlpack/methods/perceptron.hpp
new file mode 100644
index 0000000000..917324f048
--- /dev/null
+++ b/src/mlpack/methods/perceptron.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file perceptron.hpp
+ *
+ * Convenience include for mlpack/methods/perceptron/perceptron.hpp
+ */
+#ifndef MLPACK_PERCEPTRON_HPP
+#define MLPACK_PERCEPTRON_HPP
+
+#include "perceptron/perceptron.hpp"
+
+#endif
diff --git a/src/mlpack/methods/perceptron/perceptron_main.cpp b/src/mlpack/methods/perceptron/perceptron_main.cpp
index 1e04361607..a7849780f2 100644
--- a/src/mlpack/methods/perceptron/perceptron_main.cpp
+++ b/src/mlpack/methods/perceptron/perceptron_main.cpp
@@ -14,9 +14,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME perceptron
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/preprocess.hpp b/src/mlpack/methods/preprocess.hpp
new file mode 100644
index 0000000000..5616005ecf
--- /dev/null
+++ b/src/mlpack/methods/preprocess.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file preprocess.hpp
+ *
+ * Convenience include for mlpack/methods/preprocess/preprocess.hpp
+ */
+#ifndef MLPACK_PREPROCESS_HPP
+#define MLPACK_PREPROCESS_HPP
+
+#include "preprocess/preprocess.hpp"
+
+#endif
diff --git a/src/mlpack/methods/preprocess/image_converter_main.cpp b/src/mlpack/methods/preprocess/image_converter_main.cpp
index 9e7e0281dd..2e8e0f0853 100644
--- a/src/mlpack/methods/preprocess/image_converter_main.cpp
+++ b/src/mlpack/methods/preprocess/image_converter_main.cpp
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME image_converter
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/preprocess/preprocess_binarize_main.cpp b/src/mlpack/methods/preprocess/preprocess_binarize_main.cpp
index 922cb94207..5f237494d0 100644
--- a/src/mlpack/methods/preprocess/preprocess_binarize_main.cpp
+++ b/src/mlpack/methods/preprocess/preprocess_binarize_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_binarize
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/preprocess/preprocess_describe_main.cpp b/src/mlpack/methods/preprocess/preprocess_describe_main.cpp
index a9a0ececfd..9a7efe664d 100644
--- a/src/mlpack/methods/preprocess/preprocess_describe_main.cpp
+++ b/src/mlpack/methods/preprocess/preprocess_describe_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_describe
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/preprocess/preprocess_imputer_main.cpp b/src/mlpack/methods/preprocess/preprocess_imputer_main.cpp
index bea0e64e5f..71bac71cae 100644
--- a/src/mlpack/methods/preprocess/preprocess_imputer_main.cpp
+++ b/src/mlpack/methods/preprocess/preprocess_imputer_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_imputer
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/preprocess/preprocess_one_hot_encoding_main.cpp b/src/mlpack/methods/preprocess/preprocess_one_hot_encoding_main.cpp
index b240bca22b..3b7f1b3e1c 100644
--- a/src/mlpack/methods/preprocess/preprocess_one_hot_encoding_main.cpp
+++ b/src/mlpack/methods/preprocess/preprocess_one_hot_encoding_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_one_hot_encoding
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/preprocess/preprocess_scale_main.cpp b/src/mlpack/methods/preprocess/preprocess_scale_main.cpp
index cccf83163c..0199aebb68 100644
--- a/src/mlpack/methods/preprocess/preprocess_scale_main.cpp
+++ b/src/mlpack/methods/preprocess/preprocess_scale_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_scale
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/preprocess/preprocess_split_main.cpp b/src/mlpack/methods/preprocess/preprocess_split_main.cpp
index e5ddbe8e15..32c8acf8a3 100644
--- a/src/mlpack/methods/preprocess/preprocess_split_main.cpp
+++ b/src/mlpack/methods/preprocess/preprocess_split_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_split
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/quic_svd.hpp b/src/mlpack/methods/quic_svd.hpp
new file mode 100644
index 0000000000..3551d37d83
--- /dev/null
+++ b/src/mlpack/methods/quic_svd.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file quic_svd.hpp
+ *
+ * Convenience include for mlpack/methods/quic_svd/quic_svd.hpp
+ */
+#ifndef MLPACK_QUIC_SVD_HPP
+#define MLPACK_QUIC_SVD_HPP
+
+#include "quic_svd/quic_svd.hpp"
+
+#endif
diff --git a/src/mlpack/methods/radical.hpp b/src/mlpack/methods/radical.hpp
new file mode 100644
index 0000000000..7fad4f8c0d
--- /dev/null
+++ b/src/mlpack/methods/radical.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file radical.hpp
+ *
+ * Convenience include for mlpack/methods/radical/radical.hpp
+ */
+#ifndef MLPACK_RADICAL_HPP
+#define MLPACK_RADICAL_HPP
+
+#include "radical/radical.hpp"
+
+#endif
diff --git a/src/mlpack/methods/radical/radical_main.cpp b/src/mlpack/methods/radical/radical_main.cpp
index 32b97e2f33..3a4c6730a8 100644
--- a/src/mlpack/methods/radical/radical_main.cpp
+++ b/src/mlpack/methods/radical/radical_main.cpp
@@ -12,9 +12,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME radical
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/random_forest.hpp b/src/mlpack/methods/random_forest.hpp
new file mode 100644
index 0000000000..024b293e62
--- /dev/null
+++ b/src/mlpack/methods/random_forest.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file random_forest.hpp
+ *
+ * Convenience include for mlpack/methods/random_forest/random_forest.hpp
+ */
+#ifndef MLPACK_RANDOM_FOREST_HPP
+#define MLPACK_RANDOM_FOREST_HPP
+
+#include "random_forest/random_forest.hpp"
+
+#endif
diff --git a/src/mlpack/methods/random_forest/random_forest_main.cpp b/src/mlpack/methods/random_forest/random_forest_main.cpp
index aaa730c8a1..a71d131ed8 100644
--- a/src/mlpack/methods/random_forest/random_forest_main.cpp
+++ b/src/mlpack/methods/random_forest/random_forest_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME random_forest
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/randomized_svd.hpp b/src/mlpack/methods/randomized_svd.hpp
new file mode 100644
index 0000000000..6d970c5024
--- /dev/null
+++ b/src/mlpack/methods/randomized_svd.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file randomized_svd.hpp
+ *
+ * Convenience include for mlpack/methods/randomized_svd/randomized_svd.hpp
+ */
+#ifndef MLPACK_RANDOMIZED_SVD_HPP
+#define MLPACK_RANDOMIZED_SVD_HPP
+
+#include "randomized_svd/randomized_svd.hpp"
+
+#endif
diff --git a/src/mlpack/methods/range_search.hpp b/src/mlpack/methods/range_search.hpp
new file mode 100644
index 0000000000..c0196f976d
--- /dev/null
+++ b/src/mlpack/methods/range_search.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file range_search.hpp
+ *
+ * Convenience include for mlpack/methods/range_search/range_search.hpp
+ */
+#ifndef MLPACK_RANGE_SEARCH_HPP
+#define MLPACK_RANGE_SEARCH_HPP
+
+#include "range_search/range_search.hpp"
+
+#endif
diff --git a/src/mlpack/methods/range_search/range_search_main.cpp b/src/mlpack/methods/range_search/range_search_main.cpp
index 8d2c04e539..8dce4b1da0 100644
--- a/src/mlpack/methods/range_search/range_search_main.cpp
+++ b/src/mlpack/methods/range_search/range_search_main.cpp
@@ -13,9 +13,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME range_search
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/rann.hpp b/src/mlpack/methods/rann.hpp
new file mode 100644
index 0000000000..02ca151856
--- /dev/null
+++ b/src/mlpack/methods/rann.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file rann.hpp
+ *
+ * Convenience include for mlpack/methods/rann/rann.hpp
+ */
+#ifndef MLPACK_RANN_HPP
+#define MLPACK_RANN_HPP
+
+#include "rann/rann.hpp"
+
+#endif
diff --git a/src/mlpack/methods/rann/krann_main.cpp b/src/mlpack/methods/rann/krann_main.cpp
index 7c9a088095..9054fc619f 100644
--- a/src/mlpack/methods/rann/krann_main.cpp
+++ b/src/mlpack/methods/rann/krann_main.cpp
@@ -12,9 +12,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME krann
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/regularized_svd.hpp b/src/mlpack/methods/regularized_svd.hpp
new file mode 100644
index 0000000000..5206dd569e
--- /dev/null
+++ b/src/mlpack/methods/regularized_svd.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file regularized_svd.hpp
+ *
+ * Convenience include for mlpack/methods/regularized_svd/regularized_svd.hpp
+ */
+#ifndef MLPACK_REGULARIZED_SVD_HPP
+#define MLPACK_REGULARIZED_SVD_HPP
+
+#include "regularized_svd/regularized_svd.hpp"
+
+#endif
diff --git a/src/mlpack/methods/reinforcement_learning.hpp b/src/mlpack/methods/reinforcement_learning.hpp
new file mode 100644
index 0000000000..176d61de7d
--- /dev/null
+++ b/src/mlpack/methods/reinforcement_learning.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file reinforcement_learning.hpp
+ *
+ * Convenience include for mlpack/methods/reinforcement_learning/reinforcement_learning.hpp
+ */
+#ifndef MLPACK_REINFORCEMENT_LEARNING_HPP
+#define MLPACK_REINFORCEMENT_LEARNING_HPP
+
+#include "reinforcement_learning/reinforcement_learning.hpp"
+
+#endif
diff --git a/src/mlpack/methods/softmax_regression.hpp b/src/mlpack/methods/softmax_regression.hpp
new file mode 100644
index 0000000000..da734ec5ff
--- /dev/null
+++ b/src/mlpack/methods/softmax_regression.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file softmax_regression.hpp
+ *
+ * Convenience include for mlpack/methods/softmax_regression/softmax_regression.hpp
+ */
+#ifndef MLPACK_SOFTMAX_REGRESSION_HPP
+#define MLPACK_SOFTMAX_REGRESSION_HPP
+
+#include "softmax_regression/softmax_regression.hpp"
+
+#endif
diff --git a/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp b/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp
index a32408d706..e4e4008152 100644
--- a/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp
+++ b/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp
@@ -10,9 +10,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME softmax_regression
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/sparse_autoencoder.hpp b/src/mlpack/methods/sparse_autoencoder.hpp
new file mode 100644
index 0000000000..69493c3a61
--- /dev/null
+++ b/src/mlpack/methods/sparse_autoencoder.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file sparse_autoencoder.hpp
+ *
+ * Convenience include for mlpack/methods/sparse_autoencoder/sparse_autoencoder.hpp
+ */
+#ifndef MLPACK_SPARSE_AUTOENCODER_HPP
+#define MLPACK_SPARSE_AUTOENCODER_HPP
+
+#include "sparse_autoencoder/sparse_autoencoder.hpp"
+
+#endif
diff --git a/src/mlpack/methods/sparse_coding.hpp b/src/mlpack/methods/sparse_coding.hpp
new file mode 100644
index 0000000000..a7f1bdb0b1
--- /dev/null
+++ b/src/mlpack/methods/sparse_coding.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file sparse_coding.hpp
+ *
+ * Convenience include for mlpack/methods/sparse_coding/sparse_coding.hpp
+ */
+#ifndef MLPACK_SPARSE_CODING_HPP
+#define MLPACK_SPARSE_CODING_HPP
+
+#include "sparse_coding/sparse_coding.hpp"
+
+#endif
diff --git a/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp b/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp
index 2944be1a54..3801298d26 100644
--- a/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp
+++ b/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp
@@ -11,9 +11,7 @@
  */
 #include <mlpack/core.hpp>
 
-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME sparse_coding
 
 #include <mlpack/core/util/mlpack_main.hpp>
diff --git a/src/mlpack/methods/svdplusplus.hpp b/src/mlpack/methods/svdplusplus.hpp
new file mode 100644
index 0000000000..03709730bf
--- /dev/null
+++ b/src/mlpack/methods/svdplusplus.hpp
@@ -0,0 +1,11 @@
+/**
+ * @file svdplusplus.hpp
+ *
+ * Convenience include for mlpack/methods/svdplusplus/svdplusplus.hpp
+ */
+#ifndef MLPACK_SVDPLUSPLUS_HPP
+#define MLPACK_SVDPLUSPLUS_HPP
+
+#include "svdplusplus/svdplusplus.hpp"
+
+#endif
diff --git a/src/mlpack/tests/adaboost_test.cpp b/src/mlpack/tests/adaboost_test.cpp
index 6f584a0f04..4b7559b330 100644
--- a/src/mlpack/tests/adaboost_test.cpp
+++ b/src/mlpack/tests/adaboost_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/adaboost/adaboost.hpp>
+#include <mlpack/methods/adaboost.hpp>
 
 #include "serialization.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/akfn_test.cpp b/src/mlpack/tests/akfn_test.cpp
index bd4a416177..5d45fd88d6 100644
--- a/src/mlpack/tests/akfn_test.cpp
+++ b/src/mlpack/tests/akfn_test.cpp
@@ -9,7 +9,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 #include "test_catch_tools.hpp"
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/aknn_test.cpp b/src/mlpack/tests/aknn_test.cpp
index 081e36131f..369984ee0f 100644
--- a/src/mlpack/tests/aknn_test.cpp
+++ b/src/mlpack/tests/aknn_test.cpp
@@ -9,7 +9,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 #include <mlpack/methods/neighbor_search/ns_model.hpp>
 #include "test_catch_tools.hpp"
 #include "catch.hpp"
diff --git a/src/mlpack/tests/bayesian_linear_regression_test.cpp b/src/mlpack/tests/bayesian_linear_regression_test.cpp
index fb100cbf02..3fb198ac6a 100644
--- a/src/mlpack/tests/bayesian_linear_regression_test.cpp
+++ b/src/mlpack/tests/bayesian_linear_regression_test.cpp
@@ -10,9 +10,9 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 
-#include <mlpack/core/data/load.hpp>
-#include <mlpack/methods/bayesian_linear_regression/bayesian_linear_regression.hpp>
-#include <mlpack/methods/linear_regression/linear_regression.hpp>
+#include <mlpack/core.hpp>
+#include <mlpack/methods/bayesian_linear_regression.hpp>
+#include <mlpack/methods/linear_regression.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/bias_svd_test.cpp b/src/mlpack/tests/bias_svd_test.cpp
index 620874f744..2a4a2dfc19 100644
--- a/src/mlpack/tests/bias_svd_test.cpp
+++ b/src/mlpack/tests/bias_svd_test.cpp
@@ -11,7 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/bias_svd/bias_svd.hpp>
+#include <mlpack/methods/bias_svd.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/block_krylov_svd_test.cpp b/src/mlpack/tests/block_krylov_svd_test.cpp
index 3c24b9d1b5..e42e74e400 100644
--- a/src/mlpack/tests/block_krylov_svd_test.cpp
+++ b/src/mlpack/tests/block_krylov_svd_test.cpp
@@ -11,7 +11,7 @@
  */
 
 #include <mlpack/core.hpp>
-#include <mlpack/methods/block_krylov_svd/randomized_block_krylov_svd.hpp>
+#include <mlpack/methods/block_krylov_svd.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/callback_test.cpp b/src/mlpack/tests/callback_test.cpp
index 78d8549c3e..2d27eb52a5 100644
--- a/src/mlpack/tests/callback_test.cpp
+++ b/src/mlpack/tests/callback_test.cpp
@@ -9,12 +9,12 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/ann/ann.hpp>
-#include <mlpack/methods/lmnn/lmnn.hpp>
-#include <mlpack/methods/logistic_regression/logistic_regression.hpp>
-#include <mlpack/methods/nca/nca.hpp>
-#include <mlpack/methods/softmax_regression/softmax_regression.hpp>
-#include <mlpack/methods/sparse_autoencoder/sparse_autoencoder.hpp>
+#include <mlpack/methods/ann.hpp>
+#include <mlpack/methods/lmnn.hpp>
+#include <mlpack/methods/logistic_regression.hpp>
+#include <mlpack/methods/nca.hpp>
+#include <mlpack/methods/softmax_regression.hpp>
+#include <mlpack/methods/sparse_autoencoder.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/cf_test.cpp b/src/mlpack/tests/cf_test.cpp
index c1fb4eb743..ea0be62b45 100644
--- a/src/mlpack/tests/cf_test.cpp
+++ b/src/mlpack/tests/cf_test.cpp
@@ -12,7 +12,7 @@
  */
 
 #include <mlpack/core.hpp>
-#include <mlpack/methods/cf/cf.hpp>
+#include <mlpack/methods/cf.hpp>
 
 #include "catch.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/cv_test.cpp b/src/mlpack/tests/cv_test.cpp
index 6ef90ba04c..e7a46b4a8a 100644
--- a/src/mlpack/tests/cv_test.cpp
+++ b/src/mlpack/tests/cv_test.cpp
@@ -9,15 +9,15 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/ann/ann.hpp>
-#include <mlpack/methods/decision_tree/decision_tree.hpp>
-#include <mlpack/methods/hoeffding_trees/hoeffding_trees.hpp>
-#include <mlpack/methods/lars/lars.hpp>
-#include <mlpack/methods/linear_regression/linear_regression.hpp>
-#include <mlpack/methods/logistic_regression/logistic_regression.hpp>
-#include <mlpack/methods/naive_bayes/naive_bayes_classifier.hpp>
-#include <mlpack/methods/perceptron/perceptron.hpp>
-#include <mlpack/methods/softmax_regression/softmax_regression.hpp>
+#include <mlpack/methods/ann.hpp>
+#include <mlpack/methods/decision_tree.hpp>
+#include <mlpack/methods/hoeffding_trees.hpp>
+#include <mlpack/methods/lars.hpp>
+#include <mlpack/methods/linear_regression.hpp>
+#include <mlpack/methods/logistic_regression.hpp>
+#include <mlpack/methods/naive_bayes.hpp>
+#include <mlpack/methods/perceptron.hpp>
+#include <mlpack/methods/softmax_regression.hpp>
 
 #include "catch.hpp"
 #include "mock_categorical_data.hpp"
diff --git a/src/mlpack/tests/dbscan_test.cpp b/src/mlpack/tests/dbscan_test.cpp
index 67ecfe9c1e..2e493772b9 100644
--- a/src/mlpack/tests/dbscan_test.cpp
+++ b/src/mlpack/tests/dbscan_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/dbscan/dbscan.hpp>
+#include <mlpack/methods/dbscan.hpp>
 
 #include "test_catch_tools.hpp"
 #include "catch.hpp"
diff --git a/src/mlpack/tests/decision_tree_regressor_test.cpp b/src/mlpack/tests/decision_tree_regressor_test.cpp
index 1e341f497c..14014b437c 100644
--- a/src/mlpack/tests/decision_tree_regressor_test.cpp
+++ b/src/mlpack/tests/decision_tree_regressor_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/decision_tree/decision_tree.hpp>
+#include <mlpack/methods/decision_tree.hpp>
 
 #include "catch.hpp"
 #include "serialization.hpp"
diff --git a/src/mlpack/tests/decision_tree_test.cpp b/src/mlpack/tests/decision_tree_test.cpp
index 7a6c31f7bd..e0aa319927 100644
--- a/src/mlpack/tests/decision_tree_test.cpp
+++ b/src/mlpack/tests/decision_tree_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/decision_tree/decision_tree.hpp>
+#include <mlpack/methods/decision_tree.hpp>
 
 #include "catch.hpp"
 #include "serialization.hpp"
diff --git a/src/mlpack/tests/det_test.cpp b/src/mlpack/tests/det_test.cpp
index 128763a777..e5ab87fb86 100644
--- a/src/mlpack/tests/det_test.cpp
+++ b/src/mlpack/tests/det_test.cpp
@@ -20,7 +20,7 @@
   #define private public
 #endif
 
-#include <mlpack/methods/det/det.hpp>
+#include <mlpack/methods/det.hpp>
 
 #ifndef _WIN32
   #undef protected
diff --git a/src/mlpack/tests/drusilla_select_test.cpp b/src/mlpack/tests/drusilla_select_test.cpp
index 84324c88b4..53f25cf8ce 100644
--- a/src/mlpack/tests/drusilla_select_test.cpp
+++ b/src/mlpack/tests/drusilla_select_test.cpp
@@ -9,8 +9,8 @@
  * 3-clause BSD license along with mlpack.  If not, see
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
-#include <mlpack/methods/approx_kfn/approx_kfn.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/approx_kfn.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 
 #include "catch.hpp"
 #include "serialization.hpp"
diff --git a/src/mlpack/tests/emst_test.cpp b/src/mlpack/tests/emst_test.cpp
index 2407b789a5..90c894e078 100644
--- a/src/mlpack/tests/emst_test.cpp
+++ b/src/mlpack/tests/emst_test.cpp
@@ -9,7 +9,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/emst/emst.hpp>
+#include <mlpack/methods/emst.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/fastmks_test.cpp b/src/mlpack/tests/fastmks_test.cpp
index 2277c9e513..c39c782338 100644
--- a/src/mlpack/tests/fastmks_test.cpp
+++ b/src/mlpack/tests/fastmks_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/fastmks/fastmks.hpp>
+#include <mlpack/methods/fastmks.hpp>
 #include <mlpack/methods/fastmks/fastmks_model.hpp>
 
 #include "catch.hpp"
diff --git a/src/mlpack/tests/gmm_test.cpp b/src/mlpack/tests/gmm_test.cpp
index 4105824c5a..7ae1dff831 100644
--- a/src/mlpack/tests/gmm_test.cpp
+++ b/src/mlpack/tests/gmm_test.cpp
@@ -12,7 +12,7 @@
  */
 #include <mlpack/core.hpp>
 
-#include <mlpack/methods/gmm/gmm.hpp>
+#include <mlpack/methods/gmm.hpp>
 
 #include "test_catch_tools.hpp"
 #include "catch.hpp"
diff --git a/src/mlpack/tests/hmm_test.cpp b/src/mlpack/tests/hmm_test.cpp
index 368e94f9fa..e8a8cbc72f 100644
--- a/src/mlpack/tests/hmm_test.cpp
+++ b/src/mlpack/tests/hmm_test.cpp
@@ -9,8 +9,8 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/hmm/hmm.hpp>
-#include <mlpack/methods/gmm/gmm.hpp>
+#include <mlpack/methods/hmm.hpp>
+#include <mlpack/methods/gmm.hpp>
 
 #include "catch.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/hoeffding_tree_test.cpp b/src/mlpack/tests/hoeffding_tree_test.cpp
index 304d78748c..0d53393697 100644
--- a/src/mlpack/tests/hoeffding_tree_test.cpp
+++ b/src/mlpack/tests/hoeffding_tree_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/hoeffding_trees/hoeffding_trees.hpp>
+#include <mlpack/methods/hoeffding_trees.hpp>
 #include <mlpack/methods/hoeffding_trees/hoeffding_tree_model.hpp>
 
 #include "catch.hpp"
diff --git a/src/mlpack/tests/hpt_test.cpp b/src/mlpack/tests/hpt_test.cpp
index 0ba7094b34..ef768e3741 100644
--- a/src/mlpack/tests/hpt_test.cpp
+++ b/src/mlpack/tests/hpt_test.cpp
@@ -10,8 +10,8 @@
  */
 
 #include <mlpack/core.hpp>
-#include <mlpack/methods/lars/lars.hpp>
-#include <mlpack/methods/logistic_regression/logistic_regression.hpp>
+#include <mlpack/methods/lars.hpp>
+#include <mlpack/methods/logistic_regression.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/kde_test.cpp b/src/mlpack/tests/kde_test.cpp
index 3c8d90683a..1c5006a6d0 100644
--- a/src/mlpack/tests/kde_test.cpp
+++ b/src/mlpack/tests/kde_test.cpp
@@ -8,7 +8,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/kde/kde.hpp>
+#include <mlpack/methods/kde.hpp>
 
 #include "catch.hpp"
 #include "serialization.hpp"
diff --git a/src/mlpack/tests/kernel_pca_test.cpp b/src/mlpack/tests/kernel_pca_test.cpp
index 710ca8fbcd..d868fc7a17 100644
--- a/src/mlpack/tests/kernel_pca_test.cpp
+++ b/src/mlpack/tests/kernel_pca_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/kernel_pca/kernel_pca.hpp>
+#include <mlpack/methods/kernel_pca.hpp>
 
 #include "catch.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/kfn_test.cpp b/src/mlpack/tests/kfn_test.cpp
index 8e2cbee41e..a11509db73 100644
--- a/src/mlpack/tests/kfn_test.cpp
+++ b/src/mlpack/tests/kfn_test.cpp
@@ -9,7 +9,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 #include "test_catch_tools.hpp"
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/kmeans_test.cpp b/src/mlpack/tests/kmeans_test.cpp
index 74cf15cf95..bcfb2e4851 100644
--- a/src/mlpack/tests/kmeans_test.cpp
+++ b/src/mlpack/tests/kmeans_test.cpp
@@ -8,8 +8,8 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/kmeans/kmeans.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/kmeans.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/knn_test.cpp b/src/mlpack/tests/knn_test.cpp
index e35fa6368b..ac772f81c6 100644
--- a/src/mlpack/tests/knn_test.cpp
+++ b/src/mlpack/tests/knn_test.cpp
@@ -9,7 +9,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 #include <mlpack/methods/neighbor_search/ns_model.hpp>
 #include "test_catch_tools.hpp"
 #include "catch.hpp"
diff --git a/src/mlpack/tests/krann_search_test.cpp b/src/mlpack/tests/krann_search_test.cpp
index a45b001ae7..c7dddf6913 100644
--- a/src/mlpack/tests/krann_search_test.cpp
+++ b/src/mlpack/tests/krann_search_test.cpp
@@ -11,7 +11,7 @@
  */
 #include <time.h>
 #include <mlpack/core.hpp>
-#include <mlpack/methods/rann/rann.hpp>
+#include <mlpack/methods/rann.hpp>
 #include <mlpack/methods/rann/ra_model.hpp>
 
 #include "catch.hpp"
diff --git a/src/mlpack/tests/lars_test.cpp b/src/mlpack/tests/lars_test.cpp
index 44981bf73f..cf4b4e7a95 100644
--- a/src/mlpack/tests/lars_test.cpp
+++ b/src/mlpack/tests/lars_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/lars/lars.hpp>
+#include <mlpack/methods/lars.hpp>
 
 #include "catch.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/linear_regression_test.cpp b/src/mlpack/tests/linear_regression_test.cpp
index e8b3371265..13ae3f816b 100644
--- a/src/mlpack/tests/linear_regression_test.cpp
+++ b/src/mlpack/tests/linear_regression_test.cpp
@@ -9,7 +9,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/linear_regression/linear_regression.hpp>
+#include <mlpack/methods/linear_regression.hpp>
 
 #include "serialization.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/linear_svm_test.cpp b/src/mlpack/tests/linear_svm_test.cpp
index ef6d65bcd6..a35c20324f 100644
--- a/src/mlpack/tests/linear_svm_test.cpp
+++ b/src/mlpack/tests/linear_svm_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/linear_svm/linear_svm.hpp>
+#include <mlpack/methods/linear_svm.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/lmnn_test.cpp b/src/mlpack/tests/lmnn_test.cpp
index ae16efbff0..2d3eac72d2 100644
--- a/src/mlpack/tests/lmnn_test.cpp
+++ b/src/mlpack/tests/lmnn_test.cpp
@@ -13,8 +13,8 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/lmnn/lmnn.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/lmnn.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 
 #include "catch.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/local_coordinate_coding_test.cpp b/src/mlpack/tests/local_coordinate_coding_test.cpp
index c8466ab7f8..86e666d469 100644
--- a/src/mlpack/tests/local_coordinate_coding_test.cpp
+++ b/src/mlpack/tests/local_coordinate_coding_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 
-#include <mlpack/methods/local_coordinate_coding/local_coordinate_coding.hpp>
+#include <mlpack/methods/local_coordinate_coding.hpp>
 
 #include "catch.hpp"
 #include "serialization.hpp"
diff --git a/src/mlpack/tests/logistic_regression_test.cpp b/src/mlpack/tests/logistic_regression_test.cpp
index ed30affe6a..40cdb1bd41 100644
--- a/src/mlpack/tests/logistic_regression_test.cpp
+++ b/src/mlpack/tests/logistic_regression_test.cpp
@@ -11,7 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/logistic_regression/logistic_regression.hpp>
+#include <mlpack/methods/logistic_regression.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/lsh_test.cpp b/src/mlpack/tests/lsh_test.cpp
index f557817566..af6591b0e2 100644
--- a/src/mlpack/tests/lsh_test.cpp
+++ b/src/mlpack/tests/lsh_test.cpp
@@ -12,8 +12,8 @@
 #include "catch.hpp"
 #include "test_catch_tools.hpp"
 
-#include <mlpack/methods/lsh/lsh.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/lsh.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 
 using namespace std;
 using namespace mlpack;
diff --git a/src/mlpack/tests/matrix_completion_test.cpp b/src/mlpack/tests/matrix_completion_test.cpp
index 6fb3baff79..41659279ef 100644
--- a/src/mlpack/tests/matrix_completion_test.cpp
+++ b/src/mlpack/tests/matrix_completion_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/matrix_completion/matrix_completion.hpp>
+#include <mlpack/methods/matrix_completion.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/mean_shift_test.cpp b/src/mlpack/tests/mean_shift_test.cpp
index 9f6c229639..256b35b013 100644
--- a/src/mlpack/tests/mean_shift_test.cpp
+++ b/src/mlpack/tests/mean_shift_test.cpp
@@ -10,7 +10,7 @@
 
 #include <mlpack/core.hpp>
 
-#include <mlpack/methods/mean_shift/mean_shift.hpp>
+#include <mlpack/methods/mean_shift.hpp>
 
 #include "test_catch_tools.hpp"
 #include "catch.hpp"
diff --git a/src/mlpack/tests/nbc_test.cpp b/src/mlpack/tests/nbc_test.cpp
index d18563b257..7f577aaa3d 100644
--- a/src/mlpack/tests/nbc_test.cpp
+++ b/src/mlpack/tests/nbc_test.cpp
@@ -9,7 +9,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/naive_bayes/naive_bayes.hpp>
+#include <mlpack/methods/naive_bayes.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/nca_test.cpp b/src/mlpack/tests/nca_test.cpp
index 66c12f8859..10708612f6 100644
--- a/src/mlpack/tests/nca_test.cpp
+++ b/src/mlpack/tests/nca_test.cpp
@@ -11,7 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/nca/nca.hpp>
+#include <mlpack/methods/nca.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/nmf_test.cpp b/src/mlpack/tests/nmf_test.cpp
index 4d57e66e85..f768839a60 100644
--- a/src/mlpack/tests/nmf_test.cpp
+++ b/src/mlpack/tests/nmf_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/nmf/nmf.hpp>
+#include <mlpack/methods/nmf.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/nystroem_method_test.cpp b/src/mlpack/tests/nystroem_method_test.cpp
index cbe4ff8e3c..eebd980a59 100644
--- a/src/mlpack/tests/nystroem_method_test.cpp
+++ b/src/mlpack/tests/nystroem_method_test.cpp
@@ -11,7 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/nystroem_method/nystroem_method.hpp>
+#include <mlpack/methods/nystroem_method.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/pca_test.cpp b/src/mlpack/tests/pca_test.cpp
index f9bf3e362d..522954bf53 100644
--- a/src/mlpack/tests/pca_test.cpp
+++ b/src/mlpack/tests/pca_test.cpp
@@ -11,7 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/pca/pca.hpp>
+#include <mlpack/methods/pca.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/perceptron_test.cpp b/src/mlpack/tests/perceptron_test.cpp
index e1315f34b2..9dfe051089 100644
--- a/src/mlpack/tests/perceptron_test.cpp
+++ b/src/mlpack/tests/perceptron_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/perceptron/perceptron.hpp>
+#include <mlpack/methods/perceptron.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/q_learning_test.cpp b/src/mlpack/tests/q_learning_test.cpp
index a4c0392ea5..d925820483 100644
--- a/src/mlpack/tests/q_learning_test.cpp
+++ b/src/mlpack/tests/q_learning_test.cpp
@@ -12,8 +12,8 @@
  */
 
 #include <mlpack/core.hpp>
-#include <mlpack/methods/ann/ann.hpp>
-#include <mlpack/methods/reinforcement_learning/reinforcement_learning.hpp>
+#include <mlpack/methods/ann.hpp>
+#include <mlpack/methods/reinforcement_learning.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/qdafn_test.cpp b/src/mlpack/tests/qdafn_test.cpp
index 5e5aa7a363..e2d1634b7b 100644
--- a/src/mlpack/tests/qdafn_test.cpp
+++ b/src/mlpack/tests/qdafn_test.cpp
@@ -10,8 +10,8 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/approx_kfn/approx_kfn.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/approx_kfn.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 
 #include "catch.hpp"
 #include "serialization.hpp"
diff --git a/src/mlpack/tests/quic_svd_test.cpp b/src/mlpack/tests/quic_svd_test.cpp
index 16cbfa98af..7a67a2ebb6 100644
--- a/src/mlpack/tests/quic_svd_test.cpp
+++ b/src/mlpack/tests/quic_svd_test.cpp
@@ -11,7 +11,7 @@
  */
 
 #include <mlpack/core.hpp>
-#include <mlpack/methods/quic_svd/quic_svd.hpp>
+#include <mlpack/methods/quic_svd.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/radical_test.cpp b/src/mlpack/tests/radical_test.cpp
index 39b77a11f7..f8d9e23d38 100644
--- a/src/mlpack/tests/radical_test.cpp
+++ b/src/mlpack/tests/radical_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/radical/radical.hpp>
+#include <mlpack/methods/radical.hpp>
 #include "catch.hpp"
 
 using namespace mlpack;
diff --git a/src/mlpack/tests/random_forest_test.cpp b/src/mlpack/tests/random_forest_test.cpp
index a0327ffed5..8f8d3de155 100644
--- a/src/mlpack/tests/random_forest_test.cpp
+++ b/src/mlpack/tests/random_forest_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/random_forest/random_forest.hpp>
+#include <mlpack/methods/random_forest.hpp>
 
 #include "serialization.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/randomized_svd_test.cpp b/src/mlpack/tests/randomized_svd_test.cpp
index 377a04918a..6b4bd05508 100644
--- a/src/mlpack/tests/randomized_svd_test.cpp
+++ b/src/mlpack/tests/randomized_svd_test.cpp
@@ -11,7 +11,7 @@
  */
 
 #include <mlpack/core.hpp>
-#include <mlpack/methods/randomized_svd/randomized_svd.hpp>
+#include <mlpack/methods/randomized_svd.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/range_search_test.cpp b/src/mlpack/tests/range_search_test.cpp
index 8faefe3aa5..0a02f0ea86 100644
--- a/src/mlpack/tests/range_search_test.cpp
+++ b/src/mlpack/tests/range_search_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/range_search/range_search.hpp>
+#include <mlpack/methods/range_search.hpp>
 #include <mlpack/methods/range_search/rs_model.hpp>
 
 #include "catch.hpp"
diff --git a/src/mlpack/tests/rectangle_tree_test.cpp b/src/mlpack/tests/rectangle_tree_test.cpp
index 1d5258c635..576da1a41b 100644
--- a/src/mlpack/tests/rectangle_tree_test.cpp
+++ b/src/mlpack/tests/rectangle_tree_test.cpp
@@ -12,7 +12,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 
 #include "catch.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/regularized_svd_test.cpp b/src/mlpack/tests/regularized_svd_test.cpp
index 2be9abc6f0..6601efacd7 100644
--- a/src/mlpack/tests/regularized_svd_test.cpp
+++ b/src/mlpack/tests/regularized_svd_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/regularized_svd/regularized_svd.hpp>
+#include <mlpack/methods/regularized_svd.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/serialization_test.cpp b/src/mlpack/tests/serialization_test.cpp
index 0880514b60..867f0782b9 100644
--- a/src/mlpack/tests/serialization_test.cpp
+++ b/src/mlpack/tests/serialization_test.cpp
@@ -14,18 +14,18 @@
 #include "catch.hpp"
 #include "serialization.hpp"
 
-#include <mlpack/methods/ann/ann.hpp>
-#include <mlpack/methods/hoeffding_trees/hoeffding_trees.hpp>
-#include <mlpack/methods/perceptron/perceptron.hpp>
-#include <mlpack/methods/logistic_regression/logistic_regression.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
-#include <mlpack/methods/softmax_regression/softmax_regression.hpp>
-#include <mlpack/methods/det/det.hpp>
-#include <mlpack/methods/naive_bayes/naive_bayes.hpp>
-#include <mlpack/methods/rann/rann.hpp>
-#include <mlpack/methods/lsh/lsh.hpp>
-#include <mlpack/methods/lars/lars.hpp>
-#include <mlpack/methods/bayesian_linear_regression/bayesian_linear_regression.hpp>
+#include <mlpack/methods/ann.hpp>
+#include <mlpack/methods/hoeffding_trees.hpp>
+#include <mlpack/methods/perceptron.hpp>
+#include <mlpack/methods/logistic_regression.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
+#include <mlpack/methods/softmax_regression.hpp>
+#include <mlpack/methods/det.hpp>
+#include <mlpack/methods/naive_bayes.hpp>
+#include <mlpack/methods/rann.hpp>
+#include <mlpack/methods/lsh.hpp>
+#include <mlpack/methods/lars.hpp>
+#include <mlpack/methods/bayesian_linear_regression.hpp>
 
 using namespace mlpack;
 using namespace mlpack::distribution;
diff --git a/src/mlpack/tests/softmax_regression_test.cpp b/src/mlpack/tests/softmax_regression_test.cpp
index adc457c1e6..d5ce61b1dd 100644
--- a/src/mlpack/tests/softmax_regression_test.cpp
+++ b/src/mlpack/tests/softmax_regression_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/softmax_regression/softmax_regression.hpp>
+#include <mlpack/methods/softmax_regression.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/sparse_autoencoder_test.cpp b/src/mlpack/tests/sparse_autoencoder_test.cpp
index feb65271d6..f8eb76e38d 100644
--- a/src/mlpack/tests/sparse_autoencoder_test.cpp
+++ b/src/mlpack/tests/sparse_autoencoder_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/sparse_autoencoder/sparse_autoencoder.hpp>
+#include <mlpack/methods/sparse_autoencoder.hpp>
 
 #include "catch.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/sparse_coding_test.cpp b/src/mlpack/tests/sparse_coding_test.cpp
index a4a83ac791..d1857d19e7 100644
--- a/src/mlpack/tests/sparse_coding_test.cpp
+++ b/src/mlpack/tests/sparse_coding_test.cpp
@@ -13,7 +13,7 @@
 // to use FPC_WEAK, and it's not at all intuitive how to do that.
 
 #include <mlpack/core.hpp>
-#include <mlpack/methods/sparse_coding/sparse_coding.hpp>
+#include <mlpack/methods/sparse_coding.hpp>
 
 #include "catch.hpp"
 #include "test_catch_tools.hpp"
diff --git a/src/mlpack/tests/svd_batch_test.cpp b/src/mlpack/tests/svd_batch_test.cpp
index baeddf80be..131194230b 100644
--- a/src/mlpack/tests/svd_batch_test.cpp
+++ b/src/mlpack/tests/svd_batch_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/amf/amf.hpp>
+#include <mlpack/methods/amf.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/svd_incremental_test.cpp b/src/mlpack/tests/svd_incremental_test.cpp
index 9e005c89af..07175f8378 100644
--- a/src/mlpack/tests/svd_incremental_test.cpp
+++ b/src/mlpack/tests/svd_incremental_test.cpp
@@ -11,7 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/amf/amf.hpp>
+#include <mlpack/methods/amf.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/svdplusplus_test.cpp b/src/mlpack/tests/svdplusplus_test.cpp
index 6380953de8..8cd30cb8ea 100644
--- a/src/mlpack/tests/svdplusplus_test.cpp
+++ b/src/mlpack/tests/svdplusplus_test.cpp
@@ -11,7 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/svdplusplus/svdplusplus.hpp>
+#include <mlpack/methods/svdplusplus.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/termination_policy_test.cpp b/src/mlpack/tests/termination_policy_test.cpp
index 95535f2003..6bc875acc1 100644
--- a/src/mlpack/tests/termination_policy_test.cpp
+++ b/src/mlpack/tests/termination_policy_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/amf/amf.hpp>
+#include <mlpack/methods/amf.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/ub_tree_test.cpp b/src/mlpack/tests/ub_tree_test.cpp
index a7591ce092..2659568c9d 100644
--- a/src/mlpack/tests/ub_tree_test.cpp
+++ b/src/mlpack/tests/ub_tree_test.cpp
@@ -10,7 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/vantage_point_tree_test.cpp b/src/mlpack/tests/vantage_point_tree_test.cpp
index 8025c6902c..00d027bf06 100644
--- a/src/mlpack/tests/vantage_point_tree_test.cpp
+++ b/src/mlpack/tests/vantage_point_tree_test.cpp
@@ -9,7 +9,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
+#include <mlpack/methods/neighbor_search.hpp>
 
 #include "catch.hpp"
 #include "test_catch_tools.hpp"