diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 2c028e85ef..d14d0a832a 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -395,7 +395,7 @@ void SetDefaultKeyMap(DefaultMaps dmap, bool replace) {
 	UpdateNativeMenuKeys();
 }
 
-const KeyMap_IntStrPair key_names[] = {
+static const KeyMap_IntStrPair key_names[] = {
 	{NKCODE_A, "A"},
 	{NKCODE_B, "B"},
 	{NKCODE_C, "C"},
@@ -586,7 +586,7 @@ const KeyMap_IntStrPair key_names[] = {
 	{NKCODE_RIGHTBRACE, "}"},
 };
 
-const KeyMap_IntStrPair axis_names[] = {
+static const KeyMap_IntStrPair axis_names[] = {
 	{JOYSTICK_AXIS_X, "X Axis"},
 	{JOYSTICK_AXIS_Y, "Y Axis"},
 	{JOYSTICK_AXIS_PRESSURE, "Pressure"},
@@ -874,7 +874,7 @@ void LoadFromIni(IniFile &file) {
 	IniFile::Section *controls = file.GetOrCreateSection("ControlMapping");
 	for (size_t i = 0; i < ARRAY_SIZE(psp_button_names); i++) {
 		std::string value;
-		controls->Get(psp_button_names[i].name.c_str(), &value, "");
+		controls->Get(psp_button_names[i].name, &value, "");
 
 		// Erase default mapping
 		g_controllerMap.erase(psp_button_names[i].key);
@@ -913,7 +913,7 @@ void SaveToIni(IniFile &file) {
 				value += ",";
 		}
 
-		controls->Set(psp_button_names[i].name.c_str(), value, "");
+		controls->Set(psp_button_names[i].name, value, "");
 	}
 }
 
diff --git a/Common/KeyMap.h b/Common/KeyMap.h
index 369b12fc89..5305d9d424 100644
--- a/Common/KeyMap.h
+++ b/Common/KeyMap.h
@@ -86,7 +86,7 @@ namespace KeyMap {
 	// Key & Button names
 	struct KeyMap_IntStrPair {
 		int key;
-		std::string name;
+		const char *name;
 	};
 
 	// Use if you need to display the textual name
diff --git a/Core/HLE/sceUsbCam.h b/Core/HLE/sceUsbCam.h
index 14aff22212..ef088fe91d 100644
--- a/Core/HLE/sceUsbCam.h
+++ b/Core/HLE/sceUsbCam.h
@@ -46,8 +46,7 @@ typedef struct PspUsbCamSetupVideoParam {
 	int evlevel;
 } PspUsbCamSetupVideoParam;
 
-
-static unsigned char sceUsbCamDummyImage[] = {
+static const unsigned char sceUsbCamDummyImage[] = {
 	0xFF, 0xD8, 0xFF, 0xE0, 0x00, 0x10, 0x4A, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00, 0x60,
 	0x00, 0x60, 0x00, 0x00, 0xFF, 0xE1, 0x00, 0x68, 0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x4D, 0x4D,
 	0x00, 0x2A, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x01, 0x1A, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01,