diff --git a/apple/common/CFExtensions.h b/apple/common/CFExtensions.h
index 08c2f0fb01..987e8e0022 100644
--- a/apple/common/CFExtensions.h
+++ b/apple/common/CFExtensions.h
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ *  Copyright (C) 2014-2015 - Jay McCarthy
  *
  *  RetroArch 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 Found-
diff --git a/apple/common/CFExtensions.m b/apple/common/CFExtensions.m
index dccfdd4201..672fb68aa5 100644
--- a/apple/common/CFExtensions.m
+++ b/apple/common/CFExtensions.m
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ *  Copyright (C) 2014-2015 - Jay McCarthy
  *
  *  RetroArch 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 Found-
diff --git a/apple/common/RAGameView.m b/apple/common/RAGameView.m
index ad766de928..e5b6ace88c 100644
--- a/apple/common/RAGameView.m
+++ b/apple/common/RAGameView.m
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/apple/common/RetroArch_Apple.h b/apple/common/RetroArch_Apple.h
index b45b1b52ed..af01cb44d3 100644
--- a/apple/common/RetroArch_Apple.h
+++ b/apple/common/RetroArch_Apple.h
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/apple/iOS/bluetooth/btdynamic.c b/apple/iOS/bluetooth/btdynamic.c
index b0d8a5d643..6482e51855 100644
--- a/apple/iOS/bluetooth/btdynamic.c
+++ b/apple/iOS/bluetooth/btdynamic.c
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/apple/iOS/bluetooth/btdynamic.h b/apple/iOS/bluetooth/btdynamic.h
index 14a0c24151..5e143e47b5 100644
--- a/apple/iOS/bluetooth/btdynamic.h
+++ b/apple/iOS/bluetooth/btdynamic.h
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/apple/iOS/bluetooth/btpad.c b/apple/iOS/bluetooth/btpad.c
index c2a4d2b271..6d5c1ebaac 100644
--- a/apple/iOS/bluetooth/btpad.c
+++ b/apple/iOS/bluetooth/btpad.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/apple/iOS/bluetooth/btpad.h b/apple/iOS/bluetooth/btpad.h
index 6372f423a2..536f31a4cd 100644
--- a/apple/iOS/bluetooth/btpad.h
+++ b/apple/iOS/bluetooth/btpad.h
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/apple/iOS/bluetooth/btpad_queue.c b/apple/iOS/bluetooth/btpad_queue.c
index 13652858eb..2a072c15d6 100644
--- a/apple/iOS/bluetooth/btpad_queue.c
+++ b/apple/iOS/bluetooth/btpad_queue.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/apple/iOS/bluetooth/btpad_queue.h b/apple/iOS/bluetooth/btpad_queue.h
index 6b0e50352a..c3ab269f1d 100644
--- a/apple/iOS/bluetooth/btpad_queue.h
+++ b/apple/iOS/bluetooth/btpad_queue.h
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/apple/iOS/platform.h b/apple/iOS/platform.h
index 7479e3c2b4..6d73285242 100644
--- a/apple/iOS/platform.h
+++ b/apple/iOS/platform.h
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m
index d57832ee9c..26d69520c6 100644
--- a/apple/iOS/platform.m
+++ b/apple/iOS/platform.m
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/apple/iOS/views.h b/apple/iOS/views.h
index 2cbf42944b..521aebac89 100644
--- a/apple/iOS/views.h
+++ b/apple/iOS/views.h
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013-2014 - Jason Fetters
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/audio/alsa_qsa.c b/audio/alsa_qsa.c
index 6759cd77e9..3d5fe60752 100644
--- a/audio/alsa_qsa.c
+++ b/audio/alsa_qsa.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/audio/alsathread.c b/audio/alsathread.c
index 429954cb9c..ef7f92ae00 100644
--- a/audio/alsathread.c
+++ b/audio/alsathread.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2012-2014 - Michael Lelli
+ *  Copyright (C) 2012-2015 - Michael Lelli
  * 
  *  RetroArch 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 Found-
diff --git a/audio/dsound.c b/audio/dsound.c
index 07bb55d69f..83d65b97de 100644
--- a/audio/dsound.c
+++ b/audio/dsound.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/audio/dsp_filter.c b/audio/dsp_filter.c
index 7bc435b85c..9d06da9b02 100644
--- a/audio/dsp_filter.c
+++ b/audio/dsp_filter.c
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  *
  *  RetroArch 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 Found-
diff --git a/audio/dsp_filter.h b/audio/dsp_filter.h
index 7b9497166d..4a401d2456 100644
--- a/audio/dsp_filter.h
+++ b/audio/dsp_filter.h
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  *
  *  RetroArch 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 Found-
diff --git a/audio/gx_audio.c b/audio/gx_audio.c
index 22b830a124..7f99831da9 100644
--- a/audio/gx_audio.c
+++ b/audio/gx_audio.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/audio/librsound.c b/audio/librsound.c
index 1e036427a3..ba352b7af5 100644
--- a/audio/librsound.c
+++ b/audio/librsound.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/audio/opensl.c b/audio/opensl.c
index e728bf8f5e..b14d2eabf8 100644
--- a/audio/opensl.c
+++ b/audio/opensl.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/audio/ps3_audio.c b/audio/ps3_audio.c
index c80c7407a7..3d12e5be4d 100644
--- a/audio/ps3_audio.c
+++ b/audio/ps3_audio.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/audio/psp1_audio.c b/audio/psp1_audio.c
index ebb5d377f3..b009e2a2c2 100644
--- a/audio/psp1_audio.c
+++ b/audio/psp1_audio.c
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
- *  Copyright (C) 2014      - Aliaspider (To be replaced with real name)
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ *  Copyright (C) 2014-2015 - Ali Bouhlel
  *
  *  RetroArch 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 Found-
