diff --git a/coding/blob_indexer.cpp b/coding/blob_indexer.cpp
index b86c10a5ae..f57ae611d9 100644
--- a/coding/blob_indexer.cpp
+++ b/coding/blob_indexer.cpp
@@ -1,5 +1,6 @@
 #include "blob_indexer.hpp"
 
+/*
 #include "../coding/writer.hpp"
 #include "../coding/write_to_sink.hpp"
 
@@ -70,3 +71,4 @@ BlobIndexer::~BlobIndexer()
     WriteToSink(m_writer, m_blobChunkAndOffset[i]);
   WriteToSink(m_writer, static_cast<uint32_t>(m_blobChunkAndOffset.size()));
 }
+*/
diff --git a/coding/blob_indexer.hpp b/coding/blob_indexer.hpp
index aeaafe0b34..6f131cc87e 100644
--- a/coding/blob_indexer.hpp
+++ b/coding/blob_indexer.hpp
@@ -1,4 +1,6 @@
 #pragma once
+
+/*
 #include "../base/base.hpp"
 
 #include "../std/function.hpp"
@@ -41,3 +43,4 @@ private:
   uint32_t m_maxBlobSize;
   uint32_t m_largeBlobCount;
 };
+*/
diff --git a/coding/blob_storage.cpp b/coding/blob_storage.cpp
index 363e70d006..6bc904933e 100644
--- a/coding/blob_storage.cpp
+++ b/coding/blob_storage.cpp
@@ -1,4 +1,6 @@
 #include "blob_storage.hpp"
+
+/*
 #include "reader.hpp"
 
 // File Format:
@@ -94,3 +96,4 @@ void BlobStorage::GetBlob(uint32_t i, string & blob) const
   else
     blob.assign(data.begin() + blobOffset, data.end());
 }
+*/
diff --git a/coding/blob_storage.hpp b/coding/blob_storage.hpp
index a7b907d1fd..cbf76adbdb 100644
--- a/coding/blob_storage.hpp
+++ b/coding/blob_storage.hpp
@@ -1,4 +1,6 @@
 #pragma once
+
+/*
 #include "dd_vector.hpp"
 #include "polymorph_reader.hpp"
 #include "../std/function.hpp"
@@ -42,3 +44,4 @@ private:
   DDVector<uint32_t, PolymorphReader> m_blobInfo;
   DDVector<uint32_t, PolymorphReader> m_chunkOffset;
 };
+*/
diff --git a/coding/coding.pro b/coding/coding.pro
index 141e512226..9946d2860e 100644
--- a/coding/coding.pro
+++ b/coding/coding.pro
@@ -27,15 +27,15 @@ SOURCES += \
     mmap_reader.cpp \
     reader_streambuf.cpp \
     reader_writer_ops.cpp \
-    blob_indexer.cpp \
-    blob_storage.cpp \
+#    blob_indexer.cpp \
+#    blob_storage.cpp \
     uri.cpp \
     zip_creator.cpp \
     file_name_utils.cpp \
-    varint_vector.cpp \
+#    varint_vector.cpp \
     arithmetic_codec.cpp \
     compressed_bit_vector.cpp \
-    compressed_varnum_vector.cpp \
+#    compressed_varnum_vector.cpp \
     bit_streams.cpp \
 
 HEADERS += \
@@ -91,16 +91,16 @@ HEADERS += \
     reader_streambuf.hpp \
     reader_writer_ops.hpp \
     reader_wrapper.hpp \
-    blob_indexer.hpp \
-    blob_storage.hpp \
+#    blob_indexer.hpp \
+#    blob_storage.hpp \
     uri.hpp \
     zip_creator.hpp \
     file_name_utils.hpp \
     constants.hpp \
     matrix_traversal.hpp \
-    varint_vector.hpp \
+#    varint_vector.hpp \
     arithmetic_codec.hpp \
     compressed_bit_vector.hpp \
-    compressed_varnum_vector.hpp \
+#    compressed_varnum_vector.hpp \
     varint_misc.hpp \
     bit_streams.hpp \
diff --git a/coding/coding_tests/blob_storage_test.cpp b/coding/coding_tests/blob_storage_test.cpp
index bd1f9b5f3f..a6ac4692b3 100644
--- a/coding/coding_tests/blob_storage_test.cpp
+++ b/coding/coding_tests/blob_storage_test.cpp
@@ -1,4 +1,6 @@
 #include "../../testing/testing.hpp"
