diff --git a/src/mlpack/methods/ann/layer/constant_layer.hpp b/src/mlpack/methods/ann/layer/constant_layer.hpp
index a142a67856..67701deba9 100644
--- a/src/mlpack/methods/ann/layer/constant_layer.hpp
+++ b/src/mlpack/methods/ann/layer/constant_layer.hpp
@@ -5,8 +5,8 @@
  * Definition of the ConstantLayer class, which outputs a constant value given
  * any input.
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_CONSTANT_LAYER_HPP
-#define __MLPACK_METHODS_ANN_LAYER_CONSTANT_LAYER_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_CONSTANT_LAYER_HPP
+#define MLPACK_METHODS_ANN_LAYER_CONSTANT_LAYER_HPP
 
 #include <mlpack/core.hpp>
 
diff --git a/src/mlpack/methods/ann/layer/dropconnect_layer.hpp b/src/mlpack/methods/ann/layer/dropconnect_layer.hpp
index a1d19e04de..651a8a7ab7 100644
--- a/src/mlpack/methods/ann/layer/dropconnect_layer.hpp
+++ b/src/mlpack/methods/ann/layer/dropconnect_layer.hpp
@@ -5,8 +5,8 @@
  * Definition of the DropConnectLayer class, which implements a regularizer
  * that randomly sets connections to zero. Preventing units from co-adapting.
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_DROPCONNECT_LAYER_HPP
-#define __MLPACK_METHODS_ANN_LAYER_DROPCONNECT_LAYER_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_DROPCONNECT_LAYER_HPP
+#define MLPACK_METHODS_ANN_LAYER_DROPCONNECT_LAYER_HPP
 
 #include <mlpack/core.hpp>
 
