diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 619881e63..51d6fa4a8 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -207,7 +207,6 @@ void GRenderWindow::keyPressEvent(QKeyEvent* event)
 
     button_reg |= GetKeyBinding(event);
     HID::SetButtonReg(button_reg);
-    return;
 }
 
 void GRenderWindow::keyReleaseEvent(QKeyEvent* event)
diff --git a/src/citra_qt/bootmanager.hxx b/src/citra_qt/bootmanager.hxx
index e9a736ff7..e54f2f78a 100644
--- a/src/citra_qt/bootmanager.hxx
+++ b/src/citra_qt/bootmanager.hxx
@@ -1,4 +1,3 @@
-#include <map>
 #include <QThread>
 #include <QGLWidget>
 #include "common/common.h"
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 66594f0fc..2b605d21e 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -37,7 +37,7 @@ public:
     inline void Write(T &var, const u32 addr);
 
     u32 size;
-    u8* mem_ptr = NULL;
+    u8* mem_ptr;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -48,6 +48,7 @@ SharedMemory* CreateSharedMemory(Handle& handle, u32 size) {
     SharedMemory* mem = new SharedMemory;
     handle = Kernel::g_object_pool.Create(mem);
     mem->size = size;
+    mem->mem_ptr = nullptr;
     return mem;
 }
 
diff --git a/src/core/hw/hid.h b/src/core/hw/hid.h
index e97b25a64..0fc64aeb5 100644
--- a/src/core/hw/hid.h
+++ b/src/core/hw/hid.h
@@ -20,7 +20,7 @@ enum {
     OFFSET_BUTTONS = 0x1c,
 };
 
-const int g_num_pad_items = 12; 
+static const int g_num_pad_items = 12; 
 
 enum PAD {
     PAD_A = (1 << 0),