diff --git a/eflxx/include/eflxx/Common.h b/eflxx/include/eflxx/Common.h
index 07136aa..3d250a3 100644
--- a/eflxx/include/eflxx/Common.h
+++ b/eflxx/include/eflxx/Common.h
@@ -1,21 +1,19 @@
 #ifndef EFL_COMMON_H
 #define EFL_COMMON_H
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
+// local
 #include "System.h"
 #include "DebugInternal.h"
+
+// SIGC
 #include <sigc++/sigc++.h>
-#include <iostream>
+
+// STD
+#include <istd::ostream>
 
 /* EFL */
 #include <Evas.h>
 
-using std::ostream;
-using std::istream;
-
 namespace Eflxx {
 
 typedef sigc::signal<void> Signal;
@@ -136,19 +134,19 @@ class Color
         int _a;
 };
 
-inline ostream& operator<<( ostream& s, const Color& color )
+inline std::ostream& operator<<( ostream& s, const Color& color )
 {
     return s << "(RGBA " << color.red() << "," << color.green() << "," << color.blue() << "," << color.alpha() << ")";
 }
-inline ostream& operator<<( ostream& s, const Point& point )
+inline std::ostream& operator<<( ostream& s, const Point& point )
 {
     return s << "(" << point.x() << "," << point.y() << ")";
 }
-inline ostream& operator<<( ostream& s, const Size& size )
+inline std::ostream& operator<<( ostream& s, const Size& size )
 {
     return s << "(" << size.width() << "*" << size.height() << ")";
 }
-inline ostream& operator<<( ostream& s, const Rect& rect )
+inline std::ostream& operator<<( ostream& s, const Rect& rect )
 {
     return s << "(" << rect.x() << "," << rect.y() << "*" << rect.width() << "," << rect.height() << ")";
 }
diff --git a/eflxx/include/eflxx/Debug.h b/eflxx/include/eflxx/Debug.h
index 65c8f32..18e4534 100644
--- a/eflxx/include/eflxx/Debug.h
+++ b/eflxx/include/eflxx/Debug.h
@@ -1,10 +1,6 @@
 #ifndef EFL_DEBUG_H
 #define EFL_DEBUG_H
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
 #ifdef CWDEBUG
 #include <libcwd/libraries_debug.h>
 
diff --git a/eflxx/include/eflxx/DebugInternal.h b/eflxx/include/eflxx/DebugInternal.h
index fee1554..8e683ec 100644
--- a/eflxx/include/eflxx/DebugInternal.h
+++ b/eflxx/include/eflxx/DebugInternal.h
@@ -1,10 +1,6 @@
 #ifndef EFL_DEBUG_INTERNAL_H
 #define EFL_DEBUG_INTERNAL_H
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
 #ifndef CWDEBUG
 
 #include <iostream>     // std::cerr
diff --git a/eflxx/include/eflxx/System.h b/eflxx/include/eflxx/System.h
index af1cfe3..6f9ec47 100644
--- a/eflxx/include/eflxx/System.h
+++ b/eflxx/include/eflxx/System.h
@@ -1,9 +1,5 @@
 #ifdef CWDEBUG
 
-#ifdef HAVE_CONFIG_H
-  #include <config.h>
-#endif
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif