diff --git a/NPLib/Helios/Helios.cxx b/NPLib/Helios/Helios.cxx
index 4ae1b3af3fa52eb5dcc4ef0b9c28d46facad9e2a..ddc54f00ed4b9b151c5ebf21675b8b19a0c92a66 100755
--- a/NPLib/Helios/Helios.cxx
+++ b/NPLib/Helios/Helios.cxx
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
diff --git a/NPLib/Helios/Helios.h b/NPLib/Helios/Helios.h
index eab74cd853817cf17bf166c16b4bcc2d80f7056e..7c6ac7e4a89fa142c6f52a02592de48fb2c315d2 100755
--- a/NPLib/Helios/Helios.h
+++ b/NPLib/Helios/Helios.h
@@ -1,5 +1,6 @@
+#ifndef HELIOS_H
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
@@ -21,8 +22,6 @@
  *                                                                           *
  *****************************************************************************/
 
-#ifndef HELIOS_H
-
 // NPL
 #include "../include/VDetector.h"
 #include "THeliosData.h"
diff --git a/NPLib/Helios/THeliosData.cxx b/NPLib/Helios/THeliosData.cxx
index 63484c1b9a5d6740bed43eb734e7feca7c6af89f..a52e8caa915717b35eeeeb4fdadfc9bcd7114f71 100755
--- a/NPLib/Helios/THeliosData.cxx
+++ b/NPLib/Helios/THeliosData.cxx
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
diff --git a/NPLib/Helios/THeliosData.h b/NPLib/Helios/THeliosData.h
index ef1b393d5edd8ec4b3bfb2ff6486b6bb9aad0f49..53cd8897c78d459c077fb8d7f00c39cbdb28a9e1 100755
--- a/NPLib/Helios/THeliosData.h
+++ b/NPLib/Helios/THeliosData.h
@@ -1,5 +1,7 @@
+#ifndef __HELIOSDATA__
+#define __HELIOSDATA__
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
@@ -24,9 +26,6 @@
  *                                                                           *
  *****************************************************************************/
 
-#ifndef __HELIOSDATA__
-#define __HELIOSDATA__
-
 #include <vector>
 #include "TObject.h"
 
diff --git a/NPLib/Helios/THeliosPhysics.cxx b/NPLib/Helios/THeliosPhysics.cxx
index fd65d33286c20f7082fa1355fd9ab633a086b427..887af19323016181e79dfe9e10e775316fe995eb 100755
--- a/NPLib/Helios/THeliosPhysics.cxx
+++ b/NPLib/Helios/THeliosPhysics.cxx
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
diff --git a/NPLib/Helios/THeliosPhysics.h b/NPLib/Helios/THeliosPhysics.h
index 4c89e8765d305bc78d4e926a4d5edbd572ad0a57..73dea9fe1a404848639c41ca66431d9fa2b7d2cf 100755
--- a/NPLib/Helios/THeliosPhysics.h
+++ b/NPLib/Helios/THeliosPhysics.h
@@ -1,5 +1,7 @@
+#ifndef THELIOSPHYSICS_H
+#define THELIOSPHYSICS_H
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
@@ -21,8 +23,7 @@
  *                                                                           *
  *****************************************************************************/
 
-#ifndef THELIOSPHYSICS_H
-#define THELIOSPHYSICS_H
+
 
 #include <vector>
 #include "TObject.h"
diff --git a/NPSimulation/include/Helios.hh b/NPSimulation/include/Helios.hh
index d0f0f1a7f06ec8107076da17742db2044aad8471..5272bbb87dff697e326e46e24beac6399cf181e2 100644
--- a/NPSimulation/include/Helios.hh
+++ b/NPSimulation/include/Helios.hh
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
diff --git a/NPSimulation/include/HeliosDetDummyShape.hh b/NPSimulation/include/HeliosDetDummyShape.hh
index 3f2fa23327e1cff15e3c85d618c8255640505c87..08564b61de664ae7908aaece2fe6563c0db896a3 100644
--- a/NPSimulation/include/HeliosDetDummyShape.hh
+++ b/NPSimulation/include/HeliosDetDummyShape.hh
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
diff --git a/NPSimulation/include/HeliosModule.hh b/NPSimulation/include/HeliosModule.hh
index a8771ddb86b735d8c0ca34e7499e0e58ecfb3065..b3a0b89f50846d97d025b62c299f1775359c9ad2 100644
--- a/NPSimulation/include/HeliosModule.hh
+++ b/NPSimulation/include/HeliosModule.hh
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
diff --git a/NPSimulation/include/HeliosScorers.hh b/NPSimulation/include/HeliosScorers.hh
index 0f635a54e6d04ed1f054f04edc2d1187bd7f3017..44ed3d9434d9f1296fe6a7b010b6b7e6dcf19546 100644
--- a/NPSimulation/include/HeliosScorers.hh
+++ b/NPSimulation/include/HeliosScorers.hh
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
diff --git a/NPSimulation/src/Helios.cc b/NPSimulation/src/Helios.cc
index 63ed2f6c7bfced5f2e8100e6321a2207083b8961..9c1dda8d30fd401c3b785863c063212dcf7b4535 100644
--- a/NPSimulation/src/Helios.cc
+++ b/NPSimulation/src/Helios.cc
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
diff --git a/NPSimulation/src/HeliosDetDummyShape.cc b/NPSimulation/src/HeliosDetDummyShape.cc
index 3d907a977ba8c74715ee948ab9c469fa602266f1..deeb15672c7ce23ab0371938834874d400db6bc4 100644
--- a/NPSimulation/src/HeliosDetDummyShape.cc
+++ b/NPSimulation/src/HeliosDetDummyShape.cc
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
diff --git a/NPSimulation/src/HeliosModule.cc b/NPSimulation/src/HeliosModule.cc
index a8d2ef1b77444a4e05cde30ac5b8227ca2774bf4..f5bdabe4dc271f61a46f42a76ad352febbc2c5a1 100644
--- a/NPSimulation/src/HeliosModule.cc
+++ b/NPSimulation/src/HeliosModule.cc
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *
diff --git a/NPSimulation/src/HeliosScorers.cc b/NPSimulation/src/HeliosScorers.cc
index 5a64309ae707996d8e8a29e15ab595332d2f7b3f..e15fcf04641aed1f9aaf64d919e1387d0415ad83 100644
--- a/NPSimulation/src/HeliosScorers.cc
+++ b/NPSimulation/src/HeliosScorers.cc
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2009   this file is part of the NPTool Project              *
+ * Copyright (C) 2009-2013   this file is part of the NPTool Project         *
  *                                                                           *
  * For the licensing terms see $NPTOOL/Licence/NPTool_Licence                *
  * For the list of contributors see $NPTOOL/Licence/Contributors             *