diff --git a/Source/Core/Common/Src/SettingsHandler.cpp b/Source/Core/Common/Src/SettingsHandler.cpp
index b9de9624d464..46b4170fcbe8 100644
--- a/Source/Core/Common/Src/SettingsHandler.cpp
+++ b/Source/Core/Common/Src/SettingsHandler.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Thanks to Treeki for writing the original class - 29/01/2012
 
@@ -89,7 +76,7 @@ void SettingsHandler::Reset()
 {
 	decoded = "";
 	m_position = 0;
-	m_key = 0x73B5DBFA;
+	m_key = INITIAL_SEED;
 	memset(m_buffer, 0, SETTINGS_SIZE);
 }
 
diff --git a/Source/Core/Common/Src/SettingsHandler.h b/Source/Core/Common/Src/SettingsHandler.h
index cda17b0b587d..9557dc5792a5 100644
--- a/Source/Core/Common/Src/SettingsHandler.h
+++ b/Source/Core/Common/Src/SettingsHandler.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Thanks to Treeki for writing the original class - 29/01/2012
 
@@ -30,7 +17,9 @@ class SettingsHandler
 
 	enum
 	{
-		SETTINGS_SIZE = 0x100
+		SETTINGS_SIZE = 0x100,
+		// Key used to encrypt/decrypt setting.txt contents
+		INITIAL_SEED = 0x73B5DBFA
 	};
 
 	void AddSetting(const char *key, const char *value);
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
index d7a2f98dedc6..f4673efd5999 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
@@ -136,15 +136,15 @@ class CWII_IPC_HLE_Device_es : public IWII_IPC_HLE_Device
 
 	typedef struct ecc_cert_t
 	{
-		u32 sig_type			;
-		 u8 sig			[0x3c]	;
-		 u8 pad			[0x40]	;
-		 u8 issuer		[0x40]	;
-		u32 key_type			;
-		 u8 key_name	[0x40]	;
-		u32 ng_key_id			;
-		 u8 ecc_pubkey	[0x3c]	;
-		 u8 padding		[0x3c]	;
+		u32 sig_type          ;
+		 u8 sig         [0x3c];
+		 u8 pad         [0x40];
+		 u8 issuer      [0x40];
+		u32 key_type          ;
+		 u8 key_name    [0x40];
+		u32 ng_key_id         ;
+		 u8 ecc_pubkey  [0x3c];
+		 u8 padding     [0x3c];
 	} ecc_cert_t;
 };
 
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
index de0f7cf37b04..243696f652c6 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../Core.h"
 #include "../Debugger/Debugger_SymbolMap.h"
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h
index 512c5c0d8eb5..2a87ca04e115 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h
@@ -1,21 +1,9 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#pragma once
+#ifndef _WII_IPC_HLE_DEVICE_HID_H_
+#define _WII_IPC_HLE_DEVICE_HID_H_
 
 #include "WII_IPC_HLE.h"
 #include "WII_IPC_HLE_Device.h"
@@ -149,3 +137,5 @@ class CWII_IPC_HLE_Device_hid : public IWII_IPC_HLE_Device
 
 	std::list<_hidevent> event_list;
 };
+
+#endif