diff --git a/repertory/librepertory/src/file_manager/open_file_base.cpp b/repertory/librepertory/src/file_manager/open_file_base.cpp
index 12b2b500..f8e073c8 100644
--- a/repertory/librepertory/src/file_manager/open_file_base.cpp
+++ b/repertory/librepertory/src/file_manager/open_file_base.cpp
@@ -21,6 +21,7 @@
 */
 #include "file_manager/open_file_base.hpp"
 
+#include "events/event_system.hpp"
 #include "file_manager/events.hpp"
 #include "providers/i_provider.hpp"
 #include "utils/path.hpp"
diff --git a/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp b/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp
index 12a082bf..fe2d8913 100644
--- a/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp
+++ b/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp
@@ -103,7 +103,7 @@ ring_buffer_open_file::~ring_buffer_open_file() {
   }
 }
 
-auto r::ring_buffer_open_file::download_chunk(std::size_t chunk) -> api_error {
+auto ring_buffer_open_file::download_chunk(std::size_t chunk) -> api_error {
   unique_mutex_lock chunk_lock(chunk_mtx_);
   if (active_downloads_.find(chunk) != active_downloads_.end()) {
     auto active_download = active_downloads_.at(chunk);
diff --git a/repertory/librepertory/src/file_manager/upload.cpp b/repertory/librepertory/src/file_manager/upload.cpp
index 815f7d23..25b39168 100644
--- a/repertory/librepertory/src/file_manager/upload.cpp
+++ b/repertory/librepertory/src/file_manager/upload.cpp
@@ -21,34 +21,33 @@
 */
 #include "file_manager/upload.hpp"
 
-#include "platform/platform.hpp"
+#include "events/event_system.hpp"
+#include "file_manager/events.hpp"
 #include "providers/i_provider.hpp"
 #include "utils/error_utils.hpp"
 #include "utils/file_utils.hpp"
 
 namespace repertory {
-using std::bind;
-
-file_manager::upload::upload(filesystem_item fsi, i_provider &provider)
+upload::upload(filesystem_item fsi, i_provider &provider)
     : fsi_(std::move(fsi)), provider_(provider) {
   thread_ = std::make_unique<std::thread>([this] { upload_thread(); });
 }
 
-file_manager::upload::~upload() {
+upload::~upload() {
   stop();
 
   thread_->join();
   thread_.reset();
 }
 
-void file_manager::upload::cancel() {
+void upload::cancel() {
   cancelled_ = true;
   stop();
 }
 
-void file_manager::upload::stop() { stop_requested_ = true; }
+void upload::stop() { stop_requested_ = true; }
 
-void file_manager::upload::upload_thread() {
+void upload::upload_thread() {
   REPERTORY_USES_FUNCTION_NAME();
 
   error_ =