diff --git a/m4/atomic_builtins.m4 b/m4/atomic_builtins.m4
index 176fb604571e26cd0716de3fbad6cb10a17814f0..ca0a96811cad1d1e26a4361ca8b853cc36e2e561 100644
--- a/m4/atomic_builtins.m4
+++ b/m4/atomic_builtins.m4
@@ -1,3 +1,32 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ 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 Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
+#
+# SYNOPSIS
+#
+# AC_CHECK_GXX_NEW_ATOMIC_BUILTINS
+#
+# DESCRIPTION
+#
+# Check whether the new GCC atomic builtins are enabled
+#
+
AC_DEFUN([AC_CHECK_GXX_NEW_ATOMIC_BUILTINS], [
new_gcc_builtins=no
try_gcc_builtins=no
diff --git a/m4/ax_check_dlb.m4 b/m4/ax_check_dlb.m4
index 5227b0a8c12d609620c066e9fe38788ef4698896..2710827d908c0ec3c07db3ac88e75a15ecf113fb 100644
--- a/m4/ax_check_dlb.m4
+++ b/m4/ax_check_dlb.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ 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 Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
diff --git a/m4/ax_check_extrae.m4 b/m4/ax_check_extrae.m4
index 91e7291ba26891a2261b05c0310237a00f440732..fe2b4120470eb36d6bd88aee702027e5b2f97169 100644
--- a/m4/ax_check_extrae.m4
+++ b/m4/ax_check_extrae.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ 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 Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
diff --git a/m4/ax_check_host.m4 b/m4/ax_check_host.m4
index ea53ea89ca68fd359d961f0cc53441f742d097ec..5cf010a4ec2178064580ede5b80cad191bc5d47f 100644
--- a/m4/ax_check_host.m4
+++ b/m4/ax_check_host.m4
@@ -1,3 +1,31 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ 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 Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
+#
+# SYNOPSIS
+#
+# AX_CHECK_HOST_ARCH
+#
+# DESCRIPTION
+#
+# Check host architechture
+#
AC_DEFUN([AX_CHECK_HOST_ARCH],[
AC_REQUIRE([AC_CANONICAL_SYSTEM])
diff --git a/m4/ax_enable_task_callback.m4 b/m4/ax_enable_task_callback.m4
index 246020ce6a0f8c1ea2a5d4c87d36888ea755eea2..d5f0b677b1ff044680626851c9d7e878cd800a14 100644
--- a/m4/ax_enable_task_callback.m4
+++ b/m4/ax_enable_task_callback.m4
@@ -1,3 +1,32 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ 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 Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
+#
+# SYNOPSIS
+#
+# AX_ENABLE_TASK_CALLBACK
+#
+# DESCRIPTION
+#
+# Check whether to enable task callback feature
+#
+
AC_DEFUN([AX_ENABLE_TASK_CALLBACK],
[
AC_ARG_ENABLE([task-callback],