123 files changed, 1320 insertions, 675 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 41b62ac16..f2aeb510e 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -23,7 +23,7 @@ int __cdecl main(int argc, char **argv) {
    }
    Config config;
-    
    if (!Settings::values.enable_log)
        LogManager::Shutdown();
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 0c774bbc5..8efb39e2e 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
+#include <GLFW/glfw3.h>
 #include "common/common.h"
 #include "video_core/video_core.h"
@@ -10,22 +12,21 @@
 #include "citra/emu_window/emu_window_glfw.h"
+EmuWindow_GLFW* EmuWindow_GLFW::GetEmuWindow(GLFWwindow* win) {
+    return static_cast<EmuWindow_GLFW*>(glfwGetWindowUserPointer(win));
+}
 /// Called by GLFW when a key event occurs
 void EmuWindow_GLFW::OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods) {
-    if (!VideoCore::g_emu_window) {
+    int keyboard_id = GetEmuWindow(win)->keyboard_id;
-        return;
-    }
-    int keyboard_id = ((EmuWindow_GLFW*)VideoCore::g_emu_window)->keyboard_id;
    if (action == GLFW_PRESS) {
        EmuWindow::KeyPressed({key, keyboard_id});
-    }
+    } else if (action == GLFW_RELEASE) {
-    if (action == GLFW_RELEASE) {
        EmuWindow::KeyReleased({key, keyboard_id});
    }
    HID_User::PadUpdateComplete();
 }
@@ -34,6 +35,23 @@ const bool EmuWindow_GLFW::IsOpen() {
    return glfwWindowShouldClose(m_render_window) == 0;
 }
+void EmuWindow_GLFW::OnFramebufferResizeEvent(GLFWwindow* win, int width, int height) {
+    _dbg_assert_(GUI, width > 0);
+    _dbg_assert_(GUI, height > 0);
+    GetEmuWindow(win)->NotifyFramebufferSizeChanged(std::pair<unsigned,unsigned>(width, height));
+}
+void EmuWindow_GLFW::OnClientAreaResizeEvent(GLFWwindow* win, int width, int height) {
+    _dbg_assert_(GUI, width > 0);
+    _dbg_assert_(GUI, height > 0);
+    // NOTE: GLFW provides no proper way to set a minimal window size.
+    //       Hence, we just ignore the corresponding EmuWindow hint.
+    GetEmuWindow(win)->NotifyClientAreaSizeChanged(std::pair<unsigned,unsigned>(width, height));
+}
 /// EmuWindow_GLFW constructor
 EmuWindow_GLFW::EmuWindow_GLFW() {
    keyboard_id = KeyMap::NewDeviceId();
@@ -50,19 +68,31 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
    // GLFW on OSX requires these window hints to be set to create a 3.2+ GL context.
    glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-        
-    m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, 
+    std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc);
-        (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), 
+    m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
-        m_window_title.c_str(), NULL, NULL);
+        (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
+        window_title.c_str(), NULL, NULL);
    if (m_render_window == NULL) {
        printf("Failed to create GLFW window! Exiting...");
        exit(1);
    }
-    
-    // Setup callbacks
    glfwSetWindowUserPointer(m_render_window, this);
+    // Notify base interface about window state
+    int width, height;
+    glfwGetFramebufferSize(m_render_window, &width, &height);
+    OnFramebufferResizeEvent(m_render_window, width, height);
+    glfwGetWindowSize(m_render_window, &width, &height);
+    OnClientAreaResizeEvent(m_render_window, width, height);
+    // Setup callbacks
    glfwSetKeyCallback(m_render_window, OnKeyEvent);
+    glfwSetFramebufferSizeCallback(m_render_window, OnFramebufferResizeEvent);
+    glfwSetWindowSizeCallback(m_render_window, OnClientAreaResizeEvent);
    DoneCurrent();
 }
@@ -110,3 +140,15 @@ void EmuWindow_GLFW::ReloadSetKeymaps() {
    KeyMap::SetKeyMapping({Settings::values.pad_sup_key,    keyboard_id}, HID_User::PAD_CIRCLE_UP);
    KeyMap::SetKeyMapping({Settings::values.pad_sdown_key,  keyboard_id}, HID_User::PAD_CIRCLE_DOWN);
 }
+void EmuWindow_GLFW::OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) {
+    std::pair<int,int> current_size;
+    glfwGetWindowSize(m_render_window, &current_size.first, &current_size.second);
+    _dbg_assert_(GUI, (int)minimal_size.first > 0 && (int)minimal_size.second > 0);
+    int new_width  = std::max(current_size.first,  (int)minimal_size.first);
+    int new_height = std::max(current_size.second, (int)minimal_size.second);
+    if (current_size != std::make_pair(new_width, new_height))
+        glfwSetWindowSize(m_render_window, new_width, new_height);
+}
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h
index 7c3072145..5b04e87bb 100644
--- a/src/citra/emu_window/emu_window_glfw.h
+++ b/src/citra/emu_window/emu_window_glfw.h
@@ -4,10 +4,10 @@
 #pragma once
-#include <GLFW/glfw3.h>
 #include "common/emu_window.h"
+struct GLFWwindow;
 class EmuWindow_GLFW : public EmuWindow {
 public:
    EmuWindow_GLFW();
@@ -16,12 +16,12 @@ public:
    /// Swap buffers to display the next frame
    void SwapBuffers() override;
-        /// Polls window events
+    /// Polls window events
-        void PollEvents() override;
+    void PollEvents() override;
    /// Makes the graphics context current for the caller thread
    void MakeCurrent() override;
-    
    /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
    void DoneCurrent() override;
@@ -30,9 +30,17 @@ public:
    /// Whether the window is still open, and a close request hasn't yet been sent
    const bool IsOpen();
+    static void OnClientAreaResizeEvent(GLFWwindow* win, int width, int height);
+    static void OnFramebufferResizeEvent(GLFWwindow* win, int width, int height);
    void ReloadSetKeymaps() override;
 private:
+    void OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) override;
+    static EmuWindow_GLFW* GetEmuWindow(GLFWwindow* win);
    GLFWwindow* m_render_window; ///< Internal GLFW render window
    /// Device id of keyboard for use with KeyMap
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 20824692d..9bf079919 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -2,6 +2,12 @@
 #include <QKeyEvent>
 #include <QApplication>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+// Required for screen DPI information
+#include <QScreen>
+#include <QWindow>
+#endif
 #include "common/common.h"
 #include "bootmanager.hxx"
@@ -17,7 +23,7 @@
 #define APP_TITLE       APP_NAME " " APP_VERSION
 #define COPYRIGHT       "Copyright (C) 2013-2014 Citra Team"
-EmuThread::EmuThread(GRenderWindow* render_window) : 
+EmuThread::EmuThread(GRenderWindow* render_window) :
    filename(""), exec_cpu_step(false), cpu_running(false),
    stop_run(false), render_window(render_window)
 {
@@ -36,7 +42,7 @@ void EmuThread::run()
        if (cpu_running)
        {
            Core::RunLoop();
-        } 
+        }
        else if (exec_cpu_step)
        {
            exec_cpu_step = false;
@@ -82,20 +88,20 @@ void EmuThread::Stop()
 class GGLWidgetInternal : public QGLWidget
 {
 public:
-    GGLWidgetInternal(QGLFormat fmt, GRenderWindow* parent) : QGLWidget(fmt, parent)
+    GGLWidgetInternal(QGLFormat fmt, GRenderWindow* parent)
-    {
+                     : QGLWidget(fmt, parent), parent(parent) {
-        parent_ = parent;
    }
-    void paintEvent(QPaintEvent* ev) override
+    void paintEvent(QPaintEvent* ev) override {
-    {
    }
    void resizeEvent(QResizeEvent* ev) override {
-        parent_->SetClientAreaWidth(size().width());
+        parent->OnClientAreaResized(ev->size().width(), ev->size().height());
-        parent_->SetClientAreaHeight(size().height());
+        parent->OnFramebufferSizeChanged();
    }
 private:
-    GRenderWindow* parent_;
+    GRenderWindow* parent;
 };
 EmuThread& GRenderWindow::GetEmuThread()
@@ -105,6 +111,9 @@ EmuThread& GRenderWindow::GetEmuThread()
 GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this), keyboard_id(0)
 {
+    std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc);
+    setWindowTitle(QString::fromStdString(window_title));
    keyboard_id = KeyMap::NewDeviceId();
    ReloadSetKeymaps();
@@ -114,16 +123,25 @@ GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this
    fmt.setProfile(QGLFormat::CoreProfile);
    // Requests a forward-compatible context, which is required to get a 3.2+ context on OS X
    fmt.setOption(QGL::NoDeprecatedFunctions);
-    
    child = new GGLWidgetInternal(fmt, this);
    QBoxLayout* layout = new QHBoxLayout(this);
    resize(VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight);
    layout->addWidget(child);
    layout->setMargin(0);
    setLayout(layout);
-    QObject::connect(&emu_thread, SIGNAL(started()), this, SLOT(moveContext()));
+    connect(&emu_thread, SIGNAL(started()), this, SLOT(moveContext()));
+    OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
+    OnFramebufferSizeChanged();
+    NotifyClientAreaSizeChanged(std::pair<unsigned,unsigned>(child->width(), child->height()));
    BackupGeometry();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    connect(this->windowHandle(), SIGNAL(screenChanged(QScreen*)), this, SLOT(OnFramebufferSizeChanged()));
+#endif
 }
 void GRenderWindow::moveContext()
@@ -166,14 +184,28 @@ void GRenderWindow::DoneCurrent()
 }
 void GRenderWindow::PollEvents() {
-    // TODO(ShizZy): Does this belong here? This is a reasonable place to update the window title
+}
-    //  from the main thread, but this should probably be in an event handler...
-    /*
+// On Qt 5.0+, this correctly gets the size of the framebuffer (pixels).
-    static char title[128];
+//
-    sprintf(title, "%s (FPS: %02.02f)", window_title_.c_str(), 
+// Older versions get the window size (density independent pixels),
-        video_core::g_renderer->current_fps());
+// and hence, do not support DPI scaling ("retina" displays).
-    setWindowTitle(title);
+// The result will be a viewport that is smaller than the extent of the window.
-    */
+void GRenderWindow::OnFramebufferSizeChanged()
+{
+    // Screen changes potentially incur a change in screen DPI, hence we should update the framebuffer size
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    // windowHandle() might not be accessible until the window is displayed to screen.
+    auto pixel_ratio = windowHandle() ? (windowHandle()->screen()->devicePixelRatio()) : 1.0;
+    unsigned width = child->QPaintDevice::width() * pixel_ratio;
+    unsigned height = child->QPaintDevice::height() * pixel_ratio;
+#else
+    unsigned width = child->QPaintDevice::width();
+    unsigned height = child->QPaintDevice::height();
+#endif
+    NotifyFramebufferSizeChanged(std::make_pair(width, height));
 }
 void GRenderWindow::BackupGeometry()
@@ -236,3 +268,11 @@ void GRenderWindow::ReloadSetKeymaps()
    KeyMap::SetKeyMapping({Settings::values.pad_sdown_key,  keyboard_id}, HID_User::PAD_CIRCLE_DOWN);
 }
+void GRenderWindow::OnClientAreaResized(unsigned width, unsigned height)
+{
+    NotifyClientAreaSizeChanged(std::make_pair(width, height));
+}
+void GRenderWindow::OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) {
+    setMinimumSize(minimal_size.first, minimal_size.second);
+}
diff --git a/src/citra_qt/bootmanager.hxx b/src/citra_qt/bootmanager.hxx
index f8afc403e..5f69f15ea 100644
--- a/src/citra_qt/bootmanager.hxx
+++ b/src/citra_qt/bootmanager.hxx
@@ -1,12 +1,16 @@
+#include <atomic>
 #include <QThread>
 #include <QGLWidget>
-#include <atomic>
 #include "common/common.h"
 #include "common/emu_window.h"
-class GRenderWindow;
+class QScreen;
 class QKeyEvent;
+class GRenderWindow;
 class EmuThread : public QThread
 {
    Q_OBJECT
@@ -14,7 +18,7 @@ class EmuThread : public QThread
 public:
    /**
     * Set image filename
-     * 
+     *
     * @param filename
     * @warning Only call when not running!
     */
@@ -74,7 +78,7 @@ private:
 signals:
    /**
     * Emitted when CPU when we've finished processing a single Gekko instruction
-     * 
+     *
     * @warning This will only be emitted when the CPU is not running (SetCpuRunning(false))
     * @warning When connecting to this signal from other threads, make sure to specify either Qt::QueuedConnection (invoke slot within the destination object's message thread) or even Qt::BlockingQueuedConnection (additionally block source thread until slot returns)
     */
@@ -100,7 +104,7 @@ public:
    void BackupGeometry();
    void RestoreGeometry();
    void restoreGeometry(const QByteArray& geometry); // overridden
-    QByteArray saveGeometry(); // overridden
+    QByteArray saveGeometry();  // overridden
    EmuThread& GetEmuThread();
@@ -109,10 +113,16 @@ public:
    void ReloadSetKeymaps() override;
+    void OnClientAreaResized(unsigned width, unsigned height);
+    void OnFramebufferSizeChanged();
 public slots:
-    void moveContext();
+    void moveContext();  // overridden
 private:
+    void OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) override;
    QGLWidget* child;
    EmuThread emu_thread;
diff --git a/src/citra_qt/config/controller_config_util.cpp b/src/citra_qt/config/controller_config_util.cpp
index c5426570b..aee3f8616 100644
--- a/src/citra_qt/config/controller_config_util.cpp
+++ b/src/citra_qt/config/controller_config_util.cpp
@@ -48,7 +48,7 @@ void GKeyConfigButton::OnActivePortChanged(const common::Config::ControllerPort&
    else if (config.keys.key_code[id] == Qt::Key_Control) text = tr("Control");
    else if (config.keys.key_code[id] == Qt::Key_Alt) text = tr("Alt");
    else if (config.keys.key_code[id] == Qt::Key_Meta) text = tr("Meta");
-        setText(text);
+    setText(text);
 }
 void GKeyConfigButton::OnClicked()
@@ -118,4 +118,4 @@ GButtonConfigGroup::GButtonConfigGroup(const QString& name, common::Config::Cont
    setLayout(layout);
 }
-*/
-\ No newline at end of file
+*/
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp
index 77fb0c9ed..895851be3 100644
--- a/src/citra_qt/debugger/callstack.cpp
+++ b/src/citra_qt/debugger/callstack.cpp
@@ -28,7 +28,7 @@ void CallstackWidget::OnCPUStepped()
    u32 sp = app_core->GetReg(13); //stack pointer
    u32 addr, ret_addr, call_addr, func_addr;
-    
    int counter = 0;
    for (int addr = 0x10000000; addr >= sp; addr -= 4)
    {
@@ -55,7 +55,7 @@ void CallstackWidget::OnCPUStepped()
            callstack_model->setItem(counter, 0, new QStandardItem(QString("0x%1").arg(addr, 8, 16, QLatin1Char('0'))));
            callstack_model->setItem(counter, 1, new QStandardItem(QString("0x%1").arg(ret_addr, 8, 16, QLatin1Char('0'))));
            callstack_model->setItem(counter, 2, new QStandardItem(QString("0x%1").arg(call_addr, 8, 16, QLatin1Char('0'))));
-            
            name = Symbols::HasSymbol(func_addr) ? Symbols::GetSymbol(func_addr).name : "unknown";
            callstack_model->setItem(counter, 3, new QStandardItem(QString("%1_%2").arg(QString::fromStdString(name))
                .arg(QString("0x%1").arg(func_addr, 8, 16, QLatin1Char('0')))));
@@ -63,4 +63,4 @@ void CallstackWidget::OnCPUStepped()
            counter++;
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp
index 96ceed480..ed17ee4b4 100644
--- a/src/citra_qt/debugger/registers.cpp
+++ b/src/citra_qt/debugger/registers.cpp
@@ -46,18 +46,18 @@ void RegistersWidget::OnCPUStepped()
    CSPR->setText(1, QString("0x%1").arg(app_core->GetCPSR(), 8, 16, QLatin1Char('0')));
    CSPR->child(0)->setText(1, QString("b%1").arg(app_core->GetCPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
-    CSPR->child(1)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 5) & 0x1));    // T - State
+    CSPR->child(1)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 5) & 0x1));    // T - State
-    CSPR->child(2)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 6) & 0x1));    // F - FIQ disable
+    CSPR->child(2)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 6) & 0x1));    // F - FIQ disable
-    CSPR->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1));    // I - IRQ disable
+    CSPR->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1));    // I - IRQ disable
-    CSPR->child(4)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 8) & 0x1));    // A - Imprecise abort
+    CSPR->child(4)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 8) & 0x1));    // A - Imprecise abort
-    CSPR->child(5)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 9) & 0x1));    // E - Data endianess
+    CSPR->child(5)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 9) & 0x1));    // E - Data endianess
-    CSPR->child(6)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 10) & 0x3F));  // IT - If-Then state (DNM)
+    CSPR->child(6)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 10) & 0x3F));  // IT - If-Then state (DNM)
-    CSPR->child(7)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 16) & 0xF));   // GE - Greater-than-or-Equal
+    CSPR->child(7)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 16) & 0xF));   // GE - Greater-than-or-Equal
-    CSPR->child(8)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 20) & 0xF));   // DNM - Do not modify
+    CSPR->child(8)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 20) & 0xF));   // DNM - Do not modify
-    CSPR->child(9)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 24) & 0x1));   // J - Java state
+    CSPR->child(9)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 24) & 0x1));   // J - Java state
-    CSPR->child(10)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 27) & 0x1));  // Q - Sticky overflow
+    CSPR->child(10)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 27) & 0x1));  // Q - Sticky overflow
-    CSPR->child(11)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 28) & 0x1));  // V - Overflow
+    CSPR->child(11)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 28) & 0x1));  // V - Overflow
-    CSPR->child(12)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 29) & 0x1));  // C - Carry/Borrow/Extend
+    CSPR->child(12)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 29) & 0x1));  // C - Carry/Borrow/Extend
-    CSPR->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1));  // Z - Zero
+    CSPR->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1));  // Z - Zero
-    CSPR->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1));  // N - Negative/Less than
+    CSPR->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1));  // N - Negative/Less than
 }
diff --git a/src/citra_qt/debugger/registers.hxx b/src/citra_qt/debugger/registers.hxx
index 9645feb2a..4cca957ce 100644
--- a/src/citra_qt/debugger/registers.hxx
+++ b/src/citra_qt/debugger/registers.hxx
@@ -16,10 +16,10 @@ public slots:
    void OnCPUStepped();
 private:
-        Ui::ARMRegisters cpu_regs_ui;
+    Ui::ARMRegisters cpu_regs_ui;
-        QTreeWidget* tree;
+    QTreeWidget* tree;
-    
-        QTreeWidgetItem* registers;
+    QTreeWidgetItem* registers;
-        QTreeWidgetItem* CSPR;
+    QTreeWidgetItem* CSPR;
 };
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 9a4e36adf..d5554d917 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -117,7 +117,8 @@ GMainWindow::GMainWindow()
    connect(GetHotkey("Main Window", "Load File", this), SIGNAL(activated()), this, SLOT(OnMenuLoadFile()));
    connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this, SLOT(OnStartGame()));
-    setWindowTitle(render_window->GetWindowTitle().c_str());
+    std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc);
+    setWindowTitle(window_title.c_str());
    show();
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h
index dc8ac1fd9..609784076 100644
--- a/src/common/chunk_file.h
+++ b/src/common/chunk_file.h
@@ -51,7 +51,7 @@ public:
    PointerWrapSection(PointerWrap &p, int ver, const char *title) : p_(p), ver_(ver), title_(title) {
    }
    ~PointerWrapSection();
-    
    bool operator == (const int &v) const { return ver_ == v; }
    bool operator != (const int &v) const { return ver_ != v; }
    bool operator <= (const int &v) const { return ver_ <= v; }
@@ -196,7 +196,7 @@ public:
        }
        (*ptr) += size;
    }
-    
    template<class K, class T>
    void Do(std::map<K, T *> &x)
    {
@@ -364,7 +364,7 @@ public:
        if (vec_size > 0)
            DoArray(&x[0], vec_size);
    }
-    
    // Store deques.
    template<class T>
    void Do(std::deque<T *> &x)
@@ -481,11 +481,11 @@ public:
    }
    // Store strings.
-    void Do(std::string &x) 
+    void Do(std::string &x)
    {
        int stringLen = (int)x.length() + 1;
        Do(stringLen);
-        
        switch (mode) {
        case MODE_READ:        x = (char*)*ptr; break;
        case MODE_WRITE:    memcpy(*ptr, x.c_str(), stringLen); break;
@@ -495,7 +495,7 @@ public:
        (*ptr) += stringLen;
    }
-    void Do(std::wstring &x) 
+    void Do(std::wstring &x)
    {
        int stringLen = sizeof(wchar_t)*((int)x.length() + 1);
        Do(stringLen);
@@ -534,7 +534,7 @@ public:
    void Do(T &x) {
        DoHelper<T>::Do(this, x);
    }
-    
    template<class T>
    void DoPOD(T &x) {
        DoHelper<T>::Do(this, x);
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index c18afe119..d84ec4c42 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -17,7 +17,7 @@ template<> struct CompileTimeAssert<true> {};
 #define b2(x)   (   (x) | (   (x) >> 1) )
 #define b4(x)   ( b2(x) | ( b2(x) >> 2) )
 #define b8(x)   ( b4(x) | ( b4(x) >> 4) )
-#define b16(x)  ( b8(x) | ( b8(x) >> 8) )  
+#define b16(x)  ( b8(x) | ( b8(x) >> 8) )
 #define b32(x)  (b16(x) | (b16(x) >>16) )
 #define ROUND_UP_POW2(x)    (b32(x - 1) + 1)
@@ -79,12 +79,12 @@ inline u64 _rotr64(u64 x, unsigned int shift){
    #define unlink _unlink
    #define snprintf _snprintf
    #define vscprintf _vscprintf
-    
 // Locale Cross-Compatibility
    #define locale_t _locale_t
    #define freelocale _free_locale
    #define newlocale(mask, locale, base) _create_locale(mask, locale)
-    
    #define LC_GLOBAL_LOCALE    ((locale_t)-1)
    #define LC_ALL_MASK            LC_ALL
    #define LC_COLLATE_MASK        LC_COLLATE
@@ -92,7 +92,7 @@ inline u64 _rotr64(u64 x, unsigned int shift){
    #define LC_MONETARY_MASK    LC_MONETARY
    #define LC_NUMERIC_MASK        LC_NUMERIC
    #define LC_TIME_MASK        LC_TIME
-    
    inline locale_t uselocale(locale_t new_locale)
    {
        // Retrieve the current per thread locale setting
@@ -168,8 +168,8 @@ inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);}
 inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);}
 inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);}
 #elif _M_ARM
-inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;} 
+inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;}
-inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;} 
+inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;}
 inline u64 swap64(u64 _data) {return ((u64)swap32(_data) << 32) | swap32(_data >> 32);}
 #elif __linux__
 inline u16 swap16(u16 _data) {return bswap_16(_data);}
@@ -226,7 +226,7 @@ template <typename T>
 inline T FromBigEndian(T data)
 {
    //static_assert(std::is_arithmetic<T>::value, "function only makes sense with arithmetic types");
-    
    swap<sizeof(data)>(reinterpret_cast<u8*>(&data));
    return data;
 }
diff --git a/src/common/common_types.h b/src/common/common_types.h
index 7ce6b2240..fcc8b9a4e 100644
--- a/src/common/common_types.h
+++ b/src/common/common_types.h
@@ -22,7 +22,7 @@
 * http://code.google.com/p/gekko-gc-emu/
 */
-#pragma once 
+#pragma once
 #include <cmath>
 #include <cstdint>
@@ -45,8 +45,8 @@ typedef double  f64; ///< 64-bit floating point
 /// Union for fast 16-bit type casting
 union t16 {
-        u8      _u8[2];             ///< 8-bit unsigned char(s)
+    u8  _u8[2];             ///< 8-bit unsigned char(s)
-        u16 _u16;               ///< 16-bit unsigned shorts(s)
+    u16 _u16;               ///< 16-bit unsigned shorts(s)
 };
 /// Union for fast 32-bit type casting
diff --git a/src/common/console_listener.cpp b/src/common/console_listener.cpp
index 53f20d754..d7f27c358 100644
--- a/src/common/console_listener.cpp
+++ b/src/common/console_listener.cpp
@@ -86,7 +86,7 @@ bool ConsoleListener::IsOpen()
 /*
  LetterSpace: SetConsoleScreenBufferSize and SetConsoleWindowInfo are
-    dependent on each other, that's the reason for the additional checks.  
+    dependent on each other, that's the reason for the additional checks.
 */
 void ConsoleListener::BufferWidthHeight(int BufferWidth, int BufferHeight, int ScreenWidth, int ScreenHeight, bool BufferFirst)
 {
@@ -225,7 +225,7 @@ void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool
        BytesWritten += cAttrWritten;
        coordScreen = GetCoordinates(BytesWritten, LBufWidth);
-    }    
+    }
    const int OldCursor = ConInfo.dwCursorPosition.Y * ConInfo.dwSize.X + ConInfo.dwCursorPosition.X;
    COORD Coo = GetCoordinates(OldCursor, LBufWidth);
@@ -296,23 +296,23 @@ void ConsoleListener::Log(LogTypes::LOG_LEVELS Level, const char *Text)
 }
 // Clear console screen
 void ConsoleListener::ClearScreen(bool Cursor)
-{ 
+{
 #if defined(_WIN32)
-    COORD coordScreen = { 0, 0 }; 
+    COORD coordScreen = { 0, 0 };
-    DWORD cCharsWritten; 
+    DWORD cCharsWritten;
-    CONSOLE_SCREEN_BUFFER_INFO csbi; 
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
-    DWORD dwConSize; 
+    DWORD dwConSize;
-    HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); 
+    HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-    GetConsoleScreenBufferInfo(hConsole, &csbi); 
+    GetConsoleScreenBufferInfo(hConsole, &csbi);
    dwConSize = csbi.dwSize.X * csbi.dwSize.Y;
    // Write space to the entire console
-    FillConsoleOutputCharacter(hConsole, TEXT(' '), dwConSize, coordScreen, &cCharsWritten); 
+    FillConsoleOutputCharacter(hConsole, TEXT(' '), dwConSize, coordScreen, &cCharsWritten);
-    GetConsoleScreenBufferInfo(hConsole, &csbi); 
+    GetConsoleScreenBufferInfo(hConsole, &csbi);
    FillConsoleOutputAttribute(hConsole, csbi.wAttributes, dwConSize, coordScreen, &cCharsWritten);
    // Reset cursor
-    if (Cursor) SetConsoleCursorPosition(hConsole, coordScreen); 
+    if (Cursor) SetConsoleCursorPosition(hConsole, coordScreen);
 #endif
 }
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index 6c2b598f6..4cb94fed1 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -9,17 +9,33 @@
 #include "common/string_util.h"
 #include "common/key_map.h"
