diff --git a/coding/file_container.hpp b/coding/file_container.hpp
index 355517c767..01da1e670c 100644
--- a/coding/file_container.hpp
+++ b/coding/file_container.hpp
@@ -43,7 +43,7 @@ protected:
 
 class FilesContainerR : public FilesContainerBase
 {
-  typedef public FilesContainerBase base_type;
+  typedef FilesContainerBase base_type;
 
   FileReader m_source;
 
@@ -55,7 +55,7 @@ public:
 
 class FilesContainerW : public FilesContainerBase
 {
-  typedef public FilesContainerBase base_type;
+  typedef FilesContainerBase base_type;
 
   string m_name;
 
diff --git a/coding/file_writer.cpp b/coding/file_writer.cpp
index e4b00db7fb..6952af8bdd 100644
--- a/coding/file_writer.cpp
+++ b/coding/file_writer.cpp
@@ -7,6 +7,11 @@
 #include "../../base/start_mem_debug.hpp"
 
 
+FileWriter::FileWriter(FileWriter & rhs)
+{
+  m_pFileData.swap(rhs.m_pFileData);
+}
+
 FileWriter::FileWriter(string const & fileName, FileWriter::Op op)
   : m_pFileData(new FileData(fileName, static_cast<FileData::Op>(op)))
 {
diff --git a/coding/file_writer.hpp b/coding/file_writer.hpp
index ee0fc129f1..ef155d4e3a 100644
--- a/coding/file_writer.hpp
+++ b/coding/file_writer.hpp
@@ -22,6 +22,8 @@ public:
     // Seek should not be called, if file is opened for append.
     OP_APPEND = 3};
 
+  FileWriter(FileWriter & rhs);
+
   explicit FileWriter(string const & fileName, Op operation = OP_WRITE_TRUNCATE);
   ~FileWriter();