Merge pull request #721 from yuriks/more-cleanups

More cleanups

3 files changed, 6 insertions, 3 deletions

diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 2c6ced920..1d7e7f270 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -4,7 +4,7 @@
 
 #include <thread>
 
-#include "common/common.h"
+#include "common/logging/log.h"
 #include "common/logging/text_formatter.h"
 #include "common/logging/backend.h"
 #include "common/logging/filter.h"
@@ -19,7 +19,7 @@
 #include "citra/emu_window/emu_window_glfw.h"
 
 /// Application entry point
-int __cdecl main(int argc, char **argv) {
+int main(int argc, char **argv) {
     std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger();
     Log::Filter log_filter(Log::Level::Debug);
     Log::SetFilter(&log_filter);
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 43175d6cb..ab564559d 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -5,7 +5,10 @@
 #include <GLFW/glfw3.h>
 
 #include "citra/default_ini.h"
+
 #include "common/file_util.h"
+#include "common/logging/log.h"
+
 #include "core/settings.h"
 #include "core/core.h"
 
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index f879ee7ca..341b48d2a 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -4,7 +4,7 @@
 
 #include <GLFW/glfw3.h>
 
-#include "common/common.h"
+#include "common/logging/log.h"
 
 #include "video_core/video_core.h"