+
+/*
 #include "../blob_storage.hpp"
 #include "../blob_indexer.hpp"
 
@@ -106,3 +108,4 @@ UNIT_TEST(BlobIndexerSerialTest)
   TEST_EQUAL(GetBlob(bs, 6), "World", ());
   TEST_EQUAL(GetBlob(bs, 7), "!", ());
 }
+*/
diff --git a/coding/coding_tests/coding_tests.pro b/coding/coding_tests/coding_tests.pro
index 84ad73ccb4..c0121aed8d 100644
--- a/coding/coding_tests/coding_tests.pro
+++ b/coding/coding_tests/coding_tests.pro
@@ -17,11 +17,11 @@ SOURCES += ../../testing/testingmain.cpp \
     base64_test.cpp \
     bit_shift_test.cpp \
     bit_streams_test.cpp \
-    blob_storage_test.cpp \
+#    blob_storage_test.cpp \
     bzip2_test.cpp \
     coder_util_test.cpp \
     compressed_bit_vector_test.cpp \
-    compressed_varnum_vector_test.cpp \
+#    compressed_varnum_vector_test.cpp \
     dd_vector_test.cpp \
     diff_test.cpp \
     endianness_test.cpp \
@@ -47,7 +47,7 @@ SOURCES += ../../testing/testingmain.cpp \
     var_record_reader_test.cpp \
     var_serial_vector_test.cpp \
     varint_test.cpp \
-    varint_vector_test.cpp \
+#    varint_vector_test.cpp \
     writer_test.cpp \
     zip_creator_test.cpp \
     zip_reader_test.cpp \
diff --git a/coding/coding_tests/compressed_varnum_vector_test.cpp b/coding/coding_tests/compressed_varnum_vector_test.cpp
index fc7095936a..513ccd1af1 100644
--- a/coding/coding_tests/compressed_varnum_vector_test.cpp
+++ b/coding/coding_tests/compressed_varnum_vector_test.cpp
@@ -1,6 +1,8 @@
 #include "../../testing/testing.hpp"
 
 #include "../compressed_varnum_vector.hpp"
+
+/*
 #include "../reader.hpp"
 #include "../writer.hpp"
 
@@ -76,3 +78,4 @@ UNIT_TEST(CompressedVarnumVector)
     }
   }
 }
+*/
diff --git a/coding/coding_tests/varint_vector_test.cpp b/coding/coding_tests/varint_vector_test.cpp
index f82d079adc..b73c50883b 100644
--- a/coding/coding_tests/varint_vector_test.cpp
+++ b/coding/coding_tests/varint_vector_test.cpp
@@ -1,5 +1,6 @@
 #include "../../testing/testing.hpp"
 
+/*
 #include "../varint_vector.hpp"
 #include "../writer.hpp"
 #include "../reader.hpp"
@@ -164,3 +165,4 @@ UNIT_TEST(VarintVector_Use)
     }
   }
 }
+*/
diff --git a/coding/compressed_varnum_vector.cpp b/coding/compressed_varnum_vector.cpp
index ff5be09073..8bf3322d2f 100644
--- a/coding/compressed_varnum_vector.cpp
+++ b/coding/compressed_varnum_vector.cpp
@@ -1,6 +1,8 @@
+#include "compressed_varnum_vector.hpp"
+
+/*
 #include "arithmetic_codec.hpp"
 #include "bit_streams.hpp"
-#include "compressed_varnum_vector.hpp"
 #include "reader.hpp"
 #include "writer.hpp"
 #include "varint_misc.hpp"
@@ -215,3 +217,4 @@ uint64_t CompressedVarnumVectorReader::Read()
   --m_decodeCtx->m_numsLeftInChunk;
   return num;
 }
+*/
diff --git a/coding/compressed_varnum_vector.hpp b/coding/compressed_varnum_vector.hpp
index 81f5cb8d06..20f55ee5e7 100644
--- a/coding/compressed_varnum_vector.hpp
+++ b/coding/compressed_varnum_vector.hpp
@@ -4,6 +4,7 @@
 
 #pragma once
 
+/*
 #include "../std/function.hpp"
 #include "../std/stdint.hpp"
 #include "../std/vector.hpp"
@@ -56,3 +57,4 @@ private:
   struct DecodeContext;
   DecodeContext * m_decodeCtx;
 };
+*/
diff --git a/coding/varint_vector.cpp b/coding/varint_vector.cpp
index b874e10cf2..7b16526411 100644
--- a/coding/varint_vector.cpp
+++ b/coding/varint_vector.cpp
@@ -1,4 +1,6 @@
 #include "varint_vector.hpp"
+
+/*
 #include "writer.hpp"
 #include "reader.hpp"
 
@@ -205,3 +207,4 @@ void Vector::Read(uint32_t & serialPos, uint64_t & num)
 }
 
 }
+*/
diff --git a/coding/varint_vector.hpp b/coding/varint_vector.hpp
index 8036716a2a..c889b4b476 100644
--- a/coding/varint_vector.hpp
+++ b/coding/varint_vector.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+/*
 #include "../base/base.hpp"
 
 #include "../std/vector.hpp"
@@ -82,3 +83,4 @@ private:
 };
 
 }
+*/