diff --git a/audio/resamplers/cc_resampler.c b/audio/resamplers/cc_resampler.c
index 2c87e7ee07..65d71f042d 100644
--- a/audio/resamplers/cc_resampler.c
+++ b/audio/resamplers/cc_resampler.c
@@ -1,6 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2014      - Ali Bouhlel ( aliaspider@gmail.com )
+ *  Copyright (C) 2014-2015 - Ali Bouhlel ( aliaspider@gmail.com )
  *
  *  RetroArch 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 Found-
@@ -14,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Convoluted Cosine Resampler
+/* Convoluted Cosine Resampler */
 
 #include "resampler.h"
 #include <math.h>
@@ -29,7 +28,7 @@
 #endif
 
 
-/* since SSE and NEON don't provide support for trigonometric functions
+/* Since SSE and NEON don't provide support for trigonometric functions
  * we approximate those with polynoms
  *
  * CC_RESAMPLER_PRECISION defines how accurate the approximation is
diff --git a/audio/resamplers/cc_resampler_neon.S b/audio/resamplers/cc_resampler_neon.S
index 769d1c7d36..c0c0ecfa6e 100644
--- a/audio/resamplers/cc_resampler_neon.S
+++ b/audio/resamplers/cc_resampler_neon.S
@@ -1,6 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2014      - Ali Bouhlel ( aliaspider@gmail.com )
+ *  Copyright (C) 2014-2015 - Ali Bouhlel ( aliaspider@gmail.com )
  *
  *  RetroArch 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 Found-
diff --git a/audio/resamplers/nearest.c b/audio/resamplers/nearest.c
index 5693bc2ac9..8664518302 100644
--- a/audio/resamplers/nearest.c
+++ b/audio/resamplers/nearest.c
@@ -1,3 +1,18 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2014-2015 - Ali Bouhlel ( aliaspider@gmail.com )
+ *
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch 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.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "resampler.h"
 #include <math.h>
 #include <stdint.h>
diff --git a/audio/resamplers/resampler.c b/audio/resamplers/resampler.c
index 28557f5472..685afb25d8 100644
--- a/audio/resamplers/resampler.c
+++ b/audio/resamplers/resampler.c
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/audio/resamplers/resampler.h b/audio/resamplers/resampler.h
index b9a55c518a..fe8dad759f 100644
--- a/audio/resamplers/resampler.h
+++ b/audio/resamplers/resampler.h
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
diff --git a/audio/xaudio-c/xaudio-c.cpp b/audio/xaudio-c/xaudio-c.cpp
index 9d98d36520..79cec7549f 100644
--- a/audio/xaudio-c/xaudio-c.cpp
+++ b/audio/xaudio-c/xaudio-c.cpp
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Simple C interface for XAudio2
+/* Simple C interface for XAudio2 */
 
 #include "xaudio.h"
 #include "xaudio-c.h"
diff --git a/audio/xaudio-c/xaudio-c.h b/audio/xaudio-c/xaudio-c.h
index be8fa80079..582d62ce2f 100644
--- a/audio/xaudio-c/xaudio-c.h
+++ b/audio/xaudio-c/xaudio-c.h
@@ -1,8 +1,17 @@
-/*
-   Simple C interface for XAudio2
-   Author: Hans-Kristian Arntzen
-   License: Public Domain
-*/
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ * 
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch 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.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef XAUDIO_C_H
 #define XAUDIO_C_H
diff --git a/audio/xaudio-c/xaudio.h b/audio/xaudio-c/xaudio.h
index 921a663e06..38c8fbf144 100644
--- a/audio/xaudio-c/xaudio.h
+++ b/audio/xaudio-c/xaudio.h
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
  *  Copyright (C) 2010-2014 - OV2
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/camera/android.c b/camera/android.c
index b048c80782..eb2705274a 100644
--- a/camera/android.c
+++ b/camera/android.c
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
- *  Copyright (C) 2012-2014 - Michael Lelli
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ *  Copyright (C) 2012-2015 - Michael Lelli
  * 
  *  RetroArch 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 Found-
diff --git a/camera/nullcamera.c b/camera/nullcamera.c
index 736bff261f..5617d97829 100644
--- a/camera/nullcamera.c
+++ b/camera/nullcamera.c
@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Michael Lelli
+ *  Copyright (C) 2010-2015 - Michael Lelli
  * 
  *  RetroArch 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 Found-
diff --git a/camera/rwebcam.c b/camera/rwebcam.c
index 0eae208b69..0be75627a0 100644
--- a/camera/rwebcam.c
+++ b/camera/rwebcam.c
@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Michael Lelli
+ *  Copyright (C) 2012-2015 - Michael Lelli
  * 
  *  RetroArch 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 Found-
diff --git a/camera/video4linux2.c b/camera/video4linux2.c
index 0c2df0a2c9..23783c830d 100644
--- a/camera/video4linux2.c
+++ b/camera/video4linux2.c
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
- *  Copyright (C) 2012-2014 - Michael Lelli
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ *  Copyright (C) 2012-2015 - Michael Lelli
  * 
  *  RetroArch 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 Found-