diff --git a/src/bindings/eina_cxx/Eina.hh b/src/bindings/eina_cxx/Eina.hh
index 4e7f7c5ad9..c1d755f9b7 100644
--- a/src/bindings/eina_cxx/Eina.hh
+++ b/src/bindings/eina_cxx/Eina.hh
@@ -1,12 +1,5 @@
 #ifndef EINA_HH_
 #define EINA_HH_
-
-#if defined ( EFL_CXX_NO_EXCEPTIONS )
-# define EFL_CXX_THROW(x)    std::abort()
-#else
-# define EFL_CXX_THROW(x)    throw (x)
-#endif
-
 /**
  * @file
  * @brief Eina C++
diff --git a/src/bindings/eina_cxx/eina_accessor.hh b/src/bindings/eina_cxx/eina_accessor.hh
index 5d9a9c3312..98be3afd1b 100644
--- a/src/bindings/eina_cxx/eina_accessor.hh
+++ b/src/bindings/eina_cxx/eina_accessor.hh
@@ -3,6 +3,7 @@
 
 #include <Eina.h>
 #include <eina_error.hh>
+#include <eina_throw.hh>
 
 #include <memory>
 #include <iterator>
diff --git a/src/bindings/eina_cxx/eina_error.hh b/src/bindings/eina_cxx/eina_error.hh
index 9acfe26a98..24e41a8223 100644
--- a/src/bindings/eina_cxx/eina_error.hh
+++ b/src/bindings/eina_cxx/eina_error.hh
@@ -3,6 +3,8 @@
 
 #include <Eina.h>
 
+#include <eina_throw.hh>
+
 #include <system_error>
 
 /**
diff --git a/src/bindings/eina_cxx/eina_ptrarray.hh b/src/bindings/eina_cxx/eina_ptrarray.hh
index ecb4f97878..9121de50e2 100644
--- a/src/bindings/eina_cxx/eina_ptrarray.hh
+++ b/src/bindings/eina_cxx/eina_ptrarray.hh
@@ -5,6 +5,7 @@
 #include <eina_clone_allocators.hh>
 #include <eina_type_traits.hh>
 #include <eina_range_types.hh>
+#include <eina_throw.hh>
 
 #include <memory>
 #include <iterator>
diff --git a/src/bindings/eina_cxx/eina_ptrlist.hh b/src/bindings/eina_cxx/eina_ptrlist.hh
index 00a59a57d5..d6bc9dc7ed 100644
--- a/src/bindings/eina_cxx/eina_ptrlist.hh
+++ b/src/bindings/eina_cxx/eina_ptrlist.hh
@@ -8,6 +8,7 @@
 #include <eina_accessor.hh>
 #include <eina_eo_base_fwd.hh>
 #include <eina_iterator.hh>
+#include <eina_throw.hh>
 
 #include <memory>
 #include <iterator>
diff --git a/src/bindings/eina_cxx/eina_stringshare.hh b/src/bindings/eina_cxx/eina_stringshare.hh
index ffdde73117..9c93b78606 100644
--- a/src/bindings/eina_cxx/eina_stringshare.hh
+++ b/src/bindings/eina_cxx/eina_stringshare.hh
@@ -3,6 +3,7 @@
 
 #include <Eina.h>
 #include <eina_type_traits.hh>
+#include <eina_throw.hh>
 
 #include <cstring>
 #include <stdexcept>
diff --git a/src/bindings/eina_cxx/eina_thread.hh b/src/bindings/eina_cxx/eina_thread.hh
index ad851ba526..f12c57777c 100644
--- a/src/bindings/eina_cxx/eina_thread.hh
+++ b/src/bindings/eina_cxx/eina_thread.hh
@@ -3,6 +3,7 @@
 
 #include <Eina.h>
 #include <eina_error.hh>
+#include <eina_throw.hh>
 
 #include <memory>
 #include <iterator>
diff --git a/src/bindings/eina_cxx/eina_throw.hh b/src/bindings/eina_cxx/eina_throw.hh
new file mode 100644
index 0000000000..3eb382b98a
--- /dev/null
+++ b/src/bindings/eina_cxx/eina_throw.hh
@@ -0,0 +1,9 @@
+#ifndef EFL_CXX_THROW
+
+#ifdef EFL_CXX_NO_EXCEPTIONS
+# define EFL_CXX_THROW(x)    std::abort()
+#else
+# define EFL_CXX_THROW(x)    throw x
+#endif
+
+#endif
diff --git a/src/bindings/eina_cxx/eina_value.hh b/src/bindings/eina_cxx/eina_value.hh
index f66d5f9a19..cc571916aa 100644
--- a/src/bindings/eina_cxx/eina_value.hh
+++ b/src/bindings/eina_cxx/eina_value.hh
@@ -5,6 +5,7 @@
 
 #include <eina_stringshare.hh>
 #include <eina_type_traits.hh>
+#include <eina_throw.hh>
 
 /**
  * @addtogroup Eina_Cxx_Data_Types_Group