diff --git a/examples/cifar10/convert_cifar_data.cpp b/examples/cifar10/convert_cifar_data.cpp
index 3091a9a2..e8df0c8d 100644
--- a/examples/cifar10/convert_cifar_data.cpp
+++ b/examples/cifar10/convert_cifar_data.cpp
@@ -109,4 +109,3 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
diff --git a/examples/cpp_classification/classification.cpp b/examples/cpp_classification/classification.cpp
index be120a58..0508ba69 100644
--- a/examples/cpp_classification/classification.cpp
+++ b/examples/cpp_classification/classification.cpp
@@ -264,4 +264,3 @@ int main(int argc, char** argv) {
 }
 #endif  // USE_OPENCV
 
-#include "caffe/data_reader_hack.inl"
diff --git a/examples/mnist/convert_mnist_data.cpp b/examples/mnist/convert_mnist_data.cpp
index 0cca3cf7..36f24c15 100644
--- a/examples/mnist/convert_mnist_data.cpp
+++ b/examples/mnist/convert_mnist_data.cpp
@@ -146,4 +146,3 @@ int main(int argc, char** argv) {
 }
 #endif  // USE_LEVELDB and USE_LMDB
 
-#include "caffe/data_reader_hack.inl"
diff --git a/examples/siamese/convert_mnist_siamese_data.cpp b/examples/siamese/convert_mnist_siamese_data.cpp
index 41ed4b7c..f533f7e2 100644
--- a/examples/siamese/convert_mnist_siamese_data.cpp
+++ b/examples/siamese/convert_mnist_siamese_data.cpp
@@ -128,4 +128,3 @@ int main(int argc, char** argv) {
 }
 #endif  // USE_LEVELDB
 
-#include "caffe/data_reader_hack.inl"
diff --git a/include/caffe/data_reader_hack.inl b/include/caffe/data_reader_hack.inl
deleted file mode 100644
index ee4ef02d..00000000
--- a/include/caffe/data_reader_hack.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-// HACK for initializing DataReader::bodies_
-
-#include <boost/thread.hpp>
-#include <map>
-#include <string>
-#include <vector>
-
-#include "caffe/common.hpp"
-#include "caffe/data_reader.hpp"
-#include "caffe/layers/data_layer.hpp"
-#include "caffe/proto/caffe.pb.h"
-
-namespace caffe {
-
-  using boost::weak_ptr;
-
-  map<const string, weak_ptr<DataReader::Body> > DataReader::bodies_;
-} // namespace caffe
diff --git a/src/caffe/data_reader.cpp b/src/caffe/data_reader.cpp
index e2df9558..9f019bbf 100644
--- a/src/caffe/data_reader.cpp
+++ b/src/caffe/data_reader.cpp
@@ -12,7 +12,7 @@ namespace caffe {
 
 using boost::weak_ptr;
 
-//map<const string, weak_ptr<DataReader::Body> > DataReader::bodies_;
+map<const string, weak_ptr<DataReader::Body> > DataReader::bodies_;
 static boost::mutex bodies_mutex_;
 
 DataReader::DataReader(const LayerParameter& param)
diff --git a/tools/caffe.cpp b/tools/caffe.cpp
index 8336f089..14d6d079 100644
--- a/tools/caffe.cpp
+++ b/tools/caffe.cpp
@@ -452,5 +452,4 @@ int main(int argc, char** argv) {
   }
 }
 
-#include "caffe/data_reader_hack.inl"
 
diff --git a/tools/compute_image_mean.cpp b/tools/compute_image_mean.cpp
index eb2ff5b9..76647e6a 100644
--- a/tools/compute_image_mean.cpp
+++ b/tools/compute_image_mean.cpp
@@ -122,4 +122,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/convert_imageset.cpp b/tools/convert_imageset.cpp
index 9672f9f4..e56a3532 100644
--- a/tools/convert_imageset.cpp
+++ b/tools/convert_imageset.cpp
@@ -158,4 +158,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/device_query.cpp b/tools/device_query.cpp
index 55c2c822..344b7b6d 100644
--- a/tools/device_query.cpp
+++ b/tools/device_query.cpp
@@ -6,4 +6,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/extract_features.cpp b/tools/extract_features.cpp
index 88649803..45364b2e 100644
--- a/tools/extract_features.cpp
+++ b/tools/extract_features.cpp
@@ -182,4 +182,4 @@ int feature_extraction_pipeline(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/finetune_net.cpp b/tools/finetune_net.cpp
index ab934cc5..603380cc 100644
--- a/tools/finetune_net.cpp
+++ b/tools/finetune_net.cpp
@@ -6,4 +6,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/net_speed_benchmark.cpp b/tools/net_speed_benchmark.cpp
index e5600ff2..3dee8f4e 100644
--- a/tools/net_speed_benchmark.cpp
+++ b/tools/net_speed_benchmark.cpp
@@ -6,4 +6,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/test_net.cpp b/tools/test_net.cpp
index 74fbdecf..896734d0 100644
--- a/tools/test_net.cpp
+++ b/tools/test_net.cpp
@@ -6,4 +6,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/train_net.cpp b/tools/train_net.cpp
index 3d8f9772..03d368bf 100644
--- a/tools/train_net.cpp
+++ b/tools/train_net.cpp
@@ -6,4 +6,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/upgrade_net_proto_binary.cpp b/tools/upgrade_net_proto_binary.cpp
index ddf3d95d..426a419a 100644
--- a/tools/upgrade_net_proto_binary.cpp
+++ b/tools/upgrade_net_proto_binary.cpp
@@ -49,4 +49,4 @@ int main(int argc, char** argv) {
   return !success;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/upgrade_net_proto_text.cpp b/tools/upgrade_net_proto_text.cpp
index 7d6355e1..6151cdb2 100644
--- a/tools/upgrade_net_proto_text.cpp
+++ b/tools/upgrade_net_proto_text.cpp
@@ -50,4 +50,3 @@ int main(int argc, char** argv) {
   return !success;
 }
 
-#include "caffe/data_reader_hack.inl"
diff --git a/tools/upgrade_solver_proto_text.cpp b/tools/upgrade_solver_proto_text.cpp
index b200f3fa..fd49155e 100644
--- a/tools/upgrade_solver_proto_text.cpp
+++ b/tools/upgrade_solver_proto_text.cpp
@@ -50,4 +50,3 @@ int main(int argc, char** argv) {
   return !success;
 }
 
-#include "caffe/data_reader_hack.inl"