diff --git a/src/mlpack/core/data/dataset.h b/src/mlpack/core/data/dataset.h
index 9b1b11c901..a7068db7e8 100644
--- a/src/mlpack/core/data/dataset.h
+++ b/src/mlpack/core/data/dataset.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "../io/io.h"
+#include "../io/cli.hpp"
 #include "../io/log.h"
 #include "../file/textfile.h"
 #include "../col/tokenizer.h"
diff --git a/src/mlpack/core/data/dataset_feature.h b/src/mlpack/core/data/dataset_feature.h
index d8fce65d34..d90cb76a0d 100644
--- a/src/mlpack/core/data/dataset_feature.h
+++ b/src/mlpack/core/data/dataset_feature.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "../io/io.h"
+#include "../io/cli.hpp"
 #include "../io/log.h"
 #include "../file/textfile.h"
 
diff --git a/src/mlpack/core/file/textfile.cc b/src/mlpack/core/file/textfile.cc
index d1b1c2b95e..2def93d63c 100644
--- a/src/mlpack/core/file/textfile.cc
+++ b/src/mlpack/core/file/textfile.cc
@@ -11,7 +11,7 @@
 
 #include "textfile.h"
 
-#include "../io/io.h"
+#include "../io/cli.hpp"
 #include "../io/log.h"
 #include <ctype.h>
 #include <iostream>
diff --git a/src/mlpack/core/file/textfile.h b/src/mlpack/core/file/textfile.h
index bb76d0addd..a5907d0785 100644
--- a/src/mlpack/core/file/textfile.h
+++ b/src/mlpack/core/file/textfile.h
@@ -13,7 +13,7 @@
 #ifndef FILE_TEXTFILE_H
 #define FILE_TEXTFILE_H
 
-#include "../io/io.h"
+#include "../io/cli.hpp"
 #include "../io/log.h"
 
 #include <cstdio>
diff --git a/src/mlpack/core/math/math_lib.h b/src/mlpack/core/math/math_lib.h
index 595c8c977c..74843fd13a 100644
--- a/src/mlpack/core/math/math_lib.h
+++ b/src/mlpack/core/math/math_lib.h
@@ -7,7 +7,7 @@
 #ifndef MATH_MATH_LIB_H
 #define MATH_MATH_LIB_H
 
-#include "../io/io.h"
+#include "../io/cli.hpp"
 #include "../io/log.h"
 
 #include <math.h>
diff --git a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.h b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.h
index 4e5f08ed9e..5675076ade 100644
--- a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.h
+++ b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.h
@@ -7,7 +7,7 @@
 #ifndef __AUG_LAGRANGIAN_TEST_FUNCTCLINS_H
 #define __AUG_LAGRANGIAN_TEST_FUNCTCLINS_H
 
-#include <mlpack/core/io/io.h>
+#include <mlpack/core/io/cli.hpp>
 #include <mlpack/core/io/log.h>
 #include <armadillo>
 
diff --git a/src/mlpack/core/optimizers/lbfgs/test_functions.h b/src/mlpack/core/optimizers/lbfgs/test_functions.h
index df9af64b46..3ed0b939bd 100644
--- a/src/mlpack/core/optimizers/lbfgs/test_functions.h
+++ b/src/mlpack/core/optimizers/lbfgs/test_functions.h
@@ -15,7 +15,7 @@
 #ifndef __OPTIMIZATCLIN_TEST_FUNCTCLINS_H
 #define __OPTIMIZATCLIN_TEST_FUNCTCLINS_H
 
-#include <mlpack/core/io/io.h>
+#include <mlpack/core/io/cli.hpp>
 #include <mlpack/core/io/log.h>
 
 // To fulfill the template policy class 'FunctionType', we must implement
diff --git a/src/mlpack/core/tree/periodichrectbound_impl.h b/src/mlpack/core/tree/periodichrectbound_impl.h
index ba83d6471d..a4a635ee27 100644
--- a/src/mlpack/core/tree/periodichrectbound_impl.h
+++ b/src/mlpack/core/tree/periodichrectbound_impl.h
@@ -4,8 +4,8 @@
  * Implementation of periodic hyper-rectangle bound policy class.
  * Template parameter t_pow is the metric to use; use 2 for Euclidian (L2).
  */
-#ifndef __MLPACK_CORE_TREE_PERCLIDICHRECTBOUND_IMPL_H
-#define __MLPACK_CORE_TREE_PERCLIDICHRECTBOUND_IMPL_H
+#ifndef __MLPACK_CORE_TREE_PERIODICHRECTBOUND_IMPL_H
+#define __MLPACK_CORE_TREE_PERIODICHRECTBOUND_IMPL_H
 
 // In case it has not already been included.
 #include "periodichrectbound.h"
@@ -13,7 +13,6 @@
 #include <math.h>
 
 #include "../math/math_lib.h"
-#include "../io/io.h"
 #include "../io/log.h"
 
 namespace mlpack {
diff --git a/src/mlpack/core/tree/spacetree_impl.h b/src/mlpack/core/tree/spacetree_impl.h
index 8e519af517..40cc15d059 100644
--- a/src/mlpack/core/tree/spacetree_impl.h
+++ b/src/mlpack/core/tree/spacetree_impl.h
@@ -11,8 +11,8 @@
 
 // In case it wasn't included already for some reason.
 #include "spacetree.h"
-#include <mlpack/core/io/io.h>
-#include "../io/log.h"
+#include <mlpack/core/io/cli.hpp>
+#include <mlpack/core/io/log.h>
 
 namespace mlpack {
 namespace tree {