12 files changed, 44 insertions, 303 deletions

diff --git a/src/core/src/core.h b/src/core/src/core.h
index a71e4ed8d..bae9f3e3d 100644
--- a/src/core/src/core.h
+++ b/src/core/src/core.h
@@ -1,29 +1,8 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @file    core.h
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2013-09-04
- * @brief   Core of emulator
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-#ifndef CORE_CORE_H_
-#define CORE_CORE_H_
+#pragma once
 
 #include "arm/arm_interface.h"
 #include "arm/interpreter/armdefs.h"
@@ -59,7 +38,3 @@ int Init();
 void Shutdown();
 
 } // namespace
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif // CORE_CORE_H_
diff --git a/src/core/src/hw/hw.cpp b/src/core/src/hw/hw.cpp
index 50001c87a..57be4d6a8 100644
--- a/src/core/src/hw/hw.cpp
+++ b/src/core/src/hw/hw.cpp
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @file    hw.cpp
- * @author  bunnei
- * @date    2014-04-04
- * @brief   Hardware interface
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "log.h"
 #include "hw/hw.h"
diff --git a/src/core/src/hw/hw.h b/src/core/src/hw/hw.h
index 245822423..5b0cc8c87 100644
--- a/src/core/src/hw/hw.h
+++ b/src/core/src/hw/hw.h
@@ -1,26 +1,8 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @file    hw.h
- * @author  bunnei
- * @date    2014-04-04
- * @brief   Hardware interface
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#pragma once
 
 #include "common_types.h"
 
diff --git a/src/core/src/hw/hw_lcd.cpp b/src/core/src/hw/hw_lcd.cpp
index ee806d5dc..ad346c794 100644
--- a/src/core/src/hw/hw_lcd.cpp
+++ b/src/core/src/hw/hw_lcd.cpp
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @file    hw_lcd.cpp
- * @author  bunnei
- * @date    2014-04-05
- * @brief   Hardware LCD interface
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "log.h"
 #include "core.h"
diff --git a/src/core/src/hw/hw_lcd.h b/src/core/src/hw/hw_lcd.h
index fa19b1cd4..30e347ccb 100644
--- a/src/core/src/hw/hw_lcd.h
+++ b/src/core/src/hw/hw_lcd.h
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @file    hw_lcd.h
- * @author  bunnei
- * @date    2014-04-05
- * @brief   Hardware LCD interface
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/src/core/src/loader.cpp b/src/core/src/loader.cpp
index 71ace20c4..5d039dc94 100644
--- a/src/core/src/loader.cpp
+++ b/src/core/src/loader.cpp
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @file    loader.cpp
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2013-09-18
- * @brief   Loads bootable binaries into the emu
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "file_util.h"
 #include "loader.h"
diff --git a/src/core/src/loader.h b/src/core/src/loader.h
index adad3e734..46525fcf8 100644
--- a/src/core/src/loader.h
+++ b/src/core/src/loader.h
@@ -1,29 +1,8 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @file    loader.h
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2013-09-18
- * @brief   Loads bootable binaries into the emu
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-#ifndef CORE_LOADER_H_
-#define CORE_LOADER_H_
+#pragma once
 
 #include "common.h"
 
@@ -70,5 +49,3 @@ FileType IdentifyFile(std::string &filename);
 bool LoadFile(std::string &filename, std::string *error_string);
 
 } // namespace
-
-#endif // CORE_LOADER_H_
\ No newline at end of file
diff --git a/src/core/src/mem_map.cpp b/src/core/src/mem_map.cpp
index 6477499d5..96f77d32e 100644
--- a/src/core/src/mem_map.cpp
+++ b/src/core/src/mem_map.cpp
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2014 Citra Emulator
- *
- * @file    mem_map.cpp
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2013-09-05
- * @brief   Memory map - handles virtual to physical memory access
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "common.h"
 #include "mem_arena.h"
@@ -100,6 +80,4 @@ void Shutdown() {
     NOTICE_LOG(MEMMAP, "Memory system shut down.");
 }
 
-
-
 } // namespace
diff --git a/src/core/src/mem_map.h b/src/core/src/mem_map.h
index e880503d2..ad5abd16d 100644
--- a/src/core/src/mem_map.h
+++ b/src/core/src/mem_map.h
@@ -1,29 +1,8 @@
-/**
- * Copyright (C) 2014 Citra Emulator
- *
- * @file    mem_map.h
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2013-09-05
- * @brief   Memory map - handles virtual to physical memory access
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
-
-#ifndef CORE_MEM_MAP_H_
-#define CORE_MEM_MAP_H_
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#pragma once
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -92,7 +71,3 @@ void Write32(const u32 addr, const u32 data);
 u8* GetPointer(const u32 Address);
 
 } // namespace
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif // CORE_MEM_MAP_H_
\ No newline at end of file
diff --git a/src/core/src/mem_map_funcs.cpp b/src/core/src/mem_map_funcs.cpp
index ee2f79278..7d8ae2915 100644
--- a/src/core/src/mem_map_funcs.cpp
+++ b/src/core/src/mem_map_funcs.cpp
@@ -1,26 +1,6 @@
-/**
- * Copyright (C) 2014 Citra Emulator
- *
- * @file    mem_map_funcs.cpp
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2013-09-18
- * @brief   Memory map R/W functions
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "common.h"
 
diff --git a/src/core/src/system.cpp b/src/core/src/system.cpp
index 7c829d609..1fc272d70 100644
--- a/src/core/src/system.cpp
+++ b/src/core/src/system.cpp
@@ -1,26 +1,6 @@
-/**
-* Copyright (C) 2013 Citrus Emulator
-*
-* @file    system.cpp
-* @author  ShizZy <shizzy247@gmail.com>
-* @date    2013-09-26
-* @brief   Emulation of main system
-*
-* @section LICENSE
-* 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; either version 2 of
-* the License, or (at your option) any later version.
-*
-* 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 for more details at
-* http://www.gnu.org/copyleft/gpl.html
-*
-* Official project repository can be found at:
-* http://code.google.com/p/gekko-gc-emu/
-*/
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "core.h"
 #include "hw/hw.h"
diff --git a/src/core/src/system.h b/src/core/src/system.h
index e05413d86..8e94e5252 100644
--- a/src/core/src/system.h
+++ b/src/core/src/system.h
@@ -1,29 +1,8 @@
-/**
- * Copyright (C) 2013 Citrus Emulator
- *
- * @file    system.h
- * @author  ShizZy <shizzy247@gmail.com>
- * @date    2013-09-26
- * @brief   Emulation of main system
- *
- * @section LICENSE
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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 for more details at
- * http://www.gnu.org/copyleft/gpl.html
- *
- * Official project repository can be found at:
- * http://code.google.com/p/gekko-gc-emu/
- */
-
-#ifndef CORE_SYSTEM_H_
-#define CORE_SYSTEM_H_
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#pragma once
 
 #include "emu_window.h"
 #include "file_sys/meta_file_system.h"
@@ -54,8 +33,3 @@ void RunLoopUntil(u64 global_cycles);
 void Shutdown();
 
 };
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif // CORE_SYSTEM_H_
- 
\ No newline at end of file