diff --git a/network/httpserver/httpserver.c b/network/httpserver/httpserver.c
index e90909d52d..05efe15552 100644
--- a/network/httpserver/httpserver.c
+++ b/network/httpserver/httpserver.c
@@ -1,3 +1,18 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2016 - Andre Leiradella
+ *
+ *  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/>.
+ */
+
 #define __STDC_FORMAT_MACROS 
 #include <inttypes.h>
 #include <string.h>
diff --git a/network/httpserver/httpserver.h b/network/httpserver/httpserver.h
index 62ef7116f4..301d0d67eb 100644
--- a/network/httpserver/httpserver.h
+++ b/network/httpserver/httpserver.h
@@ -1,15 +1,29 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2016 - Andre Leiradella
+ *
+ *  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 __RARCH_HTTPSERVR_H
 #define __RARCH_HTTPSERVR_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <retro_common_api.h>
 
-  int  httpserver_init(unsigned port);
-  void httpserver_destroy(void);
+RETRO_BEGIN_DECLS
 
-#ifdef __cplusplus
-}
-#endif
+int  httpserver_init(unsigned port);
+
+void httpserver_destroy(void);
+
+RETRO_END_DECLS
 
 #endif /* __RARCH_HTTPSERVR_H */