79 files changed, 735 insertions, 288 deletions
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();
-};
+}