diff --git a/fifo_buffer.c b/fifo_buffer.c
index a4ae0a29f1..0f6e400e66 100644
--- a/fifo_buffer.c
+++ b/fifo_buffer.c
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2014 - 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-
@@ -13,6 +14,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+
 #include "fifo_buffer.h"
 
 fifo_buffer_t *fifo_new(size_t size)
diff --git a/fifo_buffer.h b/fifo_buffer.h
index 54ef8ba4fa..f34ae686b8 100644
--- a/fifo_buffer.h
+++ b/fifo_buffer.h
@@ -1,25 +1,22 @@
-/*  RSound - A PCM audio client/server
+/*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2014 - Daniel De Matteis
  * 
- *  RSound is free software: you can redistribute it and/or modify it under the terms
+ *  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.
  *
- *  RSound is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  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 RSound.
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __FIFO_BUFFER_H
 #define __FIFO_BUFFER_H
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif