diff --git a/twitch/twitchaccount.cpp b/twitch/twitchaccount.cpp
index 484fa25e..631eb108 100644
--- a/twitch/twitchaccount.cpp
+++ b/twitch/twitchaccount.cpp
@@ -5,9 +5,9 @@ namespace twitch {
 TwitchUser::TwitchUser(const QString &username, const QString &oauthToken,
                        const QString &oauthClient)
     : IrcUser2(username, username, username, "oauth:" + oauthToken)
+    , _oauthClient(oauthClient)
+    , _oauthToken(oauthToken)
 {
-    _oauthClient = oauthClient;
-    _oauthToken = oauthToken;
 }
 
 const QString &TwitchUser::getOAuthClient() const
diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h
index 61d00c54..49064052 100644
--- a/widgets/mainwindow.h
+++ b/widgets/mainwindow.h
@@ -4,7 +4,10 @@
 #include "widgets/notebook.h"
 #include "widgets/titlebar.h"
 
+#ifdef USEWINSDK
 #include <platform/borderless/qwinwidget.h>
+#endif
+
 #include <QMainWindow>
 #include <boost/property_tree/ptree.hpp>