diff --git a/src/mlpack/methods/ann/layer/empty_layer.hpp b/src/mlpack/methods/ann/layer/empty_layer.hpp
index 9e41a08440..11cb6a0a24 100644
--- a/src/mlpack/methods/ann/layer/empty_layer.hpp
+++ b/src/mlpack/methods/ann/layer/empty_layer.hpp
@@ -4,8 +4,8 @@
  *
  * Definition of the EmptyLayer class, which is basically empty.
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_EMPTY_LAYER_HPP
-#define __MLPACK_METHODS_ANN_LAYER_EMPTY_LAYER_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_EMPTY_LAYER_HPP
+#define MLPACK_METHODS_ANN_LAYER_EMPTY_LAYER_HPP
 
 namespace mlpack{
 namespace ann /** Artificial Neural Network. */ {
diff --git a/src/mlpack/methods/ann/layer/glimpse_layer.hpp b/src/mlpack/methods/ann/layer/glimpse_layer.hpp
index 25ebfa5db9..228ce7d494 100644
--- a/src/mlpack/methods/ann/layer/glimpse_layer.hpp
+++ b/src/mlpack/methods/ann/layer/glimpse_layer.hpp
@@ -18,8 +18,8 @@
  * }
  * @endcode
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_GLIMPSE_LAYER_HPP
-#define __MLPACK_METHODS_ANN_LAYER_GLIMPSE_LAYER_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_GLIMPSE_LAYER_HPP
+#define MLPACK_METHODS_ANN_LAYER_GLIMPSE_LAYER_HPP
 
 #include <mlpack/core.hpp>
 #include <mlpack/methods/ann/pooling_rules/mean_pooling.hpp>
diff --git a/src/mlpack/methods/ann/layer/hard_tanh_layer.hpp b/src/mlpack/methods/ann/layer/hard_tanh_layer.hpp
index 68b6bca1ed..16167a5968 100644
--- a/src/mlpack/methods/ann/layer/hard_tanh_layer.hpp
+++ b/src/mlpack/methods/ann/layer/hard_tanh_layer.hpp
@@ -4,8 +4,8 @@
  *
  * Definition and implementation of the HardTanHLayer layer.
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_HARD_TANH_LAYER_HPP
-#define __MLPACK_METHODS_ANN_LAYER_HARD_TANH_LAYER_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_HARD_TANH_LAYER_HPP
+#define MLPACK_METHODS_ANN_LAYER_HARD_TANH_LAYER_HPP
 
 #include <mlpack/core.hpp>
 
diff --git a/src/mlpack/methods/ann/layer/leaky_relu_layer.hpp b/src/mlpack/methods/ann/layer/leaky_relu_layer.hpp
index 9676c49c49..a55bd2582c 100644
--- a/src/mlpack/methods/ann/layer/leaky_relu_layer.hpp
+++ b/src/mlpack/methods/ann/layer/leaky_relu_layer.hpp
@@ -6,8 +6,8 @@
  * in the acoustic model, Andrew L. Maas, Awni Y. Hannun, Andrew Y. Ng,
  * "Rectifier Nonlinearities Improve Neural Network Acoustic Models", 2014
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_LEAKYRELU_LAYER_HPP
-#define __MLPACK_METHODS_ANN_LAYER_LEAKYRELU_LAYER_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_LEAKYRELU_LAYER_HPP
+#define MLPACK_METHODS_ANN_LAYER_LEAKYRELU_LAYER_HPP
 
 #include <mlpack/core.hpp>
 
diff --git a/src/mlpack/methods/ann/layer/log_softmax_layer.hpp b/src/mlpack/methods/ann/layer/log_softmax_layer.hpp
index 53a135af5c..1820f45483 100644
--- a/src/mlpack/methods/ann/layer/log_softmax_layer.hpp
+++ b/src/mlpack/methods/ann/layer/log_softmax_layer.hpp
@@ -4,8 +4,8 @@
  *
  * Definition of the LogSoftmaxLayer class.
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_LOG_SOFTMAX_LAYER_HPP
-#define __MLPACK_METHODS_ANN_LAYER_LOG_SOFTMAX_LAYER_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_LOG_SOFTMAX_LAYER_HPP
+#define MLPACK_METHODS_ANN_LAYER_LOG_SOFTMAX_LAYER_HPP
 
 #include <mlpack/core.hpp>
 
diff --git a/src/mlpack/methods/ann/layer/multiply_constant_layer.hpp b/src/mlpack/methods/ann/layer/multiply_constant_layer.hpp
index 78c42e9e03..b15d23c246 100644
--- a/src/mlpack/methods/ann/layer/multiply_constant_layer.hpp
+++ b/src/mlpack/methods/ann/layer/multiply_constant_layer.hpp
@@ -5,8 +5,8 @@
  * Definition of the MultiplyConstantLayer class, which multiplies the input by
  * a (non-learnable) constant.
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_MULTIPLY_CONSTANT_LAYER_HPP
-#define __MLPACK_METHODS_ANN_LAYER_MULTIPLY_CONSTANT_LAYER_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_MULTIPLY_CONSTANT_LAYER_HPP
+#define MLPACK_METHODS_ANN_LAYER_MULTIPLY_CONSTANT_LAYER_HPP
 
 #include <mlpack/core.hpp>
 
diff --git a/src/mlpack/methods/ann/layer/negative_log_likelihood_layer.hpp b/src/mlpack/methods/ann/layer/negative_log_likelihood_layer.hpp
index 27a337e81f..d2f1f51108 100644
--- a/src/mlpack/methods/ann/layer/negative_log_likelihood_layer.hpp
+++ b/src/mlpack/methods/ann/layer/negative_log_likelihood_layer.hpp
@@ -4,8 +4,8 @@
  *
  * Definition of the NegativeLogLikelihoodLayer class.
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_NEGATIVE_LOG_LIKELIHOOD_Layer_HPP
-#define __MLPACK_METHODS_ANN_LAYER_NEGATIVE_LOG_LIKELIHOOD_Layer_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_NEGATIVE_LOG_LIKELIHOOD_Layer_HPP
+#define MLPACK_METHODS_ANN_LAYER_NEGATIVE_LOG_LIKELIHOOD_Layer_HPP
 
 #include <mlpack/core.hpp>
 
diff --git a/src/mlpack/methods/ann/layer/reinforce_normal_layer.hpp b/src/mlpack/methods/ann/layer/reinforce_normal_layer.hpp
index e5cd7373f1..7dbe089b79 100644
--- a/src/mlpack/methods/ann/layer/reinforce_normal_layer.hpp
+++ b/src/mlpack/methods/ann/layer/reinforce_normal_layer.hpp
@@ -5,8 +5,8 @@
  * Definition of the ReinforceNormalLayer class, which implements the REINFORCE
  * algorithm for the normal distribution.
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_REINFORCE_NORMAL_LAYER_HPP
-#define __MLPACK_METHODS_ANN_LAYER_REINFORCE_NORMAL_LAYER_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_REINFORCE_NORMAL_LAYER_HPP
+#define MLPACK_METHODS_ANN_LAYER_REINFORCE_NORMAL_LAYER_HPP
 
 #include <mlpack/core.hpp>
 
diff --git a/src/mlpack/methods/ann/layer/vr_class_reward_layer.hpp b/src/mlpack/methods/ann/layer/vr_class_reward_layer.hpp
index 09e55b5acd..95692f0957 100644
--- a/src/mlpack/methods/ann/layer/vr_class_reward_layer.hpp
+++ b/src/mlpack/methods/ann/layer/vr_class_reward_layer.hpp
@@ -5,8 +5,8 @@
  * Definition of the VRClassRewardLayer class, which implements the variance
  * reduced classification reinforcement layer.
  */
-#ifndef __MLPACK_METHODS_ANN_LAYER_VR_CLASS_REWARD_LAYER_HPP
-#define __MLPACK_METHODS_ANN_LAYER_VR_CLASS_REWARD_LAYER_HPP
+#ifndef MLPACK_METHODS_ANN_LAYER_VR_CLASS_REWARD_LAYER_HPP
+#define MLPACK_METHODS_ANN_LAYER_VR_CLASS_REWARD_LAYER_HPP
 
 #include <mlpack/core.hpp>