diff --git a/tools/rosbag_storage/include/rosbag/bag.h b/tools/rosbag_storage/include/rosbag/bag.h
index 2e86750398..ebb2ae263f 100644
--- a/tools/rosbag_storage/include/rosbag/bag.h
+++ b/tools/rosbag_storage/include/rosbag/bag.h
@@ -62,7 +62,7 @@
 #include <boost/format.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 
-#include <pluginlib/class_loader.h>
+#include <pluginlib/class_loader.hpp>
 
 #include "console_bridge/console.h"
 #if defined logDebug
diff --git a/tools/rosbag_storage/src/aes_encryptor.cpp b/tools/rosbag_storage/src/aes_encryptor.cpp
index 15272e3b6d..e0fcb807e5 100644
--- a/tools/rosbag_storage/src/aes_encryptor.cpp
+++ b/tools/rosbag_storage/src/aes_encryptor.cpp
@@ -37,7 +37,7 @@
 
 #include <openssl/rand.h>
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 PLUGINLIB_EXPORT_CLASS(rosbag::AesCbcEncryptor, rosbag::EncryptorBase)
 
diff --git a/tools/rosbag_storage/src/bag.cpp b/tools/rosbag_storage/src/bag.cpp
index 5f62ebd318..7e2e67171a 100644
--- a/tools/rosbag_storage/src/bag.cpp
+++ b/tools/rosbag_storage/src/bag.cpp
@@ -70,7 +70,7 @@ Bag::Bag(string const& filename, uint32_t mode) : encryptor_loader_("rosbag_stor
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 
-Bag::Bag(Bag&& other) {
+Bag::Bag(Bag&& other) : encryptor_loader_("rosbag_storage", "rosbag::EncryptorBase") {
     init();
     swap(other);
 }
@@ -1178,6 +1178,7 @@ void Bag::swap(Bag& other) {
     swap(outgoing_chunk_buffer_, other.outgoing_chunk_buffer_);
     swap(current_buffer_, other.current_buffer_);
     swap(decompressed_chunk_, other.decompressed_chunk_);
+    swap(encryptor_, other.encryptor_);
 }
 
 bool Bag::isOpen() const { return file_.isOpen(); }
diff --git a/tools/rosbag_storage/src/encryptor.cpp b/tools/rosbag_storage/src/encryptor.cpp
index 4f9dccf17c..17c62815d6 100644
--- a/tools/rosbag_storage/src/encryptor.cpp
+++ b/tools/rosbag_storage/src/encryptor.cpp
@@ -34,7 +34,7 @@
 
 #include "rosbag/encryptor.h"
 
-#include <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 
 PLUGINLIB_EXPORT_CLASS(rosbag::NoEncryptor, rosbag::EncryptorBase)