-// Abstraction class used to provide an interface between emulation code and the frontend (e.g. SDL, 
+/**
-//  QGLWidget, GLFW, etc...)
+ * Abstraction class used to provide an interface between emulation code and the frontend
+ * (e.g. SDL, QGLWidget, GLFW, etc...).
+ *
+ * Design notes on the interaction between EmuWindow and the emulation core:
+ * - Generally, decisions on anything visible to the user should be left up to the GUI.
+ *   For example, the emulation core should not try to dictate some window title or size.
+ *   This stuff is not the core's business and only causes problems with regards to thread-safety
+ *   anyway.
+ * - Under certain circumstances, it may be desirable for the core to politely request the GUI
+ *   to set e.g. a minimum window size. However, the GUI should always be free to ignore any
+ *   such hints.
+ * - EmuWindow may expose some of its state as read-only to the emulation core, however care
+ *   should be taken to make sure the provided information is self-consistent. This requires
+ *   some sort of synchronization (most of this is still a TODO).
+ * - DO NOT TREAT THIS CLASS AS A GUI TOOLKIT ABSTRACTION LAYER. That's not what it is. Please
+ *   re-read the upper points again and think about it if you don't see this.
+ */
 class EmuWindow
 {
 public:
-    /// Data structure to store an emuwindow configuration
+    /// Data structure to store emuwindow configuration
    struct WindowConfig {
        bool    fullscreen;
        int     res_width;
        int     res_height;
+        std::pair<unsigned,unsigned> min_client_area_size;
    };
    /// Swap buffers to display the next frame
@@ -42,52 +58,96 @@ public:
    /// Signals a key release action to the HID module
    static void KeyReleased(KeyMap::HostDeviceKey key);
-    WindowConfig GetConfig() const {
+    /**
-        return m_config;
+     * Returns currently active configuration.
+     * @note Accesses to the returned object need not be consistent because it may be modified in another thread
+     */
+    const WindowConfig& GetActiveConfig() const {
+        return active_config;
    }
+    /**
+     * Requests the internal configuration to be replaced by the specified argument at some point in the future.
+     * @note This method is thread-safe, because it delays configuration changes to the GUI event loop. Hence there is no guarantee on when the requested configuration will be active.
+     */
    void SetConfig(const WindowConfig& val) {
-        m_config = val;
+        config = val;
-    }
-    
-    int GetClientAreaWidth() const { 
-        return m_client_area_width;
    }
-    void SetClientAreaWidth(const int val) {
+    /**
-        m_client_area_width = val;
+      * Gets the framebuffer size in pixels.
+      * @note This method is thread-safe
+      */
+    const std::pair<unsigned,unsigned> GetFramebufferSize() const {
+        return framebuffer_size;
    }
-    int GetClientAreaHeight() const {
+    /**
-        return m_client_area_height;
+     * Gets window client area width in logical coordinates.
+     * @note For high-DPI systems, this is smaller than the framebuffer size.
+     * @note This method is thread-safe
+     */
+    std::pair<unsigned,unsigned> GetClientAreaSize() const {
+        return std::make_pair(client_area_width, client_area_height);
    }
-    void SetClientAreaHeight(const int val) {
+protected:
-        m_client_area_height = val;
+    EmuWindow()
+    {
+        // TODO: Find a better place to set this.
+        config.min_client_area_size = std::make_pair(400u, 480u);
+        active_config = config;
    }
+    virtual ~EmuWindow() {}
-    std::string GetWindowTitle() const { 
+    /**
-        return m_window_title;
+     * Processes any pending configuration changes from the last SetConfig call.
+     * This method invokes OnMinimalClientAreaChangeRequest if the corresponding configuration
+     * field changed.
+     * @note Implementations will usually want to call this from the GUI thread.
+     * @todo Actually call this in existing implementations.
+     */
+    void ProcessConfigurationChanges() {
+        // TODO: For proper thread safety, we should eventually implement a proper
+        // multiple-writer/single-reader queue...
+        if (config.min_client_area_size != active_config.min_client_area_size) {
+            OnMinimalClientAreaChangeRequest(config.min_client_area_size);
+            config.min_client_area_size = active_config.min_client_area_size;
+        }
    }
-    
-    void SetWindowTitle(std::string val) {
+    /**
-        m_window_title = val;
+     * Update internal framebuffer size with the given parameter.
+     * @note EmuWindow implementations will usually use this in window resize event handlers.
+     */
+    void NotifyFramebufferSizeChanged(const std::pair<unsigned,unsigned>& size) {
+        framebuffer_size = size;
    }
-protected:
+    /**
-    EmuWindow():
+     * Update internal client area size with the given parameter.
-        m_window_title(Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc)),
+     * @note EmuWindow implementations will usually use this in window resize event handlers.
-        m_client_area_width(640),
+     */
-        m_client_area_height(480)
+    void NotifyClientAreaSizeChanged(const std::pair<unsigned,unsigned>& size) {
-    {}
+        client_area_width = size.first;
-    virtual ~EmuWindow() {}
+        client_area_height = size.second;
+    }
-    std::string m_window_title;     ///< Current window title, should be used by window impl.
+private:
+    /**
+     * Handler called when the minimal client area was requested to be changed via SetConfig.
+     * For the request to be honored, EmuWindow implementations will usually reimplement this function.
+     */
+    virtual void OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) {
+        // By default, ignore this request and do nothing.
+    }
-    int m_client_area_width;        ///< Current client width, should be set by window impl.
+    std::pair<unsigned,unsigned> framebuffer_size;
-    int m_client_area_height;       ///< Current client height, should be set by window impl.
-private:
+    unsigned client_area_width;    ///< Current client width, should be set by window impl.
-    WindowConfig m_config;                ///< Internal configuration
+    unsigned client_area_height;   ///< Current client height, should be set by window impl.
+    WindowConfig config;         ///< Internal configuration (changes pending for being applied in ProcessConfigurationChanges)
+    WindowConfig active_config;  ///< Internal active configuration
 };
diff --git a/src/common/extended_trace.cpp b/src/common/extended_trace.cpp
index 9cd0398ed..bf61ac1d1 100644
--- a/src/common/extended_trace.cpp
+++ b/src/common/extended_trace.cpp
@@ -29,7 +29,7 @@ using namespace std;
 void PCSTR2LPTSTR( PCSTR lpszIn, LPTSTR lpszOut )
 {
 #if defined(UNICODE)||defined(_UNICODE)
-    ULONG index = 0; 
+    ULONG index = 0;
    PCSTR lpAct = lpszIn;
    for( ; ; lpAct++ )
@@ -37,7 +37,7 @@ void PCSTR2LPTSTR( PCSTR lpszIn, LPTSTR lpszOut )
        lpszOut[index++] = (TCHAR)(*lpAct);
        if ( *lpAct == 0 )
            break;
-    } 
+    }
 #else
    // This is trivial :)
    strcpy( lpszOut, lpszIn );
@@ -101,7 +101,7 @@ BOOL InitSymInfo( PCSTR lpszInitialSymbolPath )
    CHAR     lpszSymbolPath[BUFFERSIZE];
    DWORD    symOptions = SymGetOptions();
-    symOptions |= SYMOPT_LOAD_LINES; 
+    symOptions |= SYMOPT_LOAD_LINES;
    symOptions &= ~SYMOPT_UNDNAME;
    SymSetOptions( symOptions );
    InitSymbolPath( lpszSymbolPath, lpszInitialSymbolPath );
@@ -153,15 +153,15 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L
 #ifndef _M_X64
    DWORD             dwDisp = 0;
    if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, &dwDisp, pSym ) )
-#else 
+#else
    //makes it compile but hell im not sure if this works...
    DWORD64           dwDisp = 0;
    if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, (PDWORD64)&dwDisp, pSym ) )
 #endif
    {
        // Make the symbol readable for humans
-        UnDecorateSymbolName( pSym->Name, lpszNonUnicodeUnDSymbol, BUFFERSIZE, 
+        UnDecorateSymbolName( pSym->Name, lpszNonUnicodeUnDSymbol, BUFFERSIZE,
-            UNDNAME_COMPLETE | 
+            UNDNAME_COMPLETE |
            UNDNAME_NO_THISTYPE |
            UNDNAME_NO_SPECIAL_SYMS |
            UNDNAME_NO_MEMBER_TYPE |
@@ -219,7 +219,7 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L
        _tcscat( lpszSymbol, lpszParsed );
        ret = TRUE;
-    } 
+    }
    GlobalFree( pSym );
    return ret;
@@ -325,14 +325,14 @@ void StackTrace( HANDLE hThread, const char* lpszMessage, FILE *file )
        PrintFunctionAndSourceInfo(file, callStack);
-        for( ULONG index = 0; ; index++ ) 
+        for( ULONG index = 0; ; index++ )
        {
            bResult = StackWalk(
                IMAGE_FILE_MACHINE_I386,
                hProcess,
                hThread,
                &callStack,
-                NULL, 
+                NULL,
                NULL,
                SymFunctionTableAccess,
                SymGetModuleBase,
@@ -341,7 +341,7 @@ void StackTrace( HANDLE hThread, const char* lpszMessage, FILE *file )
            if ( index == 0 )
                continue;
-            if( !bResult || callStack.AddrFrame.Offset == 0 ) 
+            if( !bResult || callStack.AddrFrame.Offset == 0 )
                break;
            PrintFunctionAndSourceInfo(file, callStack);
@@ -382,14 +382,14 @@ void StackTrace(HANDLE hThread, const char* lpszMessage, FILE *file, DWORD eip,
        PrintFunctionAndSourceInfo(file, callStack);
-        for( ULONG index = 0; ; index++ ) 
+        for( ULONG index = 0; ; index++ )
        {
            bResult = StackWalk(
                IMAGE_FILE_MACHINE_I386,
                hProcess,
                hThread,
                &callStack,
-                NULL, 
+                NULL,
                NULL,
                SymFunctionTableAccess,
                SymGetModuleBase,
@@ -398,7 +398,7 @@ void StackTrace(HANDLE hThread, const char* lpszMessage, FILE *file, DWORD eip,
            if ( index == 0 )
                continue;
-            if( !bResult || callStack.AddrFrame.Offset == 0 ) 
+            if( !bResult || callStack.AddrFrame.Offset == 0 )
                break;
            PrintFunctionAndSourceInfo(file, callStack);
diff --git a/src/common/fifo_queue.h b/src/common/fifo_queue.h
index 78a8f561d..2c18285d4 100644
--- a/src/common/fifo_queue.h
+++ b/src/common/fifo_queue.h
@@ -45,7 +45,7 @@ public:
        // create the element, add it to the queue
        m_write_ptr->current = new T(std::forward<Arg>(t));
        // set the next pointer to a new element ptr
-        // then advance the write pointer 
+        // then advance the write pointer
        m_write_ptr = m_write_ptr->next = new ElementPtr();
        Common::AtomicIncrement(m_size);
    }
diff --git a/src/common/file_search.cpp b/src/common/file_search.cpp
index 63580f688..bfb54ce72 100644
--- a/src/common/file_search.cpp
+++ b/src/common/file_search.cpp
@@ -43,7 +43,7 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string&
        bool bkeepLooping = true;
        while (bkeepLooping)
-        {            
+        {
            if (findData.cFileName[0] != '.')
            {
                std::string strFilename;
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 35da07306..b6dec838c 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -88,7 +88,7 @@ bool IsDirectory(const std::string &filename)
 #endif
    if (result < 0) {
-        WARN_LOG(COMMON, "IsDirectory: stat failed on %s: %s", 
+        WARN_LOG(COMMON, "IsDirectory: stat failed on %s: %s",
                 filename.c_str(), GetLastErrorMsg());
        return false;
    }
@@ -102,7 +102,7 @@ bool Delete(const std::string &filename)
 {
    INFO_LOG(COMMON, "Delete: file %s", filename.c_str());
-    // Return true because we care about the file no 
+    // Return true because we care about the file no
    // being there, not the actual delete.
    if (!Exists(filename))
    {
@@ -120,13 +120,13 @@ bool Delete(const std::string &filename)
 #ifdef _WIN32
    if (!DeleteFile(Common::UTF8ToTStr(filename).c_str()))
    {
-        WARN_LOG(COMMON, "Delete: DeleteFile failed on %s: %s", 
+        WARN_LOG(COMMON, "Delete: DeleteFile failed on %s: %s",
                 filename.c_str(), GetLastErrorMsg());
        return false;
    }
 #else
    if (unlink(filename.c_str()) == -1) {
-        WARN_LOG(COMMON, "Delete: unlink failed on %s: %s", 
+        WARN_LOG(COMMON, "Delete: unlink failed on %s: %s",
                 filename.c_str(), GetLastErrorMsg());
        return false;
    }
@@ -232,28 +232,28 @@ bool DeleteDir(const std::string &filename)
    return false;
 }
-// renames file srcFilename to destFilename, returns true on success 
+// renames file srcFilename to destFilename, returns true on success
 bool Rename(const std::string &srcFilename, const std::string &destFilename)
 {
-    INFO_LOG(COMMON, "Rename: %s --> %s", 
+    INFO_LOG(COMMON, "Rename: %s --> %s",
            srcFilename.c_str(), destFilename.c_str());
    if (rename(srcFilename.c_str(), destFilename.c_str()) == 0)
        return true;
-    ERROR_LOG(COMMON, "Rename: failed %s --> %s: %s", 
+    ERROR_LOG(COMMON, "Rename: failed %s --> %s: %s",
              srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
    return false;
 }
-// copies file srcFilename to destFilename, returns true on success 
+// copies file srcFilename to destFilename, returns true on success
 bool Copy(const std::string &srcFilename, const std::string &destFilename)
 {
-    INFO_LOG(COMMON, "Copy: %s --> %s", 
+    INFO_LOG(COMMON, "Copy: %s --> %s",
            srcFilename.c_str(), destFilename.c_str());
 #ifdef _WIN32
    if (CopyFile(Common::UTF8ToTStr(srcFilename).c_str(), Common::UTF8ToTStr(destFilename).c_str(), FALSE))
        return true;
-    ERROR_LOG(COMMON, "Copy: failed %s --> %s: %s", 
+    ERROR_LOG(COMMON, "Copy: failed %s --> %s: %s",
            srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
    return false;
 #else
@@ -267,7 +267,7 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename)
    FILE *input = fopen(srcFilename.c_str(), "rb");
    if (!input)
    {
-        ERROR_LOG(COMMON, "Copy: input failed %s --> %s: %s", 
+        ERROR_LOG(COMMON, "Copy: input failed %s --> %s: %s",
                srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
        return false;
    }
@@ -277,7 +277,7 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename)
    if (!output)
    {
        fclose(input);
-        ERROR_LOG(COMMON, "Copy: output failed %s --> %s: %s", 
+        ERROR_LOG(COMMON, "Copy: output failed %s --> %s: %s",
                srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
        return false;
    }
@@ -291,8 +291,8 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename)
        {
            if (ferror(input) != 0)
            {
-                ERROR_LOG(COMMON, 
+                ERROR_LOG(COMMON,
-                        "Copy: failed reading from source, %s --> %s: %s", 
+                        "Copy: failed reading from source, %s --> %s: %s",
                        srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
                goto bail;
            }
@@ -302,8 +302,8 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename)
        int wnum = fwrite(buffer, sizeof(char), rnum, output);
        if (wnum != rnum)
        {
-            ERROR_LOG(COMMON, 
+            ERROR_LOG(COMMON,
-                    "Copy: failed writing to output, %s --> %s: %s", 
+                    "Copy: failed writing to output, %s --> %s: %s",
                    srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
            goto bail;
        }
@@ -335,7 +335,7 @@ u64 GetSize(const std::string &filename)
        WARN_LOG(COMMON, "GetSize: failed %s: is a directory", filename.c_str());
        return 0;
    }
-    
    struct stat64 buf;
 #ifdef _WIN32
    if (_tstat64(Common::UTF8ToTStr(filename).c_str(), &buf) == 0)
@@ -384,10 +384,10 @@ u64 GetSize(FILE *f)
    return size;
 }
-// creates an empty file filename, returns true on success 
+// creates an empty file filename, returns true on success
 bool CreateEmptyFile(const std::string &filename)
 {
-    INFO_LOG(COMMON, "CreateEmptyFile: %s", filename.c_str()); 
+    INFO_LOG(COMMON, "CreateEmptyFile: %s", filename.c_str());
    if (!FileUtil::IOFile(filename, "wb"))
    {
@@ -437,7 +437,7 @@ u32 ScanDirectoryTree(const std::string &directory, FSTEntry& parentEntry)
 #endif
        // check for "." and ".."
        if (((virtualName[0] == '.') && (virtualName[1] == '\0')) ||
-                ((virtualName[0] == '.') && (virtualName[1] == '.') && 
+                ((virtualName[0] == '.') && (virtualName[1] == '.') &&
                 (virtualName[2] == '\0')))
            continue;
        entry.virtualName = virtualName;
@@ -452,14 +452,14 @@ u32 ScanDirectoryTree(const std::string &directory, FSTEntry& parentEntry)
            foundEntries += (u32)entry.size;
        }
        else
-        { // is a file 
+        { // is a file
            entry.isDirectory = false;
            entry.size = GetSize(entry.physicalName.c_str());
        }
        ++foundEntries;
        // Push into the tree
-        parentEntry.children.push_back(entry);        
+        parentEntry.children.push_back(entry);
-#ifdef _WIN32 
+#ifdef _WIN32
    } while (FindNextFile(hFind, &ffd) != 0);
    FindClose(hFind);
 #else
@@ -504,7 +504,7 @@ bool DeleteDirRecursively(const std::string &directory)
        // check for "." and ".."
        if (((virtualName[0] == '.') && (virtualName[1] == '\0')) ||
-            ((virtualName[0] == '.') && (virtualName[1] == '.') && 
+            ((virtualName[0] == '.') && (virtualName[1] == '.') &&
             (virtualName[2] == '\0')))
            continue;
@@ -540,7 +540,7 @@ bool DeleteDirRecursively(const std::string &directory)
    closedir(dirp);
 #endif
    FileUtil::DeleteDir(directory);
-        
    return true;
 }
@@ -585,7 +585,7 @@ void CopyDir(const std::string &source_path, const std::string &dest_path)
 std::string GetCurrentDir()
 {
    char *dir;
-    // Get the current working directory (getcwd uses malloc) 
+    // Get the current working directory (getcwd uses malloc)
    if (!(dir = __getcwd(NULL, 0))) {
        ERROR_LOG(COMMON, "GetCurrentDirectory failed: %s",
@@ -604,7 +604,7 @@ bool SetCurrentDir(const std::string &directory)
 }
 #if defined(__APPLE__)
-std::string GetBundleDirectory() 
+std::string GetBundleDirectory()
 {
    CFURLRef BundleRef;
    char AppBundlePath[MAXPATHLEN];
@@ -666,8 +666,8 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
        if (FileUtil::Exists(ROOT_DIR DIR_SEP USERDATA_DIR))
            paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP;
        else
-            paths[D_USER_IDX] = std::string(getenv("HOME") ? 
+            paths[D_USER_IDX] = std::string(getenv("HOME") ?
-                getenv("HOME") : getenv("PWD") ? 
+                getenv("HOME") : getenv("PWD") ?
                getenv("PWD") : "") + DIR_SEP EMU_DATA_DIR DIR_SEP;
 #endif
@@ -749,7 +749,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
            paths[F_MAINLOG_IDX]        = paths[D_LOGS_IDX] + MAIN_LOG;
        }
    }
-    
    return paths[DirIDX];
 }
@@ -762,7 +762,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
 //    if (!FileUtil::Exists(dir))
 //        dir = SHARED_USER_DIR THEMES_DIR "/" + theme_name + "/";
 //#endif
-//    
+//
 //    return dir;
 //}
diff --git a/src/common/file_util.h b/src/common/file_util.h
index 173ce6623..72b80be8a 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -16,33 +16,33 @@
 // User directory indices for GetUserPath
 enum {
-        D_USER_IDX,
+    D_USER_IDX,
-        D_ROOT_IDX,
+    D_ROOT_IDX,
-        D_CONFIG_IDX,
+    D_CONFIG_IDX,
-        D_GAMECONFIG_IDX,
+    D_GAMECONFIG_IDX,
-        D_MAPS_IDX,
+    D_MAPS_IDX,
-        D_CACHE_IDX,
+    D_CACHE_IDX,
-        D_SHADERCACHE_IDX,
+    D_SHADERCACHE_IDX,
-        D_SHADERS_IDX,
+    D_SHADERS_IDX,
-        D_STATESAVES_IDX,
+    D_STATESAVES_IDX,
-        D_SCREENSHOTS_IDX,
+    D_SCREENSHOTS_IDX,
-        D_SDMC_IDX,
+    D_SDMC_IDX,
-        D_HIRESTEXTURES_IDX,
+    D_HIRESTEXTURES_IDX,
-        D_DUMP_IDX,
+    D_DUMP_IDX,
-        D_DUMPFRAMES_IDX,
+    D_DUMPFRAMES_IDX,
-        D_DUMPAUDIO_IDX,
+    D_DUMPAUDIO_IDX,
-        D_DUMPTEXTURES_IDX,
+    D_DUMPTEXTURES_IDX,
-        D_DUMPDSP_IDX,
+    D_DUMPDSP_IDX,
-        D_LOGS_IDX,
+    D_LOGS_IDX,
-        D_SYSCONF_IDX,
+    D_SYSCONF_IDX,
-        F_EMUCONFIG_IDX,
+    F_EMUCONFIG_IDX,
-        F_DEBUGGERCONFIG_IDX,
+    F_DEBUGGERCONFIG_IDX,
-        F_LOGGERCONFIG_IDX,
+    F_LOGGERCONFIG_IDX,
-        F_MAINLOG_IDX,
+    F_MAINLOG_IDX,
-        F_RAMDUMP_IDX,
+    F_RAMDUMP_IDX,
-        F_ARAMDUMP_IDX,
+    F_ARAMDUMP_IDX,
-        F_SYSCONF_IDX,
+    F_SYSCONF_IDX,
-        NUM_PATH_INDICES
+    NUM_PATH_INDICES
 };
 namespace FileUtil
@@ -51,11 +51,11 @@ namespace FileUtil
 // FileSystem tree node/
 struct FSTEntry
 {
-        bool isDirectory;
+    bool isDirectory;
-        u64 size;                                               // file length or number of entries from children
+    u64 size;                       // file length or number of entries from children
-        std::string physicalName;               // name on disk
+    std::string physicalName;       // name on disk
-        std::string virtualName;                // name in FST names table
+    std::string virtualName;        // name in FST names table
-        std::vector<FSTEntry> children;
+    std::vector<FSTEntry> children;
 };
 // Returns true if file filename exists
@@ -148,86 +148,86 @@ void SplitFilename83(const std::string& filename, std::array<char, 9>& short_nam
 class IOFile : public NonCopyable
 {
 public:
-        IOFile();
+    IOFile();
-        IOFile(std::FILE* file);
+    IOFile(std::FILE* file);
-        IOFile(const std::string& filename, const char openmode[]);
+    IOFile(const std::string& filename, const char openmode[]);
-        ~IOFile();
+    ~IOFile();
-        IOFile(IOFile&& other);
+    IOFile(IOFile&& other);
-        IOFile& operator=(IOFile&& other);
+    IOFile& operator=(IOFile&& other);
-        void Swap(IOFile& other);
+    void Swap(IOFile& other);
-        bool Open(const std::string& filename, const char openmode[]);
+    bool Open(const std::string& filename, const char openmode[]);
-        bool Close();
+    bool Close();
-        template <typename T>
+    template <typename T>
-        size_t ReadArray(T* data, size_t length)
+    size_t ReadArray(T* data, size_t length)
-        {
+    {
-                if (!IsOpen()) {
+        if (!IsOpen()) {
-                        m_good = false;
+            m_good = false;
-                        return -1;
+            return -1;
-                }
+        }
-                size_t items_read = std::fread(data, sizeof(T), length, m_file);
+        size_t items_read = std::fread(data, sizeof(T), length, m_file);
-                if (items_read != length)
+        if (items_read != length)
-                        m_good = false;
+            m_good = false;
-                return items_read;
+        return items_read;
-        }
+    }
-        template <typename T>
+    template <typename T>
-        size_t WriteArray(const T* data, size_t length)
+    size_t WriteArray(const T* data, size_t length)
-        {
+    {
-                if (!IsOpen()) {
+        if (!IsOpen()) {
-                        m_good = false;
+            m_good = false;
-                        return -1;
+            return -1;
-                }
+        }
-                size_t items_written = std::fwrite(data, sizeof(T), length, m_file);
+        size_t items_written = std::fwrite(data, sizeof(T), length, m_file);
-                if (items_written != length)
+        if (items_written != length)
-                        m_good = false;
+            m_good = false;
-                return items_written;
+        return items_written;
-        }
+    }
-        size_t ReadBytes(void* data, size_t length)
+    size_t ReadBytes(void* data, size_t length)
-        {
+    {
-                return ReadArray(reinterpret_cast<char*>(data), length);
+        return ReadArray(reinterpret_cast<char*>(data), length);
-        }
+    }
-        size_t WriteBytes(const void* data, size_t length)
+    size_t WriteBytes(const void* data, size_t length)
-        {
+    {
-                return WriteArray(reinterpret_cast<const char*>(data), length);
+        return WriteArray(reinterpret_cast<const char*>(data), length);
-        }
+    }
-        bool IsOpen() { return NULL != m_file; }
+    bool IsOpen() { return NULL != m_file; }
-        // m_good is set to false when a read, write or other function fails
+    // m_good is set to false when a read, write or other function fails
-        bool IsGood() { return m_good; }
+    bool IsGood() {    return m_good; }
-        operator void*() { return m_good ? m_file : NULL; }
+    operator void*() { return m_good ? m_file : NULL; }
-        std::FILE* ReleaseHandle();
+    std::FILE* ReleaseHandle();
-        std::FILE* GetHandle() { return m_file; }
+    std::FILE* GetHandle() { return m_file; }
-        void SetHandle(std::FILE* file);
+    void SetHandle(std::FILE* file);
-        bool Seek(s64 off, int origin);
+    bool Seek(s64 off, int origin);
-        u64 Tell();
+    u64 Tell();
-        u64 GetSize();
+    u64 GetSize();
-        bool Resize(u64 size);
+    bool Resize(u64 size);
-        bool Flush();
+    bool Flush();
-        // clear error state
+    // clear error state
-        void Clear() { m_good = true; std::clearerr(m_file); }
+    void Clear() { m_good = true; std::clearerr(m_file); }
-        std::FILE* m_file;
+    std::FILE* m_file;
-        bool m_good;
+    bool m_good;
 private:
-        IOFile(IOFile&);
+    IOFile(IOFile&);
-        IOFile& operator=(IOFile& other);
+    IOFile& operator=(IOFile& other);
 };
 }  // namespace
@@ -237,8 +237,8 @@ template <typename T>
 void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmode openmode)
 {
 #ifdef _WIN32
-        fstream.open(Common::UTF8ToTStr(filename).c_str(), openmode);
+    fstream.open(Common::UTF8ToTStr(filename).c_str(), openmode);
 #else
-        fstream.open(filename.c_str(), openmode);
+    fstream.open(filename.c_str(), openmode);
 #endif
 }
diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index d2ebc7341..2ddcfe6b7 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -115,15 +115,15 @@ inline u64 getblock(const u64 * p, int i)
 inline void bmix64(u64 & h1, u64 & h2, u64 & k1, u64 & k2, u64 & c1, u64 & c2)
 {
-    k1 *= c1; 
+    k1 *= c1;
-    k1  = _rotl64(k1,23); 
+    k1  = _rotl64(k1,23);
    k1 *= c2;
    h1 ^= k1;
    h1 += h2;
    h2 = _rotl64(h2,41);
-    k2 *= c2; 
+    k2 *= c2;
    k2  = _rotl64(k2,23);
    k2 *= c1;
    h2 ^= k2;
@@ -250,7 +250,7 @@ u64 GetCRC32(const u8 *src, int len, u32 samples)
 }
-/* 
+/*
 * NOTE: This hash function is used for custom texture loading/dumping, so
 * it should not be changed, which would require all custom textures to be
 * recalculated for their new hash values. If the hashing function is
@@ -273,7 +273,7 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples)
        u64 k = data[0];
        data+=Step;
        k *= m;
-        k ^= k >> r; 
+        k ^= k >> r;
        k *= m;
        h ^= k;
        h *= m;
@@ -292,13 +292,13 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples)
    case 1: h ^= u64(data2[0]);
            h *= m;
    };
- 
    h ^= h >> r;
    h *= m;
    h ^= h >> r;
    return h;
-} 
+}
 #else
 // CRC32 hash using the SSE4.2 instruction
 u64 GetCRC32(const u8 *src, int len, u32 samples)
@@ -351,15 +351,15 @@ inline u32 fmix32(u32 h)
 inline void bmix32(u32 & h1, u32 & h2, u32 & k1, u32 & k2, u32 & c1, u32 & c2)
 {
-    k1 *= c1; 
+    k1 *= c1;
-    k1  = _rotl(k1,11); 
+    k1  = _rotl(k1,11);
    k1 *= c2;
    h1 ^= k1;
    h1 += h2;
    h2 = _rotl(h2,17);
-    k2 *= c2; 
+    k2 *= c2;
    k2  = _rotl(k2,11);
    k2 *= c1;
    h2 ^= k2;
@@ -405,7 +405,7 @@ u64 GetMurmurHash3(const u8* src, int len, u32 samples)
    //----------
    // tail
-    
    const u8 * tail = (const u8*)(data + nblocks*8);
    u32 k1 = 0;
@@ -439,7 +439,7 @@ u64 GetMurmurHash3(const u8* src, int len, u32 samples)
    out[0] = h1;
    out[1] = h2;
-    
    return *((u64 *)&out);
 }
@@ -463,11 +463,11 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples)
    {
        u64 k = data[0];
        data+=Step;
-        k *= m; 
+        k *= m;
-        k ^= k >> r; 
+        k ^= k >> r;
        k *= m;
        h ^= k;
-        h *= m; 
+        h *= m;
    }
    const u8 * data2 = (const u8*)end;
@@ -483,7 +483,7 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples)
    case 1: h ^= u64(data2[0]);
            h *= m;
    };
- 
    h ^= h >> r;
    h *= m;
    h ^= h >> r;
diff --git a/src/common/linear_disk_cache.h b/src/common/linear_disk_cache.h
index 96dce3155..f4263f72a 100644
--- a/src/common/linear_disk_cache.h
+++ b/src/common/linear_disk_cache.h
@@ -64,7 +64,7 @@ public:
        m_file.seekg(0, std::ios::beg);
        std::fstream::pos_type start_pos = m_file.tellg();
        std::streamoff file_size = end_pos - start_pos;
-        
        if (m_file.is_open() && ValidateHeader())
        {
            // good header, read some key/value pairs
@@ -87,7 +87,7 @@ public:
                // read key/value and pass to reader
                if (Read(&key) &&
-                    Read(value, value_size) && 
+                    Read(value, value_size) &&
                    Read(&entry_number) &&
                    entry_number == m_num_entries+1)
                 {
@@ -115,7 +115,7 @@ public:
        WriteHeader();
        return 0;
    }
-    
    void Sync()
    {
        m_file.flush();
diff --git a/src/common/log.h b/src/common/log.h
index bfd73f8a5..14ad98c08 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -11,7 +11,7 @@
 enum {
    OS_LEVEL,       // Printed by the emulated operating system
    NOTICE_LEVEL,   // VERY important information that is NOT errors. Like startup and OSReports.
-    ERROR_LEVEL,    // Critical errors 
+    ERROR_LEVEL,    // Critical errors
    WARNING_LEVEL,  // Something is suspicious.
    INFO_LEVEL,     // General information.
    DEBUG_LEVEL,    // Detailed debugging - might make things slow.
@@ -46,7 +46,7 @@ enum LOG_TYPE {
    MEMMAP,
    MEMCARD_MANAGER,
    OSREPORT,
-    PAD, 
+    PAD,
    PROCESSORINTERFACE,
    PIXELENGINE,
    SERIALINTERFACE,
@@ -69,6 +69,7 @@ enum LOG_TYPE {
    HW,
    TIME,
    NETPLAY,
+    GUI,
    NUMBER_OF_LOGS // Must be last
 };
@@ -88,7 +89,7 @@ enum LOG_LEVELS {
 }  // namespace
-void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int line, 
+void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int line,
    const char* function, const char* fmt, ...)
 #ifdef __GNUC__
        __attribute__((format(printf, 6, 7)))
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp
index 4d590d98f..38c681ee0 100644
--- a/src/common/log_manager.cpp
+++ b/src/common/log_manager.cpp
@@ -9,7 +9,7 @@
 #include "common/timer.h"
 #include "common/thread.h"
-void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, 
+void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line,
    const char* function, const char* fmt, ...)
 {
    va_list args;
@@ -75,6 +75,7 @@ LogManager::LogManager()
    m_Log[LogTypes::ACTIONREPLAY]       = new LogContainer("ActionReplay",      "ActionReplay");
    m_Log[LogTypes::MEMCARD_MANAGER]    = new LogContainer("MemCard Manager",   "MemCard Manager");
    m_Log[LogTypes::NETPLAY]            = new LogContainer("NETPLAY",           "Netplay");
+    m_Log[LogTypes::GUI]                = new LogContainer("GUI",               "GUI");
    m_fileLog = new FileLogListener(FileUtil::GetUserPath(F_MAINLOG_IDX).c_str());
    m_consoleLog = new ConsoleListener();
@@ -111,7 +112,7 @@ LogManager::~LogManager()
    delete m_debuggerLog;
 }
-void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, 
+void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file,
    int line, const char* function, const char *fmt, va_list args)
 {
    char temp[MAX_MSGLEN];
@@ -124,11 +125,11 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const
    Common::CharArrayFromFormatV(temp, MAX_MSGLEN, fmt, args);
    static const char level_to_char[7] = "ONEWID";
-    sprintf(msg, "%s %s:%u %c[%s] %s: %s\n", Common::Timer::GetTimeFormatted().c_str(), file, line, 
+    sprintf(msg, "%s %s:%u %c[%s] %s: %s\n", Common::Timer::GetTimeFormatted().c_str(), file, line,
        level_to_char[(int)level], log->GetShortName(), function, temp);
-    
 #ifdef ANDROID
-    Host_SysMessage(msg);    
+    Host_SysMessage(msg);
 #endif
    log->Trigger(level, msg);
 }
diff --git a/src/common/log_manager.h b/src/common/log_manager.h
index de1d16ee5..baefc4ba8 100644
--- a/src/common/log_manager.h
+++ b/src/common/log_manager.h
@@ -54,7 +54,7 @@ class LogContainer
 {
 public:
    LogContainer(const char* shortName, const char* fullName, bool enable = false);
-    
    const char* GetShortName() const { return m_shortName; }
    const char* GetFullName() const { return m_fullName; }
@@ -98,7 +98,7 @@ public:
    static u32 GetMaxLevel() { return LogTypes::MAX_LOGLEVEL;    }
-    void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, 
+    void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line,
        const char* function, const char *fmt, va_list args);
    void SetLogLevel(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level)
diff --git a/src/common/math_util.cpp b/src/common/math_util.cpp
index ab0e6b75c..3613e82a6 100644
--- a/src/common/math_util.cpp
+++ b/src/common/math_util.cpp
@@ -18,7 +18,7 @@ u32 ClassifyDouble(double dvalue)
    value.d = dvalue;
    u64 sign = value.i & DOUBLE_SIGN;
    u64 exp  = value.i & DOUBLE_EXP;
-    if (exp > DOUBLE_ZERO && exp < DOUBLE_EXP) 
+    if (exp > DOUBLE_ZERO && exp < DOUBLE_EXP)
    {
        // Nice normalized number.
        return sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
@@ -58,7 +58,7 @@ u32 ClassifyFloat(float fvalue)
    value.f = fvalue;
    u32 sign = value.i & FLOAT_SIGN;
    u32 exp  = value.i & FLOAT_EXP;
-    if (exp > FLOAT_ZERO && exp < FLOAT_EXP) 
+    if (exp > FLOAT_ZERO && exp < FLOAT_EXP)
    {
        // Nice normalized number.
        return sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
@@ -77,13 +77,13 @@ u32 ClassifyFloat(float fvalue)
                // Denormalized number.
                return sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
            }
-        } 
+        }
-        else if (exp) 
+        else if (exp)
        {
            // Infinite
            return sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
-        } 
+        }
-        else 
+        else
        {
            //Zero
            return sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
@@ -143,7 +143,7 @@ void Matrix33::RotateY(Matrix33 &mtx, float rad)
    mtx.data[0] = c;
    mtx.data[2] = s;
    mtx.data[4] = 1;
-    mtx.data[6] = -s;    
+    mtx.data[6] = -s;
    mtx.data[8] = c;
 }
diff --git a/src/common/math_util.h b/src/common/math_util.h
index b32e7bb14..b10a25c13 100644
--- a/src/common/math_util.h
+++ b/src/common/math_util.h
@@ -7,6 +7,7 @@
 #include "common/common.h"
 #include <algorithm>
+#include <type_traits>
 #include <vector>
 namespace MathUtil
@@ -109,11 +110,11 @@ struct Rectangle
    Rectangle(T theLeft, T theTop, T theRight, T theBottom)
        : left(theLeft), top(theTop), right(theRight), bottom(theBottom)
    { }
-    
    bool operator==(const Rectangle& r) { return left==r.left && top==r.top && right==r.right && bottom==r.bottom; }
-    T GetWidth() const { return abs(right - left); }
+    T GetWidth() const { return std::abs(static_cast<typename std::make_signed<T>::type>(right - left)); }
-    T GetHeight() const { return abs(bottom - top); }
+    T GetHeight() const { return std::abs(static_cast<typename std::make_signed<T>::type>(bottom - top)); }
    // If the rectangle is in a coordinate system with a lower-left origin, use
    // this Clamp.
@@ -127,7 +128,7 @@ struct Rectangle
    // If the rectangle is in a coordinate system with an upper-left origin,
    // use this Clamp.
-    void ClampUL(T x1, T y1, T x2, T y2) 
+    void ClampUL(T x1, T y1, T x2, T y2)
    {
        if (left < x1) left = x1;
        if (right > x2) right = x2;
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp
index 40d9c03a2..67dbaf509 100644
--- a/src/common/mem_arena.cpp
+++ b/src/common/mem_arena.cpp
@@ -38,7 +38,7 @@ void* globalbase = NULL;
 // Hopefully this ABI will never change...
-#define ASHMEM_DEVICE   "/dev/ashmem"
+#define ASHMEM_DEVICE "/dev/ashmem"
 /*
 * ashmem_create_region - creates a new ashmem region and returns the file
@@ -272,11 +272,11 @@ u8* MemArena::Find4GBBase()
 // yeah, this could also be done in like two bitwise ops...
-#define SKIP(a_flags, b_flags) 
+#define SKIP(a_flags, b_flags)
-//      if (!(a_flags & MV_WII_ONLY) && (b_flags & MV_WII_ONLY)) 
+//if (!(a_flags & MV_WII_ONLY) && (b_flags & MV_WII_ONLY))
-//              continue; 
+//    continue;
-//      if (!(a_flags & MV_FAKE_VMEM) && (b_flags & MV_FAKE_VMEM)) 
+//if (!(a_flags & MV_FAKE_VMEM) && (b_flags & MV_FAKE_VMEM))
-//              continue; 
+//    continue;
 static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32 flags, MemArena *arena) {
    // OK, we know where to find free space. Now grab it!
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp
index bab7d9f7a..b6f66e4e1 100644
--- a/src/common/memory_util.cpp
+++ b/src/common/memory_util.cpp
@@ -47,7 +47,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
    // printf("Mapped executable memory at %p (size %ld)\n", ptr,
    //    (unsigned long)size);
-    
 #ifdef _WIN32
    if (ptr == nullptr)
    {
@@ -55,7 +55,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
    if (ptr == MAP_FAILED)
    {
        ptr = nullptr;
-#endif 
+#endif
        PanicAlert("Failed to allocate executable memory");
    }
 #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)
@@ -127,11 +127,11 @@ void FreeMemoryPages(void* ptr, size_t size)
    if (ptr)
    {
 #ifdef _WIN32
-    
        if (!VirtualFree(ptr, 0, MEM_RELEASE))
            PanicAlert("FreeMemoryPages failed!\n%s", GetLastErrorMsg());
        ptr = NULL; // Is this our responsibility?
-    
 #else
        munmap(ptr, size);
 #endif
diff --git a/src/common/msg_handler.h b/src/common/msg_handler.h
index 7c5319ec3..9bfdf950e 100644
--- a/src/common/msg_handler.h
+++ b/src/common/msg_handler.h
@@ -15,7 +15,7 @@ enum MSG_TYPE
    CRITICAL
 };
-typedef bool (*MsgAlertHandler)(const char* caption, const char* text, 
+typedef bool (*MsgAlertHandler)(const char* caption, const char* text,
                                bool yes_no, int Style);
 typedef std::string (*StringTranslator)(const char* text);
@@ -31,29 +31,29 @@ void SetEnableAlert(bool enable);
 #ifndef GEKKO
 #ifdef _WIN32
-    #define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__) 
+    #define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__)
-    #define PanicAlert(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__) 
+    #define PanicAlert(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__)
-    #define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__) 
+    #define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__)
-    #define AskYesNo(format, ...) MsgAlert(true, QUESTION, format, __VA_ARGS__) 
+    #define AskYesNo(format, ...) MsgAlert(true, QUESTION, format, __VA_ARGS__)
-    #define CriticalAlert(format, ...) MsgAlert(false, CRITICAL, format, __VA_ARGS__) 
+    #define CriticalAlert(format, ...) MsgAlert(false, CRITICAL, format, __VA_ARGS__)
    // Use these macros (that do the same thing) if the message should be translated.
-    #define SuccessAlertT(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__) 
+    #define SuccessAlertT(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__)
-    #define PanicAlertT(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__) 
+    #define PanicAlertT(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__)
-    #define PanicYesNoT(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__) 
+    #define PanicYesNoT(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__)
-    #define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, __VA_ARGS__) 
+    #define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, __VA_ARGS__)
-    #define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, __VA_ARGS__) 
+    #define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, __VA_ARGS__)
 #else
-    #define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, ##__VA_ARGS__) 
+    #define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, ##__VA_ARGS__)
-    #define PanicAlert(format, ...) MsgAlert(false, WARNING, format, ##__VA_ARGS__) 
+    #define PanicAlert(format, ...) MsgAlert(false, WARNING, format, ##__VA_ARGS__)
-    #define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, ##__VA_ARGS__) 
+    #define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, ##__VA_ARGS__)
-    #define AskYesNo(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__) 
+    #define AskYesNo(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__)
-    #define CriticalAlert(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__) 
+    #define CriticalAlert(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__)
    // Use these macros (that do the same thing) if the message should be translated.
-    #define SuccessAlertT(format, ...) MsgAlert(false, INFORMATION, format, ##__VA_ARGS__) 
+    #define SuccessAlertT(format, ...) MsgAlert(false, INFORMATION, format, ##__VA_ARGS__)
-    #define PanicAlertT(format, ...) MsgAlert(false, WARNING, format, ##__VA_ARGS__) 
+    #define PanicAlertT(format, ...) MsgAlert(false, WARNING, format, ##__VA_ARGS__)
-    #define PanicYesNoT(format, ...) MsgAlert(true, WARNING, format, ##__VA_ARGS__) 
+    #define PanicYesNoT(format, ...) MsgAlert(true, WARNING, format, ##__VA_ARGS__)
-    #define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__) 
+    #define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__)
-    #define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__) 
+    #define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__)
 #endif
 #else
 // GEKKO
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 54943d306..dcec9275f 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -121,11 +121,11 @@ std::string ArrayToString(const u8 *data, u32 size, int line_len, bool spaces)
 {
    std::ostringstream oss;
    oss << std::setfill('0') << std::hex;
-    
    for (int line = 0; size; ++data, --size)
    {
        oss << std::setw(2) << (int)*data;
-        
        if (line_len == ++line)
        {
            oss << '\n';
@@ -168,7 +168,7 @@ bool TryParse(const std::string &str, u32 *const output)
    errno = 0;
    unsigned long value = strtoul(str.c_str(), &endptr, 0);
-    
    if (!endptr || *endptr)
        return false;
@@ -294,7 +294,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st
 //#include <string>
 //#include <assert.h>
-const char HEX2DEC[256] = 
+const char HEX2DEC[256] =
 {
    /*       0  1  2  3   4  5  6  7   8  9  A  B   C  D  E  F */
    /* 0 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
@@ -327,7 +327,7 @@ std::string UriDecode(const std::string & sSrc)
    const unsigned char * pSrc = (const unsigned char *)sSrc.c_str();
    const size_t SRC_LEN = sSrc.length();
    const unsigned char * const SRC_END = pSrc + SRC_LEN;
-    const unsigned char * const SRC_LAST_DEC = SRC_END - 2;   // last decodable '%' 
+    const unsigned char * const SRC_LAST_DEC = SRC_END - 2;   // last decodable '%'
    char * const pStart = new char[SRC_LEN];
    char * pEnd = pStart;
@@ -394,7 +394,7 @@ std::string UriEncode(const std::string & sSrc)
    for (; pSrc < SRC_END; ++pSrc)
    {
-        if (SAFE[*pSrc]) 
+        if (SAFE[*pSrc])
            *pEnd++ = *pSrc;
        else
        {
@@ -518,9 +518,9 @@ static std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>&
    out_buffer.resize(out_buffer_size - dst_bytes);
    out_buffer.swap(result);
-    
    iconv_close(conv_desc);
-    
    return result;
 }
@@ -576,7 +576,7 @@ std::u16string UTF8ToUTF16(const std::string& input)
    out_buffer.swap(result);
    iconv_close(conv_desc);
-    
    return result;
 }
diff --git a/src/common/string_util.h b/src/common/string_util.h
index 787a5663f..ae5bbadad 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -63,7 +63,7 @@ template <typename N>
 static bool TryParse(const std::string &str, N *const output)
 {
    std::istringstream iss(str);
-    
    N tmp = 0;
    if (iss >> tmp)
    {
diff --git a/src/common/symbols.cpp b/src/common/symbols.cpp
index d61f4c0c6..63ad6218b 100644
--- a/src/common/symbols.cpp
+++ b/src/common/symbols.cpp
@@ -31,7 +31,7 @@ namespace Symbols
    {
        TSymbolsMap::iterator foundSymbolItr;
        TSymbol symbol;
-        
        foundSymbolItr = g_symbols.find(_address);
        if (foundSymbolItr != g_symbols.end())
        {
@@ -44,7 +44,7 @@ namespace Symbols
    {
        return GetSymbol(_address).name;
    }
-    
    void Remove(u32 _address)
    {
        g_symbols.erase(_address);
diff --git a/src/common/symbols.h b/src/common/symbols.h
index b13a8001a..4560f5240 100644
--- a/src/common/symbols.h
+++ b/src/common/symbols.h
@@ -33,5 +33,5 @@ namespace Symbols
    const std::string GetName(u32 _address);
    void Remove(u32 _address);
    void Clear();
-};
+}
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index 60d8ed075..dc153ba71 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -25,7 +25,7 @@ int CurrentThreadId()
    return 0;
 #endif
 }
-    
 #ifdef _WIN32
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
@@ -52,7 +52,7 @@ void SwitchCurrentThread()
 // Sets the debugger-visible name of the current thread.
 // Uses undocumented (actually, it is now documented) trick.
 // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vsdebug/html/vxtsksettingthreadname.asp
-    
 // This is implemented much nicer in upcoming msvc++, see:
 // http://msdn.microsoft.com/en-us/library/xcb2z8hs(VS.100).aspx
 void SetCurrentThreadName(const char* szThreadName)
@@ -81,7 +81,7 @@ void SetCurrentThreadName(const char* szThreadName)
    __except(EXCEPTION_CONTINUE_EXECUTION)
    {}
 }
-    
 #else // !WIN32, so must be POSIX threads
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
diff --git a/src/common/thread.h b/src/common/thread.h
index f7ace21b4..be9b5cbe2 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -30,13 +30,13 @@ int CurrentThreadId();
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask);
 void SetCurrentThreadAffinity(u32 mask);
-    
 class Event
 {
 public:
    Event()
        : is_set(false)
-    {};
+    {}
    void Set()
    {
@@ -135,7 +135,7 @@ private:
    const size_t m_count;
    volatile size_t m_waiting;
 };
-    
 void SleepCurrentThread(int ms);
 void SwitchCurrentThread();    // On Linux, this is equal to sleep 1ms
@@ -146,7 +146,7 @@ inline void YieldCPU()
 {
    std::this_thread::yield();
 }
-    
 void SetCurrentThreadName(const char *name);
-    
 } // namespace Common
diff --git a/src/common/thread_queue_list.h b/src/common/thread_queue_list.h
index 4a89572f6..59efbce4c 100644
--- a/src/common/thread_queue_list.h
+++ b/src/common/thread_queue_list.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project / PPSSPP Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
@@ -12,7 +12,7 @@ template<class IdType>
 struct ThreadQueueList {
    // Number of queues (number of priority levels starting at 0.)
    static const int NUM_QUEUES = 128;
-    
    // Initial number of threads a single queue can handle.
    static const int INITIAL_CAPACITY = 32;
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 2315cc791..b3bfbca9e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -31,18 +31,24 @@ set(SRCS
            hle/kernel/shared_memory.cpp
            hle/kernel/thread.cpp
            hle/service/ac_u.cpp
+            hle/service/am_net.cpp
            hle/service/apt_u.cpp
            hle/service/boss_u.cpp
+            hle/service/cfg_i.cpp
            hle/service/cfg_u.cpp
+            hle/service/csnd_snd.cpp
            hle/service/dsp_dsp.cpp
            hle/service/err_f.cpp
            hle/service/fs_user.cpp
            hle/service/frd_u.cpp
            hle/service/gsp_gpu.cpp
            hle/service/hid_user.cpp
+            hle/service/ir_rst.cpp
+            hle/service/ir_u.cpp
            hle/service/mic_u.cpp
            hle/service/ndm_u.cpp
            hle/service/nwm_uds.cpp
+            hle/service/pm_app.cpp
            hle/service/ptm_u.cpp
            hle/service/service.cpp
            hle/service/soc_u.cpp
@@ -103,18 +109,24 @@ set(HEADERS
            hle/kernel/shared_memory.h
            hle/kernel/thread.h
            hle/service/ac_u.h
+            hle/service/am_net.h
            hle/service/apt_u.h
            hle/service/boss_u.h
+            hle/service/cfg_i.h
            hle/service/cfg_u.h
+            hle/service/csnd_snd.h
            hle/service/dsp_dsp.h
            hle/service/err_f.h
            hle/service/fs_user.h
            hle/service/frd_u.h
            hle/service/gsp_gpu.h
            hle/service/hid_user.h
+            hle/service/ir_rst.h
+            hle/service/ir_u.h
            hle/service/mic_u.h
            hle/service/ndm_u.h
            hle/service/nwm_uds.h
+            hle/service/pm_app.h
            hle/service/ptm_u.h
            hle/service/service.h
            hle/service/soc_u.h
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h
index 4b93d3313..3ae528562 100644
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
@@ -63,7 +63,7 @@ public:
     * Get the current CPSR register
     * @return Returns the value of the CPSR register
     */
-    virtual u32 GetCPSR() const = 0;  
+    virtual u32 GetCPSR() const = 0;
    /**
     * Set the current CPSR register
@@ -98,7 +98,7 @@ public:
    }
 protected:
-    
    /**
     * Executes the given number of instructions
     * @param num_instructions Number of instructions to executes
diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp
index 0f384ad3e..55278474b 100644
--- a/src/core/arm/disassembler/load_symbol_map.cpp
+++ b/src/core/arm/disassembler/load_symbol_map.cpp
@@ -22,8 +22,8 @@ void LoadSymbolMap(std::string filename) {
    while (std::getline(infile, line)) {
        std::istringstream iss(line);
-        if (!(iss >> address_str >> size >> function_name)) { 
+        if (!(iss >> address_str >> size >> function_name)) {
-            break; // Error parsing 
+            break; // Error parsing
        }
        u32 address = std::stoul(address_str, nullptr, 16);
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index a3ed3e31e..6c8ea211e 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include "core/arm/skyeye_common/armcpu.h"
 #include "core/arm/skyeye_common/armemu.h"
@@ -113,7 +113,7 @@ void ARM_DynCom::ExecuteInstructions(int num_instructions) {
    state->NumInstrsToExecute = num_instructions;
    // Dyncom only breaks on instruction dispatch. This only happens on every instruction when
-    // executing one instruction at a time. Otherwise, if a block is being executed, more 
+    // executing one instruction at a time. Otherwise, if a block is being executed, more
    // instructions may actually be executed than specified.
    ticks += InterpreterMainLoop(state.get());
 }
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h
index 1f8cd3a3a..51eea41ed 100644
--- a/src/core/arm/dyncom/arm_dyncom.h
+++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
@@ -19,7 +19,7 @@ public:
    /**
     * Set the Program Counter to an address
-     * @param addr Address to set PC to
+     * @param pc Address to set PC to
     */
    void SetPC(u32 pc) override;
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.h b/src/core/arm/dyncom/arm_dyncom_interpreter.h
index c65eb23f7..3a2462f55 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.h
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/arm/interpreter/arm_interpreter.cpp b/src/core/arm/interpreter/arm_interpreter.cpp
index ed4415082..e2aa5ce92 100644
--- a/src/core/arm/interpreter/arm_interpreter.cpp
+++ b/src/core/arm/interpreter/arm_interpreter.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include "core/arm/interpreter/arm_interpreter.h"
@@ -24,7 +24,7 @@ ARM_Interpreter::ARM_Interpreter()  {
    state->lateabtSig = LOW;
    // Reset the core to initial state
-    ARMul_CoProInit(state); 
+    ARMul_CoProInit(state);
    ARMul_Reset(state);
    state->NextInstr = RESUME; // NOTE: This will be overwritten by LoadContext
    state->Emulate = 3;
diff --git a/src/core/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h
index ceb1be438..ed53d997c 100644
--- a/src/core/arm/interpreter/arm_interpreter.h
+++ b/src/core/arm/interpreter/arm_interpreter.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
@@ -18,7 +18,7 @@ public:
    /**
     * Set the Program Counter to an address
-     * @param addr Address to set PC to
+     * @param pc Address to set PC to
     */
    void SetPC(u32 pc) override;
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 25c78d33c..865898b24 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -16,10 +16,10 @@
 namespace Core {
-u64             g_last_ticks    = 0;        ///< Last CPU ticks
+static u64         last_ticks = 0;        ///< Last CPU ticks
-ARM_Disasm*     g_disasm        = nullptr;  ///< ARM disassembler
+static ARM_Disasm* disasm     = nullptr;  ///< ARM disassembler
-ARM_Interface*  g_app_core      = nullptr;  ///< ARM11 application core
+ARM_Interface*     g_app_core = nullptr;  ///< ARM11 application core
-ARM_Interface*  g_sys_core      = nullptr;  ///< ARM11 system (OS) core
+ARM_Interface*     g_sys_core = nullptr;  ///< ARM11 system (OS) core
 /// Run the core CPU loop
 void RunLoop(int tight_loop) {
@@ -49,7 +49,7 @@ void Stop() {
 int Init() {
    NOTICE_LOG(MASTER_LOG, "initialized OK");
-    g_disasm = new ARM_Disasm();
+    disasm = new ARM_Disasm();
    g_sys_core = new ARM_Interpreter();
    switch (Settings::values.cpu_core) {
@@ -62,13 +62,13 @@ int Init() {
            break;
    }
-    g_last_ticks = Core::g_app_core->GetTicks();
+    last_ticks = Core::g_app_core->GetTicks();
    return 0;
 }
 void Shutdown() {
-    delete g_disasm;
+    delete disasm;
    delete g_app_core;
    delete g_sys_core;
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 0116cb376..558c6cbf7 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -41,7 +41,7 @@ struct BaseEvent
    s64 time;
    u64 userdata;
    int type;
-    //  Event *next;
+    // Event *next;
 };
 typedef LinkedListItem<BaseEvent> Event;
@@ -249,7 +249,7 @@ void AddEventToQueue(Event* ne)
 // This must be run ONLY from within the cpu thread
 // cyclesIntoFuture may be VERY inaccurate if called from anything else
-// than Advance 
+// than Advance
 void ScheduleEvent(s64 cyclesIntoFuture, int event_type, u64 userdata)
 {
    Event *ne = GetNewEvent();
@@ -469,8 +469,8 @@ void ProcessFifoWaitEvents()
    {
        if (first->time <= globalTimer)
        {
-            //                  LOG(TIMER, "[Scheduler] %s               (%lld, %lld) ", 
+            //LOG(TIMER, "[Scheduler] %s (%lld, %lld) ",
-            //                          first->name ? first->name : "?", (u64)globalTimer, (u64)first->time);
+            //    first->name ? first->name : "?", (u64)globalTimer, (u64)first->time);
            Event* evt = first;
            first = first->next;
            event_types[evt->type].callback(evt->userdata, (int)(globalTimer - evt->time));
@@ -516,23 +516,23 @@ void Advance()
    //currentMIPS->downcount = slicelength;
    //if (Common::AtomicLoadAcquire(hasTsEvents))
-    //  MoveEvents();
+    //    MoveEvents();
    //ProcessFifoWaitEvents();
    //if (!first)
    //{
-    //  // WARN_LOG(TIMER, "WARNING - no events in queue. Setting currentMIPS->downcount to 10000");
+    //    // WARN_LOG(TIMER, "WARNING - no events in queue. Setting currentMIPS->downcount to 10000");
-    //  currentMIPS->downcount += 10000;
+    //    currentMIPS->downcount += 10000;
    //}
    //else
    //{
-    //  slicelength = (int)(first->time - globalTimer);
+    //    slicelength = (int)(first->time - globalTimer);
-    //  if (slicelength > MAX_SLICE_LENGTH)
+    //    if (slicelength > MAX_SLICE_LENGTH)
-    //          slicelength = MAX_SLICE_LENGTH;
+    //        slicelength = MAX_SLICE_LENGTH;
-    //  currentMIPS->downcount = slicelength;
+    //    currentMIPS->downcount = slicelength;
    //}
    //if (advanceCallback)
-    //  advanceCallback(cyclesExecuted);
+    //    advanceCallback(cyclesExecuted);
 }
 void LogPendingEvents()
@@ -550,20 +550,20 @@ void Idle(int maxIdle)
    ERROR_LOG(TIME, "Unimplemented function!");
    //int cyclesDown = currentMIPS->downcount;
    //if (maxIdle != 0 && cyclesDown > maxIdle)
-    //  cyclesDown = maxIdle;
+    //    cyclesDown = maxIdle;
    //if (first && cyclesDown > 0)
    //{
-    //  int cyclesExecuted = slicelength - currentMIPS->downcount;
+    //    int cyclesExecuted = slicelength - currentMIPS->downcount;
-    //  int cyclesNextEvent = (int) (first->time - globalTimer);
+    //    int cyclesNextEvent = (int) (first->time - globalTimer);
-    //  if (cyclesNextEvent < cyclesExecuted + cyclesDown)
+    //    if (cyclesNextEvent < cyclesExecuted + cyclesDown)
-    //  {
+    //    {
-    //          cyclesDown = cyclesNextEvent - cyclesExecuted;
+    //        cyclesDown = cyclesNextEvent - cyclesExecuted;
-    //          // Now, now... no time machines, please.
+    //        // Now, now... no time machines, please.
-    //          if (cyclesDown < 0)
+    //        if (cyclesDown < 0)
-    //                  cyclesDown = 0;
+    //            cyclesDown = 0;
-    //  }
+    //    }
    //}
    //INFO_LOG(TIME, "Idle for %i cycles! (%f ms)", cyclesDown, cyclesDown / (float)(g_clock_rate_arm11 * 0.001f));
@@ -571,7 +571,7 @@ void Idle(int maxIdle)
    //idledCycles += cyclesDown;
    //currentMIPS->downcount -= cyclesDown;
    //if (currentMIPS->downcount == 0)
-    //  currentMIPS->downcount = -1;
+    //    currentMIPS->downcount = -1;
 }
 std::string GetScheduledEventsSummary()
@@ -623,4 +623,4 @@ void DoState(PointerWrap &p)
    p.Do(idledCycles);
 }
-}       // namespace
+} // namespace
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index 09fdf7a90..b197cf40c 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -106,4 +106,4 @@ void SetClockFrequencyMHz(int cpuMhz);
 int GetClockFrequencyMHz();
 extern int slicelength;
-}; // namespace
+} // namespace
diff --git a/src/core/file_sys/archive.h b/src/core/file_sys/archive.h
index 4cf47f30a..2e79bb883 100644
--- a/src/core/file_sys/archive.h
+++ b/src/core/file_sys/archive.h
@@ -236,7 +236,7 @@ public:
     * @return Size of the archive in bytes
     */
    virtual size_t GetSize() const = 0;
-    
    /**
     * Set the size of the archive in bytes
     */
diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp
index 05fc1f87f..53dc57954 100644
--- a/src/core/file_sys/archive_romfs.cpp
+++ b/src/core/file_sys/archive_romfs.cpp
@@ -61,7 +61,7 @@ bool Archive_RomFS::DeleteDirectory(const FileSys::Path& path) const {
 bool Archive_RomFS::CreateDirectory(const Path& path) const {
    ERROR_LOG(FILESYS, "Attempted to create a directory in ROMFS.");
    return false;
-};
+}
 /**
 * Open a directory specified by its path
diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h
index aa6446c51..0649dde99 100644
--- a/src/core/file_sys/archive_romfs.h
+++ b/src/core/file_sys/archive_romfs.h
@@ -26,7 +26,7 @@ public:
     * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.)
     * @return IdCode of the archive
     */
-    IdCode GetIdCode() const override { return IdCode::RomFS; };
+    IdCode GetIdCode() const override { return IdCode::RomFS; }
    /**
     * Open a file specified by its path, using the specified mode
@@ -88,7 +88,7 @@ public:
     * @return Size of the archive in bytes
     */
    size_t GetSize() const override;
-    
    /**
     * Set the size of the archive in bytes
     */
diff --git a/src/core/file_sys/archive_sdmc.h b/src/core/file_sys/archive_sdmc.h
index 8ac06484c..74ce29c0d 100644
--- a/src/core/file_sys/archive_sdmc.h
+++ b/src/core/file_sys/archive_sdmc.h
@@ -30,7 +30,7 @@ public:
     * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.)
     * @return IdCode of the archive
     */
-    IdCode GetIdCode() const override { return IdCode::SDMC; };
+    IdCode GetIdCode() const override { return IdCode::SDMC; }
    /**
     * Open a file specified by its path, using the specified mode
diff --git a/src/core/file_sys/directory_sdmc.cpp b/src/core/file_sys/directory_sdmc.cpp
index 923ca6862..60a197ce9 100644
--- a/src/core/file_sys/directory_sdmc.cpp
+++ b/src/core/file_sys/directory_sdmc.cpp
@@ -45,7 +45,7 @@ u32 Directory_SDMC::Read(const u32 count, Entry* entries) {
        WARN_LOG(FILESYS, "File %s: size=%llu dir=%d", filename.c_str(), file.size, file.isDirectory);
        // TODO(Link Mauve): use a proper conversion to UTF-16.
-        for (int j = 0; j < FILENAME_LENGTH; ++j) {
+        for (size_t j = 0; j < FILENAME_LENGTH; ++j) {
            entry.filename[j] = filename[j];
            if (!filename[j])
                break;
diff --git a/src/core/hle/config_mem.cpp b/src/core/hle/config_mem.cpp
index a45e61427..c7cf5b1d3 100644
--- a/src/core/hle/config_mem.cpp
+++ b/src/core/hle/config_mem.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include "common/common_types.h"
diff --git a/src/core/hle/coprocessor.cpp b/src/core/hle/coprocessor.cpp
index 1eb33eb86..e34229a57 100644
--- a/src/core/hle/coprocessor.cpp
+++ b/src/core/hle/coprocessor.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include "core/hle/coprocessor.h"
 #include "core/hle/hle.h"
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h
index 55eaf0621..3dbe25037 100644
--- a/src/core/hle/function_wrappers.h
+++ b/src/core/hle/function_wrappers.h
@@ -50,7 +50,7 @@ template<s32 func(u32*, u32, u32, u32, u32, u32)> void Wrap(){
 template<s32 func(s32*, u32*, s32, bool, s64)> void Wrap() {
    s32 param_1 = 0;
-    s32 retval = func(&param_1, (Handle*)Memory::GetPointer(PARAM(1)), (s32)PARAM(2), 
+    s32 retval = func(&param_1, (Handle*)Memory::GetPointer(PARAM(1)), (s32)PARAM(2),
        (PARAM(3) != 0), (((s64)PARAM(4) << 32) | PARAM(0)));
    Core::g_app_core->SetReg(1, (u32)param_1);
    FuncReturn(retval);
@@ -103,7 +103,7 @@ template<s32 func(void*)> void Wrap() {
 }
 template<s32 func(s64*, u32, void*, s32)> void Wrap(){
-    FuncReturn(func((s64*)Memory::GetPointer(PARAM(0)), PARAM(1), Memory::GetPointer(PARAM(2)), 
+    FuncReturn(func((s64*)Memory::GetPointer(PARAM(0)), PARAM(1), Memory::GetPointer(PARAM(2)),
        (s32)PARAM(3)));
 }
diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp
index b03894ad7..b8ac186f6 100644
--- a/src/core/hle/hle.cpp
+++ b/src/core/hle/hle.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include <vector>
@@ -20,7 +20,7 @@ bool g_reschedule = false;  ///< If true, immediately reschedules the CPU to a n
 const FunctionDef* GetSVCInfo(u32 opcode) {
    u32 func_num = opcode & 0xFFFFFF; // 8 bits
    if (func_num > 0xFF) {
-        ERROR_LOG(HLE,"unknown svc=0x%02X", func_num); 
+        ERROR_LOG(HLE,"unknown svc=0x%02X", func_num);
        return nullptr;
    }
    return &g_module_db[0].func_table[func_num];
@@ -58,7 +58,7 @@ void RegisterAllModules() {
 void Init() {
    Service::Init();
-    
    RegisterAllModules();
    NOTICE_LOG(HLE, "initialized OK");
diff --git a/src/core/hle/hle.h b/src/core/hle/hle.h
index bf4d84575..4ab258c69 100644
--- a/src/core/hle/hle.h
+++ b/src/core/hle/hle.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h
index a483fe466..6886e479d 100644
--- a/src/core/hle/kernel/address_arbiter.h
+++ b/src/core/hle/kernel/address_arbiter.h
@@ -11,7 +11,7 @@
 // Address arbiters are an underlying kernel synchronization object that can be created/used via
 // supervisor calls (SVCs). They function as sort of a global lock. Typically, games/other CTR
 // applications use them as an underlying mechanism to implement thread-safe barriers, events, and
-// semphores. 
+// semphores.
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Kernel namespace
diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp
index 85defeb7a..900f484c7 100644
--- a/src/core/hle/kernel/archive.cpp
+++ b/src/core/hle/kernel/archive.cpp
@@ -52,14 +52,14 @@ public:
    FileSys::Archive* backend;  ///< Archive backend interface
    /**
-     * Synchronize kernel object 
+     * Synchronize kernel object
     * @param wait Boolean wait set if current thread should wait as a result of sync operation
     * @return Result of operation, 0 on success, otherwise error code
     */
    Result SyncRequest(bool* wait) override {
        u32* cmd_buff = Service::GetCommandBuffer();
        FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]);
-        
        switch (cmd) {
        // Read from archive...
        case FileCommand::Read:
@@ -343,7 +343,7 @@ Archive* CreateArchive(Handle& handle, FileSys::Archive* backend, const std::str
    archive->backend = backend;
    MountArchive(archive);
-    
    return archive;
 }
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index 45ed79be8..e0117c0bc 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include <map>
 #include <algorithm>
@@ -95,7 +95,7 @@ Result SignalEvent(const Handle handle) {
    for (size_t i = 0; i < evt->waiting_threads.size(); ++i) {
        ResumeThreadFromWait( evt->waiting_threads[i]);
-        // If any thread is signalled awake by this event, assume the event was "caught" and reset 
+        // If any thread is signalled awake by this event, assume the event was "caught" and reset
        // the event. This will result in the next thread waiting on the event to block. Otherwise,
        // the event will not be reset, and the next thread to call WaitSynchronization on it will
        // not block. Not sure if this is correct behavior, but it seems to work.
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h
index c39b33180..6add72897 100644
--- a/src/core/hle/kernel/event.h
+++ b/src/core/hle/kernel/event.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 88cbc1af5..018000abd 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project / PPSSPP Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include "common/common.h"
@@ -68,7 +68,7 @@ void ObjectPool::List() {
    for (int i = 0; i < MAX_COUNT; i++) {
        if (occupied[i]) {
            if (pool[i]) {
-                INFO_LOG(KERNEL, "KO %i: %s \"%s\"", i + HANDLE_OFFSET, pool[i]->GetTypeName().c_str(), 
+                INFO_LOG(KERNEL, "KO %i: %s \"%s\"", i + HANDLE_OFFSET, pool[i]->GetTypeName().c_str(),
                    pool[i]->GetName().c_str());
            }
        }
@@ -110,7 +110,7 @@ void Shutdown() {
 */
 bool LoadExec(u32 entry_point) {
    Init();
-    
    Core::g_app_core->SetPC(entry_point);
    // 0x30 is the typical main thread priority I've seen used so far
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 867d1b89c..e0c94f186 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project / PPSSPP Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
@@ -34,7 +34,7 @@ enum class HandleType : u32 {
    Archive         = 12,
    Directory       = 13,
 };
-    
 enum {
    DEFAULT_STACK_SIZE  = 0x4000,
 };
@@ -52,7 +52,7 @@ public:
    virtual Kernel::HandleType GetHandleType() const = 0;
    /**
-     * Synchronize kernel object 
+     * Synchronize kernel object
     * @param wait Boolean wait set if current thread should wait as a result of sync operation
     * @return Result of operation, 0 on success, otherwise error code
     */
@@ -87,7 +87,7 @@ public:
            delete pool[handle - HANDLE_OFFSET];
        }
        return error;
-    };
+    }
    bool IsValid(Handle handle);
@@ -139,7 +139,7 @@ public:
    }
    bool GetIDType(Handle handle, HandleType* type) const {
-        if ((handle < HANDLE_OFFSET) || (handle >= HANDLE_OFFSET + MAX_COUNT) || 
+        if ((handle < HANDLE_OFFSET) || (handle >= HANDLE_OFFSET + MAX_COUNT) ||
            !occupied[handle - HANDLE_OFFSET]) {
            ERROR_LOG(KERNEL, "Kernel: Bad object handle %i (%08x)", handle, handle);
            return false;
@@ -155,7 +155,7 @@ public:
    int GetCount();
 private:
-    
    enum {
        MAX_COUNT       = 0x1000,
        HANDLE_OFFSET   = 0x100,
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index fcfd061ac..31129fd86 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include <map>
 #include <vector>
@@ -28,7 +28,7 @@ public:
    std::string name;                           ///< Name of mutex (optional)
    /**
-     * Synchronize kernel object 
+     * Synchronize kernel object
     * @param wait Boolean wait set if current thread should wait as a result of sync operation
     * @return Result of operation, 0 on success, otherwise error code
     */
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h
index 7d7b5137e..313ba6fee 100644
--- a/src/core/hle/kernel/mutex.h
+++ b/src/core/hle/kernel/mutex.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index f538c6550..7ef3e54cc 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include "common/common.h"
@@ -67,7 +67,7 @@ Handle CreateSharedMemory(const std::string& name) {
 * @param other_permissions Memory block map other permissions (specified by SVC field)
 * @return Result of operation, 0 on success, otherwise error code
 */
-Result MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions, 
+Result MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions,
    MemoryPermission other_permissions) {
    if (address < Memory::SHARED_MEMORY_VADDR || address >= Memory::SHARED_MEMORY_VADDR_END) {
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h
index 5312b8854..0aec03538 100644
--- a/src/core/hle/kernel/shared_memory.h
+++ b/src/core/hle/kernel/shared_memory.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
@@ -34,7 +34,7 @@ Handle CreateSharedMemory(const std::string& name="Unknown");
 * @param other_permissions Memory block map other permissions (specified by SVC field)
 * @return Result of operation, 0 on success, otherwise error code
 */
-Result MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions, 
+Result MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions,
    MemoryPermission other_permissions);
 /**
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index e15590c49..cc70cbca7 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project / PPSSPP Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include <algorithm>
 #include <list>
@@ -71,17 +71,17 @@ public:
 };
 // Lists all thread ids that aren't deleted/etc.
-std::vector<Handle> g_thread_queue;
+static std::vector<Handle> thread_queue;
 // Lists only ready thread ids.
-Common::ThreadQueueList<Handle> g_thread_ready_queue;
+static Common::ThreadQueueList<Handle> thread_ready_queue;
-Handle g_current_thread_handle;
+static Handle current_thread_handle;
-Thread* g_current_thread;
+static Thread* current_thread;
 /// Gets the current thread
 inline Thread* GetCurrentThread() {
-    return g_current_thread;
+    return current_thread;
 }
 /// Gets the current thread handle
@@ -91,8 +91,8 @@ Handle GetCurrentThreadHandle() {
 /// Sets the current thread
 inline void SetCurrentThread(Thread* t) {
-    g_current_thread = t;
+    current_thread = t;
-    g_current_thread_handle = t->GetHandle();
+    current_thread_handle = t->GetHandle();
 }
 /// Saves the current CPU context
@@ -113,7 +113,7 @@ void ResetThread(Thread* t, u32 arg, s32 lowest_priority) {
    t->context.pc = t->context.reg_15 = t->entry_point;
    t->context.sp = t->stack_top;
    t->context.cpsr = 0x1F; // Usermode
-    
    // TODO(bunnei): This instructs the CPU core to start the execution as if it is "resuming" a
    // thread. This is somewhat Sky-Eye specific, and should be re-architected in the future to be
    // agnostic of the CPU core.
@@ -131,13 +131,13 @@ void ChangeReadyState(Thread* t, bool ready) {
    Handle handle = t->GetHandle();
    if (t->IsReady()) {
        if (!ready) {
-            g_thread_ready_queue.remove(t->current_priority, handle);
+            thread_ready_queue.remove(t->current_priority, handle);
        }
    }  else if (ready) {
        if (t->IsRunning()) {
-            g_thread_ready_queue.push_front(t->current_priority, handle);
+            thread_ready_queue.push_front(t->current_priority, handle);
        } else {
-            g_thread_ready_queue.push_back(t->current_priority, handle);
+            thread_ready_queue.push_back(t->current_priority, handle);
        }
        t->status = THREADSTATUS_READY;
    }
@@ -148,7 +148,7 @@ inline bool VerifyWait(const Handle& handle, WaitType type, Handle wait_handle)
    Thread* thread = g_object_pool.GetFast<Thread>(handle);
    _assert_msg_(KERNEL, (thread != nullptr), "called, but thread is nullptr!");
-    if (type != thread->wait_type || wait_handle != thread->wait_handle) 
+    if (type != thread->wait_type || wait_handle != thread->wait_handle)
        return false;
    return true;
@@ -158,7 +158,7 @@ inline bool VerifyWait(const Handle& handle, WaitType type, Handle wait_handle)
 void StopThread(Handle handle, const char* reason) {
    Thread* thread = g_object_pool.GetFast<Thread>(handle);
    _assert_msg_(KERNEL, (thread != nullptr), "called, but thread is nullptr!");
-    
    ChangeReadyState(thread, false);
    thread->status = THREADSTATUS_DORMANT;
    for (size_t i = 0; i < thread->waiting_threads.size(); ++i) {
@@ -181,7 +181,7 @@ void ChangeThreadState(Thread* t, ThreadStatus new_status) {
    }
    ChangeReadyState(t, (new_status & THREADSTATUS_READY) != 0);
    t->status = new_status;
-    
    if (new_status == THREADSTATUS_WAIT) {
        if (t->wait_type == WAITTYPE_NONE) {
            ERROR_LOG(KERNEL, "Waittype none not allowed");
@@ -195,7 +195,7 @@ Handle ArbitrateHighestPriorityThread(u32 arbiter, u32 address) {
    s32 priority = THREADPRIO_LOWEST;
    // Iterate through threads, find highest priority thread that is waiting to be arbitrated...
-    for (const auto& handle : g_thread_queue) {
+    for (const auto& handle : thread_queue) {
        // TODO(bunnei): Verify arbiter address...
        if (!VerifyWait(handle, WAITTYPE_ARB, arbiter))
@@ -216,9 +216,9 @@ Handle ArbitrateHighestPriorityThread(u32 arbiter, u32 address) {
 /// Arbitrate all threads currently waiting
 void ArbitrateAllThreads(u32 arbiter, u32 address) {
-    
    // Iterate through threads, find highest priority thread that is waiting to be arbitrated...
-    for (const auto& handle : g_thread_queue) {
+    for (const auto& handle : thread_queue) {
        // TODO(bunnei): Verify arbiter address...
        if (VerifyWait(handle, WAITTYPE_ARB, arbiter))
@@ -238,11 +238,11 @@ void CallThread(Thread* t) {
 /// Switches CPU context to that of the specified thread
 void SwitchContext(Thread* t) {
    Thread* cur = GetCurrentThread();
-    
    // Save context for current thread
    if (cur) {
        SaveContext(cur->context);
-        
        if (cur->IsRunning()) {
            ChangeReadyState(cur, true);
        }
@@ -263,11 +263,11 @@ void SwitchContext(Thread* t) {
 Thread* NextThread() {
    Handle next;
    Thread* cur = GetCurrentThread();
-    
    if (cur && cur->IsRunning()) {
-        next = g_thread_ready_queue.pop_first_better(cur->current_priority);
+        next = thread_ready_queue.pop_first_better(cur->current_priority);
    } else  {
-        next = g_thread_ready_queue.pop_first();
+        next = thread_ready_queue.pop_first();
    }
    if (next == 0) {
        return nullptr;
@@ -306,9 +306,9 @@ void DebugThreadQueue() {
        return;
    }
    INFO_LOG(KERNEL, "0x%02X 0x%08X (current)", thread->current_priority, GetCurrentThreadHandle());
-    for (u32 i = 0; i < g_thread_queue.size(); i++) {
+    for (u32 i = 0; i < thread_queue.size(); i++) {
-        Handle handle = g_thread_queue[i];
+        Handle handle = thread_queue[i];
-        s32 priority = g_thread_ready_queue.contains(handle);
+        s32 priority = thread_ready_queue.contains(handle);
        if (priority != -1) {
            INFO_LOG(KERNEL, "0x%02X 0x%08X", priority, handle);
        }
@@ -319,15 +319,15 @@ void DebugThreadQueue() {
 Thread* CreateThread(Handle& handle, const char* name, u32 entry_point, s32 priority,
    s32 processor_id, u32 stack_top, int stack_size) {
-    _assert_msg_(KERNEL, (priority >= THREADPRIO_HIGHEST && priority <= THREADPRIO_LOWEST), 
+    _assert_msg_(KERNEL, (priority >= THREADPRIO_HIGHEST && priority <= THREADPRIO_LOWEST),
        "CreateThread priority=%d, outside of allowable range!", priority)
    Thread* thread = new Thread;
    handle = Kernel::g_object_pool.Create(thread);
-    g_thread_queue.push_back(handle);
+    thread_queue.push_back(handle);
-    g_thread_ready_queue.prepare(priority);
+    thread_ready_queue.prepare(priority);
    thread->status = THREADSTATUS_DORMANT;
    thread->entry_point = entry_point;
@@ -351,7 +351,7 @@ Handle CreateThread(const char* name, u32 entry_point, s32 priority, u32 arg, s3
        return -1;
    }
    if ((u32)stack_size < 0x200) {
-        ERROR_LOG(KERNEL, "CreateThread(name=%s): invalid stack_size=0x%08X", name, 
+        ERROR_LOG(KERNEL, "CreateThread(name=%s): invalid stack_size=0x%08X", name,
            stack_size);
        return -1;
    }
@@ -368,7 +368,7 @@ Handle CreateThread(const char* name, u32 entry_point, s32 priority, u32 arg, s3
        return -1;
    }
    Handle handle;
-    Thread* thread = CreateThread(handle, name, entry_point, priority, processor_id, stack_top, 
+    Thread* thread = CreateThread(handle, name, entry_point, priority, processor_id, stack_top,
        stack_size);
    ResetThread(thread, arg, 0);
@@ -405,16 +405,16 @@ Result SetThreadPriority(Handle handle, s32 priority) {
    // Change thread priority
    s32 old = thread->current_priority;
-    g_thread_ready_queue.remove(old, handle);
+    thread_ready_queue.remove(old, handle);
    thread->current_priority = priority;
-    g_thread_ready_queue.prepare(thread->current_priority);
+    thread_ready_queue.prepare(thread->current_priority);
    // Change thread status to "ready" and push to ready queue
    if (thread->IsRunning()) {
        thread->status = (thread->status & ~THREADSTATUS_RUNNING) | THREADSTATUS_READY;
    }
    if (thread->IsReady()) {
-        g_thread_ready_queue.push_back(thread->current_priority, handle);
+        thread_ready_queue.push_back(thread->current_priority, handle);
    }
    return 0;
@@ -423,19 +423,19 @@ Result SetThreadPriority(Handle handle, s32 priority) {
 /// Sets up the primary application thread
 Handle SetupMainThread(s32 priority, int stack_size) {
    Handle handle;
-    
    // Initialize new "main" thread
-    Thread* thread = CreateThread(handle, "main", Core::g_app_core->GetPC(), priority, 
+    Thread* thread = CreateThread(handle, "main", Core::g_app_core->GetPC(), priority,
        THREADPROCESSORID_0, Memory::SCRATCHPAD_VADDR_END, stack_size);
-    
    ResetThread(thread, 0, 0);
-    
    // If running another thread already, set it to "ready" state
    Thread* cur = GetCurrentThread();
    if (cur && cur->IsRunning()) {
        ChangeReadyState(cur, true);
    }
-    
    // Run new "main" thread
    SetCurrentThread(thread);
    thread->status = THREADSTATUS_RUNNING;
@@ -452,12 +452,12 @@ void Reschedule() {
    HLE::g_reschedule = false;
    if (next > 0) {
        INFO_LOG(KERNEL, "context switch 0x%08X -> 0x%08X", prev->GetHandle(), next->GetHandle());
-        
        SwitchContext(next);
        // Hack - There is no mechanism yet to waken the primary thread if it has been put to sleep
        // by a simulated VBLANK thread switch. So, we'll just immediately set it to "ready" again.
-        // This results in the current thread yielding on a VBLANK once, and then it will be 
+        // This results in the current thread yielding on a VBLANK once, and then it will be
        // immediately placed back in the queue for execution.
        if (prev->wait_type == WAITTYPE_VBLANK) {
            ResumeThreadFromWait(prev->GetHandle());
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 39fa38b75..2a43797ee 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project / PPSSPP Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hle/service/ac_u.cpp b/src/core/hle/service/ac_u.cpp
index b39603bdf..9af96f6b8 100644
--- a/src/core/hle/service/ac_u.cpp
+++ b/src/core/hle/service/ac_u.cpp
@@ -22,12 +22,12 @@ const Interface::FunctionInfo FunctionTable[] = {
    {0x000E0042, nullptr,               "GetCurrentAPInfo"},
    {0x00100042, nullptr,               "GetCurrentNZoneInfo"},
    {0x00110042, nullptr,               "GetNZoneApNumService"},
-    {0x00240042, nullptr,               "AddDenyApType "},
+    {0x00240042, nullptr,               "AddDenyApType"},
-    {0x00270002, nullptr,               "GetInfraPriority "},
+    {0x00270002, nullptr,               "GetInfraPriority"},
    {0x002D0082, nullptr,               "SetRequestEulaVersion"},
    {0x00300004, nullptr,               "RegisterDisconnectEvent"},
    {0x003C0042, nullptr,               "GetAPSSIDList"},
-    {0x003E0042, nullptr,               "IsConnected "},
+    {0x003E0042, nullptr,               "IsConnected"},
    {0x00400042, nullptr,               "SetClientVersion"},
 };
diff --git a/src/core/hle/service/ac_u.h b/src/core/hle/service/ac_u.h
index 3c5958d27..c91b28353 100644
--- a/src/core/hle/service/ac_u.h
+++ b/src/core/hle/service/ac_u.h
@@ -9,7 +9,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace AC_U
-// socket service "ac:u" 
+// socket service "ac:u"
 namespace AC_U {
@@ -21,7 +21,7 @@ public:
     * Gets the string port name used by CTROS for the service
     * @return Port name of service
     */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
        return "ac:u";
    }
 };
diff --git a/src/core/hle/service/am_net.cpp b/src/core/hle/service/am_net.cpp
new file mode 100644
index 000000000..403cac353
--- /dev/null
+++ b/src/core/hle/service/am_net.cpp
@@ -0,0 +1,47 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#include "common/log.h"
+#include "core/hle/hle.h"
+#include "core/hle/service/am_net.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace AM_NET
+namespace AM_NET {
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x08010000, nullptr,               "OpenTicket"},
+    {0x08020002, nullptr,               "TicketAbortInstall"},
+    {0x08030002, nullptr,               "TicketFinalizeInstall"},
+    {0x08040100, nullptr,               "InstallTitleBegin"},
+    {0x08050000, nullptr,               "InstallTitleAbort"},
+    {0x080600C0, nullptr,               "InstallTitleResume"},
+    {0x08070000, nullptr,               "InstallTitleAbortTMD"},
+    {0x08080000, nullptr,               "InstallTitleFinish"},
+    {0x080A0000, nullptr,               "OpenTMD"},
+    {0x080B0002, nullptr,               "TMDAbortInstall"},
+    {0x080C0042, nullptr,               "TMDFinalizeInstall"},
+    {0x080E0040, nullptr,               "OpenContentCreate"},
+    {0x080F0002, nullptr,               "ContentAbortInstall"},
+    {0x08100040, nullptr,               "OpenContentResume"},
+    {0x08120002, nullptr,               "ContentFinalizeInstall"},
+    {0x08130000, nullptr,               "GetTotalContents"},
+    {0x08140042, nullptr,               "GetContentIndexes"},
+    {0x08150044, nullptr,               "GetContentsInfo"},
+    {0x08190108, nullptr,               "Unknown"},
+    {0x081B00C2, nullptr,               "InstallTitlesFinish"},
+};
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+Interface::Interface() {
+    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+Interface::~Interface() {
+}
+} // namespace
diff --git a/src/core/hle/service/am_net.h b/src/core/hle/service/am_net.h
new file mode 100644
index 000000000..4816e1697
--- /dev/null
+++ b/src/core/hle/service/am_net.h
@@ -0,0 +1,27 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#pragma once
+#include "core/hle/service/service.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace AM_NET
+namespace AM_NET {
+class Interface : public Service::Interface {
+public:
+    Interface();
+    ~Interface();
+    /**
+     * Gets the string port name used by CTROS for the service
+     * @return Port name of service
+     */
+    std::string GetPortName() const override {
+        return "am:net";
+    }
+};
+} // namespace
diff --git a/src/core/hle/service/apt_u.cpp b/src/core/hle/service/apt_u.cpp
index 4f41ec5f4..4bb05ce40 100644
--- a/src/core/hle/service/apt_u.cpp
+++ b/src/core/hle/service/apt_u.cpp
@@ -27,7 +27,7 @@ enum class SignalType : u32 {
 void Initialize(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
-    
    cmd_buff[3] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "APT_U:Menu");  // APT menu event handle
    cmd_buff[4] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "APT_U:Pause"); // APT pause event handle
@@ -168,7 +168,7 @@ void AppletUtility(Service::Interface* self) {
    cmd_buff[1] = 0; // No error
    WARN_LOG(KERNEL, "(STUBBED) called unk=0x%08X, buffer1_size=0x%08x, buffer2_size=0x%08x, "
-             "buffer1_addr=0x%08x, buffer2_addr=0x%08x", unk, buffer1_size, buffer2_size, 
+             "buffer1_addr=0x%08x, buffer2_addr=0x%08x", unk, buffer1_size, buffer2_size,
             buffer1_addr, buffer2_addr);
 }
diff --git a/src/core/hle/service/apt_u.h b/src/core/hle/service/apt_u.h
index 5af39e085..306730400 100644
--- a/src/core/hle/service/apt_u.h
+++ b/src/core/hle/service/apt_u.h
@@ -13,8 +13,8 @@ namespace APT_U {
 // Application and title launching service. These services handle signaling for home/power button as
 // well. Only one session for either APT service can be open at a time, normally processes close the
-// service handle immediately once finished using the service. The commands for APT:U and APT:S are 
+// service handle immediately once finished using the service. The commands for APT:U and APT:S are
-// exactly the same, however certain commands are only accessible with APT:S(NS module will call 
+// exactly the same, however certain commands are only accessible with APT:S(NS module will call
 // svcBreak when the command isn't accessible). See http://3dbrew.org/wiki/NS#APT_Services.
 /// Interface to "APT:U" service
diff --git a/src/core/hle/service/boss_u.cpp b/src/core/hle/service/boss_u.cpp
index d398edc68..b2ff4a756 100644
--- a/src/core/hle/service/boss_u.cpp
+++ b/src/core/hle/service/boss_u.cpp
@@ -21,8 +21,8 @@ namespace BOSS_U {
    Interface::Interface() {
        Register(FunctionTable, ARRAY_SIZE(FunctionTable));
    }
-    
    Interface::~Interface() {
    }
-    
 } // namespace
diff --git a/src/core/hle/service/cfg_i.cpp b/src/core/hle/service/cfg_i.cpp
new file mode 100644
index 000000000..88d13d459
--- /dev/null
+++ b/src/core/hle/service/cfg_i.cpp
@@ -0,0 +1,59 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#include "common/log.h"
+#include "core/hle/hle.h"
+#include "core/hle/service/cfg_i.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace CFG_I
+namespace CFG_I {
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x04010082, nullptr,               "GetConfigInfoBlk8"},
+    {0x04020082, nullptr,               "GetConfigInfoBlk4"},
+    {0x04030000, nullptr,               "UpdateConfigNANDSavegame"},
+    {0x04040042, nullptr,               "GetLocalFriendCodeSeedData"},
+    {0x04050000, nullptr,               "GetLocalFriendCodeSeed"},
+    {0x04060000, nullptr,               "SecureInfoGetRegion"},
+    {0x04070000, nullptr,               "SecureInfoGetByte101"},
+    {0x04080042, nullptr,               "SecureInfoGetSerialNo"},
+    {0x04090000, nullptr,               "UpdateConfigBlk00040003"},
+    {0x08010082, nullptr,               "GetConfigInfoBlk8"},
+    {0x08020082, nullptr,               "GetConfigInfoBlk4"},
+    {0x08030000, nullptr,               "UpdateConfigNANDSavegame"},
+    {0x080400C2, nullptr,               "CreateConfigInfoBlk"},
+    {0x08050000, nullptr,               "DeleteConfigNANDSavefile"},
+    {0x08060000, nullptr,               "FormatConfig"},
+    {0x08070000, nullptr,               "Unknown"},
+    {0x08080000, nullptr,               "UpdateConfigBlk1"},
+    {0x08090000, nullptr,               "UpdateConfigBlk2"},
+    {0x080A0000, nullptr,               "UpdateConfigBlk3"},
+    {0x080B0082, nullptr,               "SetGetLocalFriendCodeSeedData"},
+    {0x080C0042, nullptr,               "SetLocalFriendCodeSeedSignature"},
+    {0x080D0000, nullptr,               "DeleteCreateNANDLocalFriendCodeSeed"},
+    {0x080E0000, nullptr,               "VerifySigLocalFriendCodeSeed"},
+    {0x080F0042, nullptr,               "GetLocalFriendCodeSeedData"},
+    {0x08100000, nullptr,               "GetLocalFriendCodeSeed"},
+    {0x08110084, nullptr,               "SetSecureInfo"},
+    {0x08120000, nullptr,               "DeleteCreateNANDSecureInfo"},
+    {0x08130000, nullptr,               "VerifySigSecureInfo"},
+    {0x08140042, nullptr,               "SecureInfoGetData"},
+    {0x08150042, nullptr,               "SecureInfoGetSignature"},
+    {0x08160000, nullptr,               "SecureInfoGetRegion"},
+    {0x08170000, nullptr,               "SecureInfoGetByte101"},
+    {0x08180042, nullptr,               "SecureInfoGetSerialNo"},
+};
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+Interface::Interface() {
+    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+Interface::~Interface() {
+}
+} // namespace
diff --git a/src/core/hle/service/cfg_i.h b/src/core/hle/service/cfg_i.h
new file mode 100644
index 000000000..fe343c968
--- /dev/null
+++ b/src/core/hle/service/cfg_i.h
@@ -0,0 +1,27 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#pragma once
+#include "core/hle/service/service.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace CFG_I
+namespace CFG_I {
+class Interface : public Service::Interface {
+public:
+    Interface();
+    ~Interface();
+    /**
+     * Gets the string port name used by CTROS for the service
+     * @return Port name of service
+     */
+    std::string GetPortName() const override {
+        return "cfg:i";
+    }
+};
+} // namespace
diff --git a/src/core/hle/service/cfg_u.h b/src/core/hle/service/cfg_u.h
index 7525bd7c6..8075d19a8 100644
--- a/src/core/hle/service/cfg_u.h
+++ b/src/core/hle/service/cfg_u.h
@@ -19,7 +19,7 @@ public:
     * Gets the string port name used by CTROS for the service
     * @return Port name of service
     */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
        return "cfg:u";
    }
 };
diff --git a/src/core/hle/service/csnd_snd.cpp b/src/core/hle/service/csnd_snd.cpp
new file mode 100644
index 000000000..6e59a9bf3
--- /dev/null
+++ b/src/core/hle/service/csnd_snd.cpp
@@ -0,0 +1,39 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#include "common/log.h"
+#include "core/hle/hle.h"
+#include "core/hle/service/csnd_snd.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace CSND_SND
+namespace CSND_SND {
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x00010140, nullptr,               "Initialize"},
+    {0x00020000, nullptr,               "Shutdown"},
+    {0x00030040, nullptr,               "Unknown"},
+    {0x00040080, nullptr,               "Unknown"},
+    {0x00050000, nullptr,               "Unknown"},
+    {0x00060000, nullptr,               "Unknown"},
+    {0x00070000, nullptr,               "Unknown"},
+    {0x00080040, nullptr,               "Unknown"},
+    {0x00090082, nullptr,               "FlushDCache"},
+    {0x000A0082, nullptr,               "StoreDCache"},
+    {0x000B0082, nullptr,               "InvalidateDCache"},
+    {0x000C0000, nullptr,               "Unknown"},
+};
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+Interface::Interface() {
+    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+Interface::~Interface() {
+}
+} // namespace
diff --git a/src/core/hle/service/csnd_snd.h b/src/core/hle/service/csnd_snd.h
new file mode 100644
index 000000000..31cc85b07
--- /dev/null
+++ b/src/core/hle/service/csnd_snd.h
@@ -0,0 +1,27 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#pragma once
+#include "core/hle/service/service.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace CSND_SND
+namespace CSND_SND {
+class Interface : public Service::Interface {
+public:
+    Interface();
+    ~Interface();
+    /**
+     * Gets the string port name used by CTROS for the service
+     * @return Port name of service
+     */
+    std::string GetPortName() const override {
+        return "csnd:SND";
+    }
+};
+} // namespace
diff --git a/src/core/hle/service/dsp_dsp.cpp b/src/core/hle/service/dsp_dsp.cpp
index 9e84ac938..bbcf26f61 100644
--- a/src/core/hle/service/dsp_dsp.cpp
+++ b/src/core/hle/service/dsp_dsp.cpp
@@ -26,12 +26,12 @@ const Interface::FunctionInfo FunctionTable[] = {
    {0x001100C2, nullptr,               "LoadComponent"},
    {0x00120000, nullptr,               "UnloadComponent"},
    {0x00130082, nullptr,               "FlushDataCache"},
-    {0x00140082, nullptr,               "InvalidateDCache "},
+    {0x00140082, nullptr,               "InvalidateDCache"},
    {0x00150082, nullptr,               "RegisterInterruptEvents"},
    {0x00160000, nullptr,               "GetSemaphoreEventHandle"},
    {0x00170040, nullptr,               "SetSemaphoreMask"},
    {0x00180040, nullptr,               "GetPhysicalAddress"},
-    {0x00190040, nullptr,               "GetVirtualAddress" },
+    {0x00190040, nullptr,               "GetVirtualAddress"},
    {0x001A0042, nullptr,               "SetIirFilterI2S1_cmd1"},
    {0x001B0042, nullptr,               "SetIirFilterI2S1_cmd2"},
    {0x001C0082, nullptr,               "SetIirFilterEQ"},
diff --git a/src/core/hle/service/dsp_dsp.h b/src/core/hle/service/dsp_dsp.h
index c439ed266..c4ce44245 100644
--- a/src/core/hle/service/dsp_dsp.h
+++ b/src/core/hle/service/dsp_dsp.h
@@ -19,7 +19,7 @@ public:
     * Gets the string port name used by CTROS for the service
     * @return Port name of service
     */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
        return "dsp:DSP";
    }
 };
diff --git a/src/core/hle/service/err_f.cpp b/src/core/hle/service/err_f.cpp
index 917b2f8ca..785c351e9 100644
--- a/src/core/hle/service/err_f.cpp
+++ b/src/core/hle/service/err_f.cpp
@@ -20,8 +20,8 @@ namespace ERR_F {
    Interface::Interface() {
        Register(FunctionTable, ARRAY_SIZE(FunctionTable));
    }
-    
    Interface::~Interface() {
    }
-    
 } // namespace
diff --git a/src/core/hle/service/err_f.h b/src/core/hle/service/err_f.h
index 5da663267..6d7141c1b 100644
--- a/src/core/hle/service/err_f.h
+++ b/src/core/hle/service/err_f.h
@@ -19,9 +19,9 @@ namespace ERR_F {
         * Gets the string port name used by CTROS for the service
         * @return Port name of service
         */
-        std::string GetPortName() const {
+        std::string GetPortName() const override {
            return "err:f";
        }
    };
-    
 } // namespace
diff --git a/src/core/hle/service/frd_u.h b/src/core/hle/service/frd_u.h
index 9df8a815a..4020c6664 100644
--- a/src/core/hle/service/frd_u.h
+++ b/src/core/hle/service/frd_u.h
@@ -19,7 +19,7 @@ namespace FRD_U {
         * Gets the string port name used by CTROS for the service
         * @return Port name of service
         */
-        std::string GetPortName() const {
+        std::string GetPortName() const override {
            return "frd:u";
        }
    };
diff --git a/src/core/hle/service/fs_user.cpp b/src/core/hle/service/fs_user.cpp
index 609c1cb0a..2aec1a52a 100644
--- a/src/core/hle/service/fs_user.cpp
+++ b/src/core/hle/service/fs_user.cpp
@@ -18,7 +18,7 @@ namespace FS_User {
 // puts all the sections of the http://3dbrew.org/wiki/Error_codes to something non-zero, to make
 // sure we don't mislead the application into thinking something worked.
-void Initialize(Service::Interface* self) {
+static void Initialize(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    // TODO(Link Mauve): check the behavior when cmd_buff[1] isn't 32, as per
@@ -44,7 +44,7 @@ void Initialize(Service::Interface* self) {
 *      1 : Result of function, 0 on success, otherwise error code
 *      3 : File handle
 */
-void OpenFile(Service::Interface* self) {
+static void OpenFile(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    // TODO(Link Mauve): cmd_buff[2], aka archive handle lower word, isn't used according to
@@ -91,7 +91,7 @@ void OpenFile(Service::Interface* self) {
 *      1 : Result of function, 0 on success, otherwise error code
 *      3 : File handle
 */
-void OpenFileDirectly(Service::Interface* self) {
+static void OpenFileDirectly(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    auto archive_id       = static_cast<FileSys::Archive::IdCode>(cmd_buff[2]);
@@ -210,7 +210,7 @@ void DeleteDirectory(Service::Interface* self) {
 *  Outputs:
 *      1 : Result of function, 0 on success, otherwise error code
 */
-void CreateDirectory(Service::Interface* self) {
+static void CreateDirectory(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    // TODO: cmd_buff[2], aka archive handle lower word, isn't used according to
@@ -229,7 +229,7 @@ void CreateDirectory(Service::Interface* self) {
    DEBUG_LOG(KERNEL, "called");
 }
-void OpenDirectory(Service::Interface* self) {
+static void OpenDirectory(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    // TODO(Link Mauve): cmd_buff[2], aka archive handle lower word, isn't used according to
@@ -269,7 +269,7 @@ void OpenDirectory(Service::Interface* self) {
 *      2 : Archive handle lower word (unused)
 *      3 : Archive handle upper word (same as file handle)
 */
-void OpenArchive(Service::Interface* self) {
+static void OpenArchive(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    auto archive_id       = static_cast<FileSys::Archive::IdCode>(cmd_buff[1]);
@@ -306,12 +306,12 @@ void OpenArchive(Service::Interface* self) {
 *      1 : Result of function, 0 on success, otherwise error code
 *      2 : Whether the Sdmc could be detected
 */
-void IsSdmcDetected(Service::Interface* self) {
+static void IsSdmcDetected(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    cmd_buff[1] = 0;
    cmd_buff[2] = Settings::values.use_virtual_sd ? 1 : 0;
-    
    DEBUG_LOG(KERNEL, "called");
 }
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp
index 6119e6300..66daded94 100644
--- a/src/core/hle/service/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp_gpu.cpp
@@ -52,7 +52,7 @@ static inline InterruptRelayQueue* GetInterruptRelayQueue(u32 thread_id) {
        sizeof(InterruptRelayQueue) * thread_id);
 }
-void WriteHWRegs(u32 base_address, u32 size_in_bytes, const u32* data) {
+static void WriteHWRegs(u32 base_address, u32 size_in_bytes, const u32* data) {
    // TODO: Return proper error codes
    if (base_address + size_in_bytes >= 0x420000) {
        ERROR_LOG(GPU, "Write address out of range! (address=0x%08x, size=0x%08x)",
@@ -76,7 +76,7 @@ void WriteHWRegs(u32 base_address, u32 size_in_bytes, const u32* data) {
 }
 /// Write a GSP GPU hardware register
-void WriteHWRegs(Service::Interface* self) {
+static void WriteHWRegs(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    u32 reg_addr = cmd_buff[1];
    u32 size = cmd_buff[2];
@@ -87,7 +87,7 @@ void WriteHWRegs(Service::Interface* self) {
 }
 /// Read a GSP GPU hardware register
-void ReadHWRegs(Service::Interface* self) {
+static void ReadHWRegs(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    u32 reg_addr = cmd_buff[1];
    u32 size = cmd_buff[2];
@@ -115,7 +115,7 @@ void ReadHWRegs(Service::Interface* self) {
    }
 }
-void SetBufferSwap(u32 screen_id, const FrameBufferInfo& info) {
+static void SetBufferSwap(u32 screen_id, const FrameBufferInfo& info) {
    u32 base_address = 0x400000;
    if (info.active_fb == 0) {
        WriteHWRegs(base_address + 4 * GPU_REG_INDEX(framebuffer_config[screen_id].address_left1), 4, &info.address_left);
@@ -140,7 +140,7 @@ void SetBufferSwap(u32 screen_id, const FrameBufferInfo& info) {
 *  Outputs:
 *      1: Result code
 */
-void SetBufferSwap(Service::Interface* self) {
+static void SetBufferSwap(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    u32 screen_id = cmd_buff[1];
    FrameBufferInfo* fb_info = (FrameBufferInfo*)&cmd_buff[2];
@@ -159,7 +159,7 @@ void SetBufferSwap(Service::Interface* self) {
 *      2 : Thread index into GSP command buffer
 *      4 : Handle to GSP shared memory
 */
-void RegisterInterruptRelayQueue(Service::Interface* self) {
+static void RegisterInterruptRelayQueue(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    u32 flags = cmd_buff[1];
    g_interrupt_event = cmd_buff[3];
@@ -202,7 +202,7 @@ void SignalInterrupt(InterruptId interrupt_id) {
 }
 /// Executes the next GSP command
-void ExecuteCommand(const Command& command, u32 thread_id) {
+static void ExecuteCommand(const Command& command, u32 thread_id) {
    // Utility function to convert register ID to address
    auto WriteGPURegister = [](u32 id, u32 data) {
        GPU::Write<u32>(0x1EF00000 + 4 * id, data);
@@ -308,7 +308,7 @@ void ExecuteCommand(const Command& command, u32 thread_id) {
 }
 /// This triggers handling of the GX command written to the command buffer in shared memory.
-void TriggerCmdReqQueue(Service::Interface* self) {
+static void TriggerCmdReqQueue(Service::Interface* self) {
    // Iterate through each thread's command queue...
    for (unsigned thread_id = 0; thread_id < 0x4; ++thread_id) {
diff --git a/src/core/hle/service/hid_user.cpp b/src/core/hle/service/hid_user.cpp
index 0eb32ba4a..5f6bf1eff 100644
--- a/src/core/hle/service/hid_user.cpp
+++ b/src/core/hle/service/hid_user.cpp
@@ -47,7 +47,7 @@ static inline PadData* GetPadData() {
 *
 * Indicate the circle pad is pushed completely to the edge in 1 of 8 directions.
 */
-void UpdateNextCirclePadState() {
+static void UpdateNextCirclePadState() {
    static const s16 max_value = 0x9C;
    next_circle_x = next_state.circle_left ? -max_value : 0x0;
    next_circle_x += next_state.circle_right ? max_value : 0x0;
@@ -155,7 +155,7 @@ void PadUpdateComplete() {
 *      7 : Gyroscope event
 *      8 : Event signaled by HID_User
 */
-void GetIPCHandles(Service::Interface* self) {
+static void GetIPCHandles(Service::Interface* self) {
    u32* cmd_buff = Service::GetCommandBuffer();
    cmd_buff[1] = 0; // No error
diff --git a/src/core/hle/service/hid_user.h b/src/core/hle/service/hid_user.h
index 9f6c4d5ed..5ed97085d 100644
--- a/src/core/hle/service/hid_user.h
+++ b/src/core/hle/service/hid_user.h
@@ -15,7 +15,7 @@
 namespace HID_User {
-/** 
+/**
 * Structure of a Pad controller state.
 */
 struct PadState {
diff --git a/src/core/hle/service/ir_rst.cpp b/src/core/hle/service/ir_rst.cpp
new file mode 100644
index 000000000..be15db231
--- /dev/null
+++ b/src/core/hle/service/ir_rst.cpp
@@ -0,0 +1,36 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#include "common/log.h"
+#include "core/hle/hle.h"
+#include "core/hle/service/ir_rst.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace IR_RST
+namespace IR_RST {
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x00010000, nullptr,                 "GetHandles"},
+    {0x00020080, nullptr,                 "Initialize"},
+    {0x00030000, nullptr,                 "Shutdown"},
+    {0x00040000, nullptr,                 "Unknown"},
+    {0x00050000, nullptr,                 "Unknown"},
+    {0x00060000, nullptr,                 "Unknown"},
+    {0x00070080, nullptr,                 "Unknown"},
+    {0x00080000, nullptr,                 "Unknown"},
+    {0x00090000, nullptr,                 "Unknown"},
+};
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+Interface::Interface() {
+    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+Interface::~Interface() {
+}
+} // namespace
diff --git a/src/core/hle/service/ir_rst.h b/src/core/hle/service/ir_rst.h
new file mode 100644
index 000000000..73effd7e3
--- /dev/null
+++ b/src/core/hle/service/ir_rst.h
@@ -0,0 +1,27 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#pragma once
+#include "core/hle/service/service.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace IR_RST 
+namespace IR_RST {
+class Interface : public Service::Interface {
+public:
+    Interface();
+    ~Interface();
+    /**
+     * Gets the string port name used by CTROS for the service
+     * @return Port name of service
+     */
+    std::string GetPortName() const override {
+        return "ir:rst";
+    }
+};
+} // namespace
diff --git a/src/core/hle/service/ir_u.cpp b/src/core/hle/service/ir_u.cpp
new file mode 100644
index 000000000..aa9db6f6d
--- /dev/null
+++ b/src/core/hle/service/ir_u.cpp
@@ -0,0 +1,45 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#include "common/log.h"
+#include "core/hle/hle.h"
+#include "core/hle/service/ir_u.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace IR_U
+namespace IR_U {
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x00010000, nullptr,                 "Initialize"},
+    {0x00020000, nullptr,                 "Shutdown"},
+    {0x00030042, nullptr,                 "StartSendTransfer"},
+    {0x00040000, nullptr,                 "WaitSendTransfer"},
+    {0x000500C2, nullptr,                 "StartRecvTransfer"},
+    {0x00060000, nullptr,                 "WaitRecvTransfer"},
+    {0x00070080, nullptr,                 "GetRecvTransferCount"},
+    {0x00080000, nullptr,                 "GetSendState"},
+    {0x00090040, nullptr,                 "SetBitRate"},
+    {0x000A0000, nullptr,                 "GetBitRate"},
+    {0x000B0040, nullptr,                 "SetIRLEDState"},
+    {0x000C0000, nullptr,                 "GetIRLEDRecvState"},
+    {0x000D0000, nullptr,                 "GetSendFinishedEvent"},
+    {0x000E0000, nullptr,                 "GetRecvFinishedEvent"},
+    {0x000F0000, nullptr,                 "GetTransferState"},
+    {0x00100000, nullptr,                 "GetErrorStatus"},
+    {0x00110040, nullptr,                 "SetSleepModeActive"},
+    {0x00120040, nullptr,                 "SetSleepModeState"},
+};
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+Interface::Interface() {
+    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+Interface::~Interface() {
+}
+} // namespace
diff --git a/src/core/hle/service/ir_u.h b/src/core/hle/service/ir_u.h
new file mode 100644
index 000000000..86d98d079
--- /dev/null
+++ b/src/core/hle/service/ir_u.h
@@ -0,0 +1,27 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#pragma once
+#include "core/hle/service/service.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace IR_U
+namespace IR_U {
+class Interface : public Service::Interface {
+public:
+    Interface();
+    ~Interface();
+    /**
+     * Gets the string port name used by CTROS for the service
+     * @return Port name of service
+     */
+    std::string GetPortName() const override {
+        return "ir:u";
+    }
+};
+} // namespace
diff --git a/src/core/hle/service/mic_u.cpp b/src/core/hle/service/mic_u.cpp
index 58051f133..d6f30e9ae 100644
--- a/src/core/hle/service/mic_u.cpp
+++ b/src/core/hle/service/mic_u.cpp
@@ -27,7 +27,7 @@ const Interface::FunctionInfo FunctionTable[] = {
    {0x000D0040, nullptr,               "SetClamp"},
    {0x000E0000, nullptr,               "GetClamp"},
    {0x000F0040, nullptr,               "unknown_input1"},
-    {0x00100040, nullptr,               "unknown_input2"},      
+    {0x00100040, nullptr,               "unknown_input2"},
 };
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/mic_u.h b/src/core/hle/service/mic_u.h
index 72ba048ef..2a495f3a9 100644
--- a/src/core/hle/service/mic_u.h
+++ b/src/core/hle/service/mic_u.h
@@ -21,7 +21,7 @@ public:
     * Gets the string port name used by CTROS for the service
     * @return Port name of service
     */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
        return "mic:u";
    }
 };
diff --git a/src/core/hle/service/nwm_uds.h b/src/core/hle/service/nwm_uds.h
index a956ca812..69d2c2002 100644
--- a/src/core/hle/service/nwm_uds.h
+++ b/src/core/hle/service/nwm_uds.h
@@ -21,7 +21,7 @@ public:
     * Gets the string port name used by CTROS for the service
     * @return Port name of service
     */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
        return "nwm:UDS";
    }
 };
diff --git a/src/core/hle/service/pm_app.cpp b/src/core/hle/service/pm_app.cpp
new file mode 100644
index 000000000..90e9b1bfa
--- /dev/null
+++ b/src/core/hle/service/pm_app.cpp
@@ -0,0 +1,35 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#include "common/log.h"
+#include "core/hle/hle.h"
+#include "core/hle/service/pm_app.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace PM_APP
+namespace PM_APP {
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x00010140, nullptr,                 "LaunchTitle"},
+    {0x00020082, nullptr,                 "LaunchFIRMSetParams"},
+    {0x00030080, nullptr,                 "TerminateProcesse"},
+    {0x00040100, nullptr,                 "TerminateProcessTID"},
+    {0x000500C0, nullptr,                 "TerminateProcessTID_unknown"},
+    {0x00070042, nullptr,                 "GetFIRMLaunchParams"},
+    {0x00080100, nullptr,                 "GetTitleExheaderFlags"},
+    {0x00090042, nullptr,                 "SetFIRMLaunchParams"},
+};
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+Interface::Interface() {
+    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+Interface::~Interface() {
+}
+} // namespace
diff --git a/src/core/hle/service/pm_app.h b/src/core/hle/service/pm_app.h
new file mode 100644
index 000000000..28c38f582
--- /dev/null
+++ b/src/core/hle/service/pm_app.h
@@ -0,0 +1,27 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#pragma once
+#include "core/hle/service/service.h"
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace PM_APP
+namespace PM_APP {
+class Interface : public Service::Interface {
+public:
+    Interface();
+    ~Interface();
+    /**
+     * Gets the string port name used by CTROS for the service
+     * @return Port name of service
+     */
+    std::string GetPortName() const override {
+        return "pm:app";
+    }
+};
+} // namespace
diff --git a/src/core/hle/service/ptm_u.cpp b/src/core/hle/service/ptm_u.cpp
index f6a14d509..d9122dbbc 100644
--- a/src/core/hle/service/ptm_u.cpp
+++ b/src/core/hle/service/ptm_u.cpp
@@ -17,13 +17,13 @@ const Interface::FunctionInfo FunctionTable[] = {
    {0x00030000, nullptr,               "GetRtcAlarm"},
    {0x00040000, nullptr,               "CancelRtcAlarm"},
    {0x00050000, nullptr,               "GetAdapterState"},
-    {0x00060000, nullptr,               "GetShellState "},
+    {0x00060000, nullptr,               "GetShellState"},
    {0x00070000, nullptr,               "GetBatteryLevel"},
    {0x00080000, nullptr,               "GetBatteryChargeState"},
    {0x00090000, nullptr,               "GetPedometerState"},
    {0x000A0042, nullptr,               "GetStepHistoryEntry"},
-    {0x000B00C2, nullptr,               "GetStepHistory "},
+    {0x000B00C2, nullptr,               "GetStepHistory"},
-    {0x000C0000, nullptr,               "GetTotalStepCount "},
+    {0x000C0000, nullptr,               "GetTotalStepCount"},
    {0x000D0040, nullptr,               "SetPedometerRecordingMode"},
    {0x000E0000, nullptr,               "GetPedometerRecordingMode"},
    {0x000F0084, nullptr,               "GetStepHistoryAll"},
diff --git a/src/core/hle/service/ptm_u.h b/src/core/hle/service/ptm_u.h
index 82749fa39..f8d9f57be 100644
--- a/src/core/hle/service/ptm_u.h
+++ b/src/core/hle/service/ptm_u.h
@@ -21,7 +21,7 @@ public:
     * Gets the string port name used by CTROS for the service
     * @return Port name of service
     */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
        return "ptm:u";
    }
 };
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index ba7299170..abc8d5edb 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -7,18 +7,24 @@
 #include "core/hle/service/service.h"
 #include "core/hle/service/ac_u.h"
+#include "core/hle/service/am_net.h"
 #include "core/hle/service/apt_u.h"
 #include "core/hle/service/boss_u.h"
+#include "core/hle/service/cfg_i.h"
 #include "core/hle/service/cfg_u.h"
+#include "core/hle/service/csnd_snd.h"
 #include "core/hle/service/dsp_dsp.h"
 #include "core/hle/service/err_f.h"
 #include "core/hle/service/fs_user.h"
 #include "core/hle/service/frd_u.h"
 #include "core/hle/service/gsp_gpu.h"
 #include "core/hle/service/hid_user.h"
+#include "core/hle/service/ir_rst.h"
+#include "core/hle/service/ir_u.h"
 #include "core/hle/service/mic_u.h"
 #include "core/hle/service/ndm_u.h"
 #include "core/hle/service/nwm_uds.h"
+#include "core/hle/service/pm_app.h"
 #include "core/hle/service/ptm_u.h"
 #include "core/hle/service/soc_u.h"
 #include "core/hle/service/srv.h"
@@ -75,21 +81,27 @@ Interface* Manager::FetchFromPortName(const std::string& port_name) {
 /// Initialize ServiceManager
 void Init() {
    g_manager = new Manager;
-    
    g_manager->AddService(new SRV::Interface);
    g_manager->AddService(new AC_U::Interface);
+    g_manager->AddService(new AM_NET::Interface);
    g_manager->AddService(new APT_U::Interface);
    g_manager->AddService(new BOSS_U::Interface);
+    g_manager->AddService(new CFG_I::Interface);
    g_manager->AddService(new CFG_U::Interface);
+    g_manager->AddService(new CSND_SND::Interface);
    g_manager->AddService(new DSP_DSP::Interface);
    g_manager->AddService(new ERR_F::Interface);
    g_manager->AddService(new FRD_U::Interface);
    g_manager->AddService(new FS_User::Interface);
    g_manager->AddService(new GSP_GPU::Interface);
    g_manager->AddService(new HID_User::Interface);
+    g_manager->AddService(new IR_RST::Interface);
+    g_manager->AddService(new IR_U::Interface);
    g_manager->AddService(new MIC_U::Interface);
    g_manager->AddService(new NDM_U::Interface);
    g_manager->AddService(new NWM_UDS::Interface);
+    g_manager->AddService(new PM_APP::Interface);
    g_manager->AddService(new PTM_U::Interface);
    g_manager->AddService(new SOC_U::Interface);
    g_manager->AddService(new SSL_C::Interface);
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index 2f5a866c9..55aa84e83 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -38,7 +38,7 @@ class Manager;
 class Interface  : public Kernel::Object {
    friend class Manager;
 public:
-    
    std::string GetName() const override { return GetPortName(); }
    std::string GetTypeName() const override { return GetPortName(); }
@@ -76,7 +76,7 @@ public:
    }
    /**
-     * Synchronize kernel object 
+     * Synchronize kernel object
     * @param wait Boolean wait set if current thread should wait as a result of sync operation
     * @return Result of operation, 0 on success, otherwise error code
     */
@@ -85,23 +85,23 @@ public:
        auto itr = m_functions.find(cmd_buff[0]);
        if (itr == m_functions.end()) {
-            ERROR_LOG(OSHLE, "unknown/unimplemented function: port=%s, command=0x%08X", 
+            ERROR_LOG(OSHLE, "unknown/unimplemented function: port=%s, command=0x%08X",
                GetPortName().c_str(), cmd_buff[0]);
            // TODO(bunnei): Hack - ignore error
            u32* cmd_buff = Service::GetCommandBuffer();
            cmd_buff[1] = 0;
-            return 0; 
+            return 0;
        }
        if (itr->second.func == nullptr) {
-            ERROR_LOG(OSHLE, "unimplemented function: port=%s, name=%s", 
+            ERROR_LOG(OSHLE, "unimplemented function: port=%s, name=%s",
                GetPortName().c_str(), itr->second.name.c_str());
            // TODO(bunnei): Hack - ignore error
            u32* cmd_buff = Service::GetCommandBuffer();
            cmd_buff[1] = 0;
-            return 0; 
+            return 0;
-        } 
+        }
        itr->second.func(this);
diff --git a/src/core/hle/service/soc_u.h b/src/core/hle/service/soc_u.h
index e27a2b1fe..d5590a683 100644
--- a/src/core/hle/service/soc_u.h
+++ b/src/core/hle/service/soc_u.h
@@ -19,7 +19,7 @@ public:
     * Gets the string port name used by CTROS for the service
     * @return Port name of service
     */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
        return "soc:U";
    }
 };
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index 6c02a43d9..df38bd93c 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -11,9 +11,9 @@
 namespace SRV {
-Handle g_event_handle = 0;
+static Handle g_event_handle = 0;
-void Initialize(Service::Interface* self) {
+static void Initialize(Service::Interface* self) {
    DEBUG_LOG(OSHLE, "called");
    u32* cmd_buff = Service::GetCommandBuffer();
@@ -21,7 +21,7 @@ void Initialize(Service::Interface* self) {
    cmd_buff[1] = 0; // No error
 }
-void GetProcSemaphore(Service::Interface* self) {
+static void GetProcSemaphore(Service::Interface* self) {
    DEBUG_LOG(OSHLE, "called");
    u32* cmd_buff = Service::GetCommandBuffer();
@@ -34,7 +34,7 @@ void GetProcSemaphore(Service::Interface* self) {
    cmd_buff[3] = g_event_handle;
 }
-void GetServiceHandle(Service::Interface* self) {
+static void GetServiceHandle(Service::Interface* self) {
    Result res = 0;
    u32* cmd_buff = Service::GetCommandBuffer();
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 1eda36c53..3a06d6765 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #include <map>
@@ -29,8 +29,8 @@ enum ControlMemoryOperation {
 };
 /// Map application or GSP heap memory
-Result ControlMemory(u32* out_addr, u32 operation, u32 addr0, u32 addr1, u32 size, u32 permissions) {
+static Result ControlMemory(u32* out_addr, u32 operation, u32 addr0, u32 addr1, u32 size, u32 permissions) {
-    DEBUG_LOG(SVC,"called operation=0x%08X, addr0=0x%08X, addr1=0x%08X, size=%08X, permissions=0x%08X", 
+    DEBUG_LOG(SVC,"called operation=0x%08X, addr0=0x%08X, addr1=0x%08X, size=%08X, permissions=0x%08X",
        operation, addr0, addr1, size, permissions);
    switch (operation) {
@@ -53,8 +53,8 @@ Result ControlMemory(u32* out_addr, u32 operation, u32 addr0, u32 addr1, u32 siz
 }
 /// Maps a memory block to specified address
-Result MapMemoryBlock(Handle handle, u32 addr, u32 permissions, u32 other_permissions) {
+static Result MapMemoryBlock(Handle handle, u32 addr, u32 permissions, u32 other_permissions) {
-    DEBUG_LOG(SVC, "called memblock=0x%08X, addr=0x%08X, mypermissions=0x%08X, otherpermission=%d", 
+    DEBUG_LOG(SVC, "called memblock=0x%08X, addr=0x%08X, mypermissions=0x%08X, otherpermission=%d",
        handle, addr, permissions, other_permissions);
    Kernel::MemoryPermission permissions_type = static_cast<Kernel::MemoryPermission>(permissions);
@@ -63,7 +63,7 @@ Result MapMemoryBlock(Handle handle, u32 addr, u32 permissions, u32 other_permis
    case Kernel::MemoryPermission::Write:
    case Kernel::MemoryPermission::ReadWrite:
    case Kernel::MemoryPermission::DontCare:
-        Kernel::MapSharedMemory(handle, addr, permissions_type, 
+        Kernel::MapSharedMemory(handle, addr, permissions_type,
            static_cast<Kernel::MemoryPermission>(other_permissions));
        break;
    default:
@@ -73,7 +73,7 @@ Result MapMemoryBlock(Handle handle, u32 addr, u32 permissions, u32 other_permis
 }
 /// Connect to an OS service given the port name, returns the handle to the port to out
-Result ConnectToPort(Handle* out, const char* port_name) {
+static Result ConnectToPort(Handle* out, const char* port_name) {
    Service::Interface* service = Service::g_manager->FetchFromPortName(port_name);
    DEBUG_LOG(SVC, "called port_name=%s", port_name);
@@ -85,7 +85,7 @@ Result ConnectToPort(Handle* out, const char* port_name) {
 }
 /// Synchronize to an OS service
-Result SendSyncRequest(Handle handle) {
+static Result SendSyncRequest(Handle handle) {
    Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle);
    _assert_msg_(KERNEL, (object != nullptr), "called, but kernel object is nullptr!");
@@ -101,21 +101,21 @@ Result SendSyncRequest(Handle handle) {
 }
 /// Close a handle
-Result CloseHandle(Handle handle) {
+static Result CloseHandle(Handle handle) {
    // ImplementMe
    ERROR_LOG(SVC, "(UNIMPLEMENTED) called handle=0x%08X", handle);
    return 0;
 }
 /// Wait for a handle to synchronize, timeout after the specified nanoseconds
-Result WaitSynchronization1(Handle handle, s64 nano_seconds) {
+static Result WaitSynchronization1(Handle handle, s64 nano_seconds) {
    // TODO(bunnei): Do something with nano_seconds, currently ignoring this
    bool wait = false;
    bool wait_infinite = (nano_seconds == -1); // Used to wait until a thread has terminated
    Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle);
-    DEBUG_LOG(SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle, object->GetTypeName().c_str(), 
+    DEBUG_LOG(SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle, object->GetTypeName().c_str(),
            object->GetName().c_str(), nano_seconds);
    _assert_msg_(KERNEL, (object != nullptr), "called, but kernel object is nullptr!");
@@ -132,13 +132,13 @@ Result WaitSynchronization1(Handle handle, s64 nano_seconds) {
 }
 /// Wait for the given handles to synchronize, timeout after the specified nanoseconds
-Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count, bool wait_all, 
+static Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count, bool wait_all,
    s64 nano_seconds) {
    // TODO(bunnei): Do something with nano_seconds, currently ignoring this
    bool unlock_all = true;
    bool wait_infinite = (nano_seconds == -1); // Used to wait until a thread has terminated
-    DEBUG_LOG(SVC, "called handle_count=%d, wait_all=%s, nanoseconds=%lld", 
+    DEBUG_LOG(SVC, "called handle_count=%d, wait_all=%s, nanoseconds=%lld",
        handle_count, (wait_all ? "true" : "false"), nano_seconds);
    // Iterate through each handle, synchronize kernel object
@@ -149,7 +149,7 @@ Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count, bool wa
        _assert_msg_(KERNEL, (object != nullptr), "called handle=0x%08X, but kernel object "
            "is nullptr!", handles[i]);
-        DEBUG_LOG(SVC, "\thandle[%d] = 0x%08X(%s:%s)", i, handles[i], object->GetTypeName().c_str(), 
+        DEBUG_LOG(SVC, "\thandle[%d] = 0x%08X(%s:%s)", i, handles[i], object->GetTypeName().c_str(),
            object->GetName().c_str());
        Result res = object->WaitSynchronization(&wait);
@@ -174,7 +174,7 @@ Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count, bool wa
 }
 /// Create an address arbiter (to allocate access to shared resources)
-Result CreateAddressArbiter(u32* arbiter) {
+static Result CreateAddressArbiter(u32* arbiter) {
    DEBUG_LOG(SVC, "called");
    Handle handle = Kernel::CreateAddressArbiter();
    *arbiter = handle;
@@ -182,20 +182,20 @@ Result CreateAddressArbiter(u32* arbiter) {
 }
 /// Arbitrate address
-Result ArbitrateAddress(Handle arbiter, u32 address, u32 type, u32 value, s64 nanoseconds) {
+static Result ArbitrateAddress(Handle arbiter, u32 address, u32 type, u32 value, s64 nanoseconds) {
-    return Kernel::ArbitrateAddress(arbiter, static_cast<Kernel::ArbitrationType>(type), address, 
+    return Kernel::ArbitrateAddress(arbiter, static_cast<Kernel::ArbitrationType>(type), address,
        value);
 }
 /// Used to output a message on a debug hardware unit - does nothing on a retail unit
-void OutputDebugString(const char* string) {
+static void OutputDebugString(const char* string) {
    OS_LOG(SVC, "%s", string);
 }
 /// Get resource limit
-Result GetResourceLimit(Handle* resource_limit, Handle process) {
+static Result GetResourceLimit(Handle* resource_limit, Handle process) {
    // With regards to proceess values:
-    // 0xFFFF8001 is a handle alias for the current KProcess, and 0xFFFF8000 is a handle alias for 
+    // 0xFFFF8001 is a handle alias for the current KProcess, and 0xFFFF8000 is a handle alias for
    // the current KThread.
    *resource_limit = 0xDEADBEEF;
    ERROR_LOG(SVC, "(UNIMPLEMENTED) called process=0x%08X", process);
@@ -203,7 +203,7 @@ Result GetResourceLimit(Handle* resource_limit, Handle process) {
 }
 /// Get resource limit current values
-Result GetResourceLimitCurrentValues(s64* values, Handle resource_limit, void* names, 
+static Result GetResourceLimitCurrentValues(s64* values, Handle resource_limit, void* names,
    s32 name_count) {
    ERROR_LOG(SVC, "(UNIMPLEMENTED) called resource_limit=%08X, names=%s, name_count=%d",
        resource_limit, names, name_count);
@@ -212,7 +212,7 @@ Result GetResourceLimitCurrentValues(s64* values, Handle resource_limit, void* n
 }
 /// Creates a new thread
-Result CreateThread(u32 priority, u32 entry_point, u32 arg, u32 stack_top, u32 processor_id) {
+static Result CreateThread(u32 priority, u32 entry_point, u32 arg, u32 stack_top, u32 processor_id) {
    std::string name;
    if (Symbols::HasSymbol(entry_point)) {
        TSymbol symbol = Symbols::GetSymbol(entry_point);
@@ -227,14 +227,14 @@ Result CreateThread(u32 priority, u32 entry_point, u32 arg, u32 stack_top, u32 p
    Core::g_app_core->SetReg(1, thread);
    DEBUG_LOG(SVC, "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, "
-        "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", entry_point, 
+        "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", entry_point,
        name.c_str(), arg, stack_top, priority, processor_id, thread);
-    
    return 0;
 }
 /// Called when a thread exits
-u32 ExitThread() {
+static u32 ExitThread() {
    Handle thread = Kernel::GetCurrentThreadHandle();
    DEBUG_LOG(SVC, "called, pc=0x%08X", Core::g_app_core->GetPC()); // PC = 0x0010545C
@@ -245,26 +245,26 @@ u32 ExitThread() {
 }
 /// Gets the priority for the specified thread
-Result GetThreadPriority(s32* priority, Handle handle) {
+static Result GetThreadPriority(s32* priority, Handle handle) {
    *priority = Kernel::GetThreadPriority(handle);
    return 0;
 }
 /// Sets the priority for the specified thread
-Result SetThreadPriority(Handle handle, s32 priority) {
+static Result SetThreadPriority(Handle handle, s32 priority) {
    return Kernel::SetThreadPriority(handle, priority);
 }
 /// Create a mutex
-Result CreateMutex(Handle* mutex, u32 initial_locked) {
+static Result CreateMutex(Handle* mutex, u32 initial_locked) {
    *mutex = Kernel::CreateMutex((initial_locked != 0));
-    DEBUG_LOG(SVC, "called initial_locked=%s : created handle=0x%08X", 
+    DEBUG_LOG(SVC, "called initial_locked=%s : created handle=0x%08X",
        initial_locked ? "true" : "false", *mutex);
    return 0;
 }
 /// Release a mutex
-Result ReleaseMutex(Handle handle) {
+static Result ReleaseMutex(Handle handle) {
    DEBUG_LOG(SVC, "called handle=0x%08X", handle);
    _assert_msg_(KERNEL, (handle != 0), "called, but handle is nullptr!");
    Kernel::ReleaseMutex(handle);
@@ -272,27 +272,27 @@ Result ReleaseMutex(Handle handle) {
 }
 /// Get current thread ID
-Result GetThreadId(u32* thread_id, Handle thread) {
+static Result GetThreadId(u32* thread_id, Handle thread) {
    ERROR_LOG(SVC, "(UNIMPLEMENTED) called thread=0x%08X", thread);
    return 0;
 }
 /// Query memory
-Result QueryMemory(void* info, void* out, u32 addr) {
+static Result QueryMemory(void* info, void* out, u32 addr) {
    ERROR_LOG(SVC, "(UNIMPLEMENTED) called addr=0x%08X", addr);
    return 0;
 }
 /// Create an event
-Result CreateEvent(Handle* evt, u32 reset_type) {
+static Result CreateEvent(Handle* evt, u32 reset_type) {
    *evt = Kernel::CreateEvent((ResetType)reset_type);
-    DEBUG_LOG(SVC, "called reset_type=0x%08X : created handle=0x%08X", 
+    DEBUG_LOG(SVC, "called reset_type=0x%08X : created handle=0x%08X",
        reset_type, *evt);
    return 0;
 }
 /// Duplicates a kernel handle
-Result DuplicateHandle(Handle* out, Handle handle) {
+static Result DuplicateHandle(Handle* out, Handle handle) {
    DEBUG_LOG(SVC, "called handle=0x%08X", handle);
    // Translate kernel handles -> real handles
@@ -301,7 +301,7 @@ Result DuplicateHandle(Handle* out, Handle handle) {
    }
    _assert_msg_(KERNEL, (handle != Kernel::CurrentProcess),
        "(UNIMPLEMENTED) process handle duplication!");
-    
    // TODO(bunnei): FixMe - This is a hack to return the handle that we were asked to duplicate.
    *out = handle;
@@ -309,26 +309,26 @@ Result DuplicateHandle(Handle* out, Handle handle) {
 }
 /// Signals an event
-Result SignalEvent(Handle evt) {
+static Result SignalEvent(Handle evt) {
    Result res = Kernel::SignalEvent(evt);
    DEBUG_LOG(SVC, "called event=0x%08X", evt);
    return res;
 }
 /// Clears an event
-Result ClearEvent(Handle evt) {
+static Result ClearEvent(Handle evt) {
    Result res = Kernel::ClearEvent(evt);
    DEBUG_LOG(SVC, "called event=0x%08X", evt);
    return res;
 }
 /// Sleep the current thread
-void SleepThread(s64 nanoseconds) {
+static void SleepThread(s64 nanoseconds) {
    DEBUG_LOG(SVC, "called nanoseconds=%lld", nanoseconds);
 }
 /// This returns the total CPU ticks elapsed since the CPU was powered-on
-s64 GetSystemTick() {
+static s64 GetSystemTick() {
    return (s64)Core::g_app_core->GetTicks();
 }
diff --git a/src/core/hle/svc.h b/src/core/hle/svc.h
index 1d125faf6..6be393d0b 100644
--- a/src/core/hle/svc.h
+++ b/src/core/hle/svc.h
@@ -1,6 +1,6 @@
 // Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
-// Refer to the license.txt file included.  
+// Refer to the license.txt file included.
 #pragma once
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index 33f75c50a..4d0719263 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -39,7 +39,7 @@ enum {
 template <typename T>
 inline void Read(T &var, const u32 addr) {
    switch (addr & 0xFFFFF000) {
-    
    // TODO(bunnei): What is the virtual address of NDMA?
    // case VADDR_NDMA:
    //     NDMA::Read(var, addr);
@@ -57,9 +57,9 @@ inline void Read(T &var, const u32 addr) {
 template <typename T>
 inline void Write(u32 addr, const T data) {
    switch (addr & 0xFFFFF000) {
-    
    // TODO(bunnei): What is the virtual address of NDMA?
-    // case VADDR_NDMA 
+    // case VADDR_NDMA
    //     NDMA::Write(addr, data);
    //     break;
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 389d5a8c9..63d2496ed 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -273,13 +273,13 @@ bool ElfReader::LoadInto(u32 vaddr) {
    for (int i = 0; i < header->e_phnum; i++) {
        Elf32_Phdr *p = segments + i;
-        INFO_LOG(MASTER_LOG, "Type: %i Vaddr: %08x Filesz: %i Memsz: %i ", p->p_type, p->p_vaddr, 
+        INFO_LOG(MASTER_LOG, "Type: %i Vaddr: %08x Filesz: %i Memsz: %i ", p->p_type, p->p_vaddr,
            p->p_filesz, p->p_memsz);
        if (p->p_type == PT_LOAD) {
            segment_addr[i] = base_addr + p->p_vaddr;
            memcpy(Memory::GetPointer(segment_addr[i]), GetSegmentPtr(i), p->p_filesz);
-            INFO_LOG(MASTER_LOG, "Loadable Segment Copied to %08x, size %08x", segment_addr[i], 
+            INFO_LOG(MASTER_LOG, "Loadable Segment Copied to %08x, size %08x", segment_addr[i],
                p->p_memsz);
        }
    }
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 1e5501e6d..343bb7523 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -24,7 +24,7 @@ static const int kBlockSize     = 0x200;    ///< Size of ExeFS blocks (in bytes)
 * @param size Size of compressed buffer
 * @return Size of decompressed buffer
 */
-u32 LZSS_GetDecompressedSize(u8* buffer, u32 size) {
+static u32 LZSS_GetDecompressedSize(u8* buffer, u32 size) {
    u32 offset_size = *(u32*)(buffer + size - 4);
    return offset_size + size;
 }
@@ -37,7 +37,7 @@ u32 LZSS_GetDecompressedSize(u8* buffer, u32 size) {
 * @param decompressed_size Size of decompressed buffer
 * @return True on success, otherwise false
 */
-bool LZSS_Decompress(u8* compressed, u32 compressed_size, u8* decompressed, u32 decompressed_size) {
+static bool LZSS_Decompress(u8* compressed, u32 compressed_size, u8* decompressed, u32 decompressed_size) {
    u8* footer = compressed + compressed_size - 8;
    u32 buffer_top_and_bottom = *(u32*)footer;
    u32 out = decompressed_size;
@@ -118,7 +118,7 @@ AppLoader_NCCH::~AppLoader_NCCH() {
 * @return ResultStatus result of function
 */
 ResultStatus AppLoader_NCCH::LoadExec() const {
-    if (!is_loaded) 
+    if (!is_loaded)
        return ResultStatus::ErrorNotLoaded;
    std::vector<u8> code;
@@ -185,7 +185,7 @@ ResultStatus AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector<u8>&
        return ResultStatus::Error;
    }
    return ResultStatus::ErrorNotUsed;
-} 
+}
 /**
 * Loads an NCCH file (e.g. from a CCI, or the first NCCH in a CXI)
@@ -210,7 +210,7 @@ ResultStatus AppLoader_NCCH::Load() {
            file.Seek(ncch_offset, 0);
            file.ReadBytes(&ncch_header, sizeof(NCCH_Header));
        }
-        
        // Verify we are loading the correct file type...
        if (0 != memcmp(&ncch_header.magic, "NCCH", 4))
            return ResultStatus::ErrorInvalidFormat;
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index f40a258b7..03116add8 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -215,7 +215,7 @@ private:
    u32             entry_point;
    u32             ncch_offset; // Offset to NCCH header, can be 0 or after NCSD header
    u32             exefs_offset;
-    
    NCCH_Header     ncch_header;
    ExeFs_Header    exefs_header;
    ExHeader_Header exheader_header;
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index cf12f24d9..74a93b1d9 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -11,38 +11,38 @@
 namespace Memory {
-u8*    g_base                   = NULL;         ///< The base pointer to the auto-mirrored arena.
+u8* g_base                      = nullptr;   ///< The base pointer to the auto-mirrored arena.
-MemArena g_arena;                               ///< The MemArena class
+static MemArena arena;                       ///< The MemArena class
-u8* g_exefs_code                = NULL;         ///< ExeFS:/.code is loaded here
+u8* g_exefs_code                = nullptr;   ///< ExeFS:/.code is loaded here
-u8* g_system_mem                = NULL;         ///< System memory
+u8* g_system_mem                = nullptr;   ///< System memory
-u8* g_heap                      = NULL;         ///< Application heap (main memory)
+u8* g_heap                      = nullptr;   ///< Application heap (main memory)
-u8* g_heap_gsp                  = NULL;         ///< GSP heap (main memory)
+u8* g_heap_gsp                  = nullptr;   ///< GSP heap (main memory)
-u8* g_vram                      = NULL;         ///< Video memory (VRAM) pointer
+u8* g_vram                      = nullptr;   ///< Video memory (VRAM) pointer
-u8* g_shared_mem                = NULL;         ///< Shared memory
+u8* g_shared_mem                = nullptr;   ///< Shared memory
-u8* g_kernel_mem;                               ///< Kernel memory
+u8* g_kernel_mem;                              ///< Kernel memory
-u8* g_physical_bootrom          = NULL;         ///< Bootrom physical memory
+static u8* physical_bootrom     = nullptr;   ///< Bootrom physical memory
-u8* g_uncached_bootrom          = NULL;
+static u8* uncached_bootrom     = nullptr;
-u8* g_physical_exefs_code       = NULL;         ///< Phsical ExeFS:/.code is loaded here
+static u8* physical_exefs_code  = nullptr;   ///< Phsical ExeFS:/.code is loaded here
-u8* g_physical_system_mem       = NULL;         ///< System physical memory
+static u8* physical_system_mem  = nullptr;   ///< System physical memory
-u8* g_physical_fcram            = NULL;         ///< Main physical memory (FCRAM)
+static u8* physical_fcram       = nullptr;   ///< Main physical memory (FCRAM)
-u8* g_physical_heap_gsp         = NULL;         ///< GSP heap physical memory
+static u8* physical_heap_gsp    = nullptr;   ///< GSP heap physical memory
-u8* g_physical_vram             = NULL;         ///< Video physical memory (VRAM)
+static u8* physical_vram        = nullptr;   ///< Video physical memory (VRAM)
-u8* g_physical_shared_mem       = NULL;         ///< Physical shared memory
+static u8* physical_shared_mem  = nullptr;   ///< Physical shared memory
-u8* g_physical_kernel_mem;                      ///< Kernel memory
+static u8* physical_kernel_mem;              ///< Kernel memory
 // We don't declare the IO region in here since its handled by other means.
 static MemoryView g_views[] = {
-    {&g_exefs_code, &g_physical_exefs_code, EXEFS_CODE_VADDR,       EXEFS_CODE_SIZE,    0},
+    {&g_exefs_code, &physical_exefs_code, EXEFS_CODE_VADDR,       EXEFS_CODE_SIZE,    0},
-    {&g_vram,       &g_physical_vram,       VRAM_VADDR,             VRAM_SIZE,          0},
+    {&g_vram,       &physical_vram,       VRAM_VADDR,             VRAM_SIZE,          0},
-    {&g_heap,       &g_physical_fcram,      HEAP_VADDR,             HEAP_SIZE,          MV_IS_PRIMARY_RAM},
+    {&g_heap,       &physical_fcram,      HEAP_VADDR,             HEAP_SIZE,          MV_IS_PRIMARY_RAM},
-    {&g_shared_mem, &g_physical_shared_mem, SHARED_MEMORY_VADDR,    SHARED_MEMORY_SIZE, 0},
+    {&g_shared_mem, &physical_shared_mem, SHARED_MEMORY_VADDR,    SHARED_MEMORY_SIZE, 0},
-    {&g_system_mem, &g_physical_system_mem, SYSTEM_MEMORY_VADDR,    SYSTEM_MEMORY_SIZE,    0},
+    {&g_system_mem, &physical_system_mem, SYSTEM_MEMORY_VADDR,    SYSTEM_MEMORY_SIZE,    0},
-    {&g_kernel_mem, &g_physical_kernel_mem, KERNEL_MEMORY_VADDR,    KERNEL_MEMORY_SIZE, 0},
+    {&g_kernel_mem, &physical_kernel_mem, KERNEL_MEMORY_VADDR,    KERNEL_MEMORY_SIZE, 0},
-    {&g_heap_gsp,   &g_physical_heap_gsp,   HEAP_GSP_VADDR,         HEAP_GSP_SIZE,      0},
+    {&g_heap_gsp,   &physical_heap_gsp,   HEAP_GSP_VADDR,         HEAP_GSP_SIZE,      0},
 };
 /*static MemoryView views[] =
@@ -69,18 +69,18 @@ void Init() {
            g_views[i].size = FCRAM_SIZE;
    }
-    g_base = MemoryMap_Setup(g_views, kNumMemViews, flags, &g_arena);
+    g_base = MemoryMap_Setup(g_views, kNumMemViews, flags, &arena);
    NOTICE_LOG(MEMMAP, "initialized OK, RAM at %p (mirror at 0 @ %p)", g_heap,
-        g_physical_fcram);
+        physical_fcram);
 }
 void Shutdown() {
    u32 flags = 0;
-    MemoryMap_Shutdown(g_views, kNumMemViews, flags, &g_arena);
+    MemoryMap_Shutdown(g_views, kNumMemViews, flags, &arena);
-    g_arena.ReleaseSpace();
+    arena.ReleaseSpace();
-    g_base = NULL;
+    g_base = nullptr;
    NOTICE_LOG(MEMMAP, "shutdown OK");
 }
diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index 87de5cd63..a58c59244 100644
--- a/src/core/mem_map.h
+++ b/src/core/mem_map.h
@@ -157,7 +157,7 @@ u8* GetPointer(VAddr virtual_address);
 * Maps a block of memory on the heap
 * @param size Size of block in bytes
 * @param operation Memory map operation type
- * @param flags Memory allocation flags
+ * @param permissions Memory allocation permissions
 */
 u32 MapBlock_Heap(u32 size, u32 operation, u32 permissions);
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index 90951812b..443d5ad7e 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -12,9 +12,9 @@
 namespace Memory {
-std::map<u32, MemoryBlock> g_heap_map;
+static std::map<u32, MemoryBlock> heap_map;
-std::map<u32, MemoryBlock> g_heap_gsp_map;
+static std::map<u32, MemoryBlock> heap_gsp_map;
-std::map<u32, MemoryBlock> g_shared_map;
+static std::map<u32, MemoryBlock> shared_map;
 /// Convert a physical address to virtual address
 VAddr PhysicalToVirtualAddress(const PAddr addr) {
@@ -194,11 +194,11 @@ u32 MapBlock_Heap(u32 size, u32 operation, u32 permissions) {
    block.operation     = operation;
    block.permissions   = permissions;
-    if (g_heap_map.size() > 0) {
+    if (heap_map.size() > 0) {
-        const MemoryBlock last_block = g_heap_map.rbegin()->second;
+        const MemoryBlock last_block = heap_map.rbegin()->second;
        block.address = last_block.address + last_block.size;
    }
-    g_heap_map[block.GetVirtualAddress()] = block;
+    heap_map[block.GetVirtualAddress()] = block;
    return block.GetVirtualAddress();
 }
@@ -217,11 +217,11 @@ u32 MapBlock_HeapGSP(u32 size, u32 operation, u32 permissions) {
    block.operation     = operation;
    block.permissions   = permissions;
-    if (g_heap_gsp_map.size() > 0) {
+    if (heap_gsp_map.size() > 0) {
-        const MemoryBlock last_block = g_heap_gsp_map.rbegin()->second;
+        const MemoryBlock last_block = heap_gsp_map.rbegin()->second;
        block.address = last_block.address + last_block.size;
    }
-    g_heap_gsp_map[block.GetVirtualAddress()] = block;
+    heap_gsp_map[block.GetVirtualAddress()] = block;
    return block.GetVirtualAddress();
 }
diff --git a/src/core/system.h b/src/core/system.h
index 8f8ddf87b..2bc2edc75 100644
--- a/src/core/system.h
+++ b/src/core/system.h
@@ -11,16 +11,16 @@
 namespace System {
 // State of the full emulator
-typedef enum {
+enum State {
-        STATE_NULL = 0, ///< System is in null state, nothing initialized
+    STATE_NULL = 0, ///< System is in null state, nothing initialized
-        STATE_IDLE,             ///< System is in an initialized state, but not running
+    STATE_IDLE,     ///< System is in an initialized state, but not running
-        STATE_RUNNING,  ///< System is running
+    STATE_RUNNING,  ///< System is running
-        STATE_LOADING,  ///< System is loading a ROM
+    STATE_LOADING,  ///< System is loading a ROM
-        STATE_HALTED,   ///< System is halted (error)
+    STATE_HALTED,   ///< System is halted (error)
-        STATE_STALLED,  ///< System is stalled (unused)
+    STATE_STALLED,  ///< System is stalled (unused)
-        STATE_DEBUG,    ///< System is in a special debug mode (unused)
+    STATE_DEBUG,    ///< System is in a special debug mode (unused)
-        STATE_DIE               ///< System is shutting down
+    STATE_DIE       ///< System is shutting down
-} State;
+};
 extern volatile State g_state;
@@ -30,4 +30,4 @@ void RunLoopFor(int cycles);
 void RunLoopUntil(u64 global_cycles);
 void Shutdown();
-};
+}
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 22b8e9950..275b06b7c 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -318,9 +318,9 @@ void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) {
    return;
 #ifndef HAVE_PNG
-        return;
+    return;
 #else
-        if (!data)
+    if (!data)
        return;
    // Write data to file
diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h
index 8b1499bf2..b1558cfae 100644
--- a/src/video_core/debug_utils/debug_utils.h
+++ b/src/video_core/debug_utils/debug_utils.h
@@ -41,7 +41,7 @@ void DumpShader(const u32* binary_data, u32 binary_size, const u32* swizzle_data
 // Utility class to log Pica commands.
 struct PicaTrace {
    struct Write : public std::pair<u32,u32> {
-                Write(u32 id, u32 value) : std::pair<u32,u32>(id, value) {}
+        Write(u32 id, u32 value) : std::pair<u32,u32>(id, value) {}
        u32& Id() { return first; }
        const u32& Id() const { return first; }
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h
index f1dbc9d17..bce402b88 100644
--- a/src/video_core/renderer_base.h
+++ b/src/video_core/renderer_base.h
@@ -25,7 +25,7 @@ public:
    /// Swap buffers (render frame)
    virtual void SwapBuffers() = 0;
-    /** 
+    /**
     * Set the emulator window to use for renderer
     * @param window EmuWindow handle to emulator window to use for rendering
     */
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 8483f79be..abbb4c2cb 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -191,7 +191,8 @@ void RendererOpenGL::DrawSingleScreenRotated(const TextureInfo& texture, float x
 * Draws the emulated screens to the emulator window.
 */
 void RendererOpenGL::DrawScreens() {
-    glViewport(0, 0, resolution_width, resolution_height);
+    auto viewport_extent = GetViewportExtent();
+    glViewport(viewport_extent.left, viewport_extent.top, viewport_extent.GetWidth(), viewport_extent.GetHeight()); // TODO: Or bottom?
    glClear(GL_COLOR_BUFFER_BIT);
    glUseProgram(program_id);
@@ -228,6 +229,34 @@ void RendererOpenGL::SetWindow(EmuWindow* window) {
    render_window = window;
 }
+MathUtil::Rectangle<unsigned> RendererOpenGL::GetViewportExtent() {
+    unsigned framebuffer_width;
+    unsigned framebuffer_height;
+    std::tie(framebuffer_width, framebuffer_height) = render_window->GetFramebufferSize();
+    float window_aspect_ratio = static_cast<float>(framebuffer_height) / framebuffer_width;
+    float emulation_aspect_ratio = static_cast<float>(resolution_height) / resolution_width;
+    MathUtil::Rectangle<unsigned> viewport_extent;
+    if (window_aspect_ratio > emulation_aspect_ratio) {
+        // Window is narrower than the emulation content => apply borders to the top and bottom
+        unsigned viewport_height = emulation_aspect_ratio * framebuffer_width;
+        viewport_extent.left = 0;
+        viewport_extent.top = (framebuffer_height - viewport_height) / 2;
+        viewport_extent.right = viewport_extent.left + framebuffer_width;
+        viewport_extent.bottom = viewport_extent.top + viewport_height;
+    } else {
+        // Otherwise, apply borders to the left and right sides of the window.
+        unsigned viewport_width = framebuffer_height / emulation_aspect_ratio;
+        viewport_extent.left = (framebuffer_width - viewport_width) / 2;
+        viewport_extent.top = 0;
+        viewport_extent.right = viewport_extent.left + viewport_width;
+        viewport_extent.bottom = viewport_extent.top + framebuffer_height;
+    }
+    return viewport_extent;
+}
 /// Initialize the renderer
 void RendererOpenGL::Init() {
    render_window->MakeCurrent();
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index eed201a95..7fdcec731 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -4,13 +4,15 @@
 #pragma once
+#include <array>
 #include "generated/gl_3_2_core.h"
-#include "common/common.h"
+#include "common/math_util.h"
 #include "core/hw/gpu.h"
-#include "video_core/renderer_base.h"
-#include <array>
+#include "video_core/renderer_base.h"
 class EmuWindow;
@@ -52,6 +54,9 @@ private:
    static void LoadFBToActiveGLTexture(const GPU::Regs::FramebufferConfig& framebuffer,
                                        const TextureInfo& texture);
+    /// Computes the viewport rectangle
+    MathUtil::Rectangle<unsigned> GetViewportExtent();
    EmuWindow*  render_window;                    ///< Handle to render window
    u32         last_mode;                        ///< Last render mode
diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp
index c1848f923..f1156a493 100644
--- a/src/video_core/utils.cpp
+++ b/src/video_core/utils.cpp
@@ -20,7 +20,7 @@ namespace VideoCore {
 void DumpTGA(std::string filename, short width, short height, u8* raw_data) {
    TGAHeader hdr = {0, 0, 2, 0, 0, 0, 0, width, height, 24, 0};
    FILE* fout = fopen(filename.c_str(), "wb");
-    
    fwrite(&hdr, sizeof(TGAHeader), 1, fout);
    for (int y = 0; y < height; y++) {
@@ -30,7 +30,7 @@ void DumpTGA(std::string filename, short width, short height, u8* raw_data) {
            putc(raw_data[(3 * (y * width)) + (3 * x) + 2], fout); // r
        }
    }
-    
    fclose(fout);
 }
 } // namespace
diff --git a/src/video_core/utils.h b/src/video_core/utils.h
index 9cb3d4d43..21380a908 100644
--- a/src/video_core/utils.h
+++ b/src/video_core/utils.h
@@ -12,24 +12,24 @@ namespace FormatPrecision {
 /// Adjust RGBA8 color with RGBA6 precision
 static inline u32 rgba8_with_rgba6(u32 src) {
-        u32 color = src;
+    u32 color = src;
-        color &= 0xFCFCFCFC;
+    color &= 0xFCFCFCFC;
-        color |= (color >> 6) & 0x03030303;
+    color |= (color >> 6) & 0x03030303;
-        return color;
+    return color;
 }
 /// Adjust RGBA8 color with RGB565 precision
 static inline u32 rgba8_with_rgb565(u32 src) {
-        u32 color = (src & 0xF8FCF8);
+    u32 color = (src & 0xF8FCF8);
-        color |= (color >> 5) & 0x070007;
+    color |= (color >> 5) & 0x070007;
-        color |= (color >> 6) & 0x000300;
+    color |= (color >> 6) & 0x000300;
-        color |= 0xFF000000;
+    color |= 0xFF000000;
-        return color;
+    return color;
 }
 /// Adjust Z24 depth value with Z16 precision
 static inline u32 z24_with_z16(u32 src) {
-        return (src & 0xFFFF00) | (src >> 16);
+    return (src & 0xFFFF00) | (src >> 16);
 }
 } // namespace