diff --git a/messages/messagebuilder.h b/messages/messagebuilder.h
index 5ec2e095..f6c38b06 100644
--- a/messages/messagebuilder.h
+++ b/messages/messagebuilder.h
@@ -2,6 +2,7 @@
 #define MESSAGEBUILDER_H
 
 #include "messages/message.h"
+#include <ctime>
 
 namespace chatterino {
 namespace messages {
diff --git a/platform/borderless/winnativewindow.h b/platform/borderless/winnativewindow.h
index accb9750..3600a881 100644
--- a/platform/borderless/winnativewindow.h
+++ b/platform/borderless/winnativewindow.h
@@ -1,6 +1,7 @@
 #ifndef WINNATIVEWINDOW_H
 #define WINNATIVEWINDOW_H
 
+#define NOMINMAX
 #include "Windows.h"
 #include "Windowsx.h"
 
diff --git a/usermanager.h b/usermanager.h
index d2a3dedd..cb3dab6d 100644
--- a/usermanager.h
+++ b/usermanager.h
@@ -4,6 +4,7 @@
 #include "twitch/twitchuser.h"
 
 #include <mutex>
+#include <vector>
 
 namespace chatterino {
 
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 1a506116..3e003b0d 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -10,6 +10,7 @@
 #include <boost/foreach.hpp>
 
 #ifdef USEWINSDK
+#define NOMINMAX
 #include "Windows.h"
 #endif
 
diff --git a/windowmanager.cpp b/windowmanager.cpp
index da882814..8aa2a7b6 100644
--- a/windowmanager.cpp
+++ b/windowmanager.cpp
@@ -10,8 +10,7 @@ namespace chatterino {
 WindowManager WindowManager::instance;
 
 WindowManager::WindowManager()
-    : _windowMutex()
-    , _mainWindow(nullptr)
+    : _mainWindow(nullptr)
 {
 }
 
@@ -103,7 +102,7 @@ void WindowManager::load()
 
 void WindowManager::save()
 {
-    const auto &settingsPath = getSettingsPath();
+    auto &settingsPath = getSettingsPath();
     boost::property_tree::ptree tree;
 
     // Create windows array