diff --git a/include/dynamic-graph/all-signals.h b/include/dynamic-graph/all-signals.h
index 82f3175b22938db2fa42a1e7a06dd323c7bc8a6b..c305effc32ecdd4a2334758b246644cb206b20b4 100644
--- a/include/dynamic-graph/all-signals.h
+++ b/include/dynamic-graph/all-signals.h
@@ -2,18 +2,16 @@
  * all-signals.h
  *
  *  Created on: Jun 16, 2010
- *      Author: blue
+ *      Author: Francois Bleibel
  */
 
 #ifndef ALLSIGNALS_H_
 #define ALLSIGNALS_H_
 
-/// Utility header files including all signals and using namespace dynamicgraph
+/// Utility header files including all signal headers
 
 #include <dynamic-graph/signal.h>
 #include <dynamic-graph/signal-ptr.h>
 #include <dynamic-graph/signal-time-dependant.h>
 
-using namespace dynamicgraph;
-
 #endif /* ALLSIGNALS_H_ */
diff --git a/include/dynamic-graph/signal-caster.h b/include/dynamic-graph/signal-caster.h
index 3c5700c4ddf5ef8e57f2ca5ad7280cdb7d53f4d8..1f65c7355290193d8e68eee8af0de34033132115 100644
--- a/include/dynamic-graph/signal-caster.h
+++ b/include/dynamic-graph/signal-caster.h
@@ -2,7 +2,7 @@
  * SignalCaster.h
  *
  *  Created on: Jun 14, 2010
- *      Author: blue
+ *      Author: Francois Bleibel
  */
 
 #ifndef SIGNALCASTER_H_
diff --git a/include/dynamic-graph/signal-ptr.t.cpp b/include/dynamic-graph/signal-ptr.t.cpp
index b89ca4b570ddad57e75cb1853579b81276f47537..a0bcd64067ce7aa5862836d3a7220cfd426b7633 100644
--- a/include/dynamic-graph/signal-ptr.t.cpp
+++ b/include/dynamic-graph/signal-ptr.t.cpp
@@ -29,7 +29,7 @@
 #define VP_TEMPLATE_DEBUG_MODE 0
 #include <dynamic-graph/debug.h>
 
-using namespace dynamicgraph;
+namespace dynamicgraph {
 
 template< class T,class Time >
 bool SignalPtr<T,Time>::
@@ -262,6 +262,7 @@ displayDependancies( std::ostream& os,const int depth,
   return os;
 }
 
+} // namespace dynamicgraph
 
 #endif // #ifndef __SIGNAL_PTR_TCPP
 
diff --git a/include/dynamic-graph/signal.t.cpp b/include/dynamic-graph/signal.t.cpp
index 1eeab4c51750317175cf054dbe39f2b09df1425e..0d00e7d2886ab8a7ab1c8f7c3358d872b1749a93 100644
--- a/include/dynamic-graph/signal.t.cpp
+++ b/include/dynamic-graph/signal.t.cpp
@@ -30,7 +30,7 @@
 #define VP_TEMPLATE_DEBUG_MODE 0
 #include <dynamic-graph/debug.h>
 
-using namespace dynamicgraph;
+namespace dynamicgraph {
 
 #define __SIGNAL_INIT(name,Tcpy,Tref,TrefNC,mutex)  \
      SignalBase<Time>(name)               \
@@ -327,6 +327,8 @@ display (std::ostream& os) const
   return os<<")";
 }
 
+} // namespace dynamicgraph
+
 #endif // #ifndef __SIGNAL_TEMPLATE
 
 /*
diff --git a/include/dynamic-graph/time-dependency.h b/include/dynamic-graph/time-dependency.h
index ca0cc3f1ec165dff2fc7ef72d72ee1ed788ae921..3a4f1ec3a82c19396e45f3c5551b24ebdc564683 100644
--- a/include/dynamic-graph/time-dependency.h
+++ b/include/dynamic-graph/time-dependency.h
@@ -29,6 +29,9 @@
 #include <dynamic-graph/signal-base.h>
 #include <dynamic-graph/signal-array.h>
 
+namespace dynamicgraph {
+
+
 template< class Time >
 class TimeDependancy
 {
@@ -90,6 +93,9 @@ class TimeDependancy
 
 };
 
+} // namespace dynamicgraph
+
+
 #include <dynamic-graph/time-dependency.t.cpp>
 
 #endif /* #ifndef __TIME_DEPENDANCY_HH */
diff --git a/include/dynamic-graph/time-dependency.t.cpp b/include/dynamic-graph/time-dependency.t.cpp
index e35c472c1f6dee465b1410b63537b73502732014..de3000f681d78780ba394f55d2a40f1d1c302f5a 100644
--- a/include/dynamic-graph/time-dependency.t.cpp
+++ b/include/dynamic-graph/time-dependency.t.cpp
@@ -25,7 +25,7 @@
 
 #include <dynamic-graph/time-dependency.h>
 
-using namespace dynamicgraph;
+namespace dynamicgraph {
 
 #undef VP_TEMPLATE_DEBUG_MODE
 #define VP_TEMPLATE_DEBUG_MODE 0
@@ -176,7 +176,7 @@ displayDependancies( std::ostream& os,const int depth,
   return os;
 }
 
-
+} // namespace dynamicgraph
 
 #endif /* #ifndef __TIME_DEPENDANCY_TCPP */
 
diff --git a/unitTesting/test_depend.cpp b/unitTesting/test_depend.cpp
index 6f0bb2853936d99ff4687a516d4c5c078718ee39..13d2e54575a4ef92454eae12f512f69dfc0d6657 100644
--- a/unitTesting/test_depend.cpp
+++ b/unitTesting/test_depend.cpp
@@ -30,7 +30,7 @@
 #include <string>
 
 using namespace std;
-
+using namespace dynamicgraph;