diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index dbfbf63326..2125b168a9 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -829,6 +829,23 @@ EAPI Eina_Bool eolian_state_all_eo_files_parse(Eolian_State *state);
  */
 EAPI Eina_Bool eolian_state_all_eot_files_parse(Eolian_State *state);
 
+/*
+ * @brief Perform additional checks on the state.
+ *
+ * This funciton performs additional checks that aren't crucial for the
+ * database integrity (that's checked as a part of the regular parse process,
+ * so the database is guaranteed to be valid), but are important for proper
+ * correctness. It is recommended that all available .eot and .eo files are
+ * parsed when running this.
+ *
+ * The set of available checks will expand over time.
+ *
+ * @return EINA_TRUE on success, EINA_FALSE otherwise.
+ *
+ * @ingroup Eolian
+ */
+EAPI Eina_Bool eolian_state_check(Eolian_State *state);
+
 /*
  * @brief Get an Eolian unit by file name.
  *
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index d9da402d90..ed7177a5c2 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -1106,6 +1106,12 @@ eolian_state_all_eo_files_parse(Eolian_State *state)
    return pd.ret;
 }
 
+EAPI Eina_Bool
+eolian_state_check(Eolian_State *state EINA_UNUSED)
+{
+   return EINA_TRUE;
+}
+
 EAPI const Eolian_Unit *
 eolian_state_unit_by_file_get(const Eolian_State *state, const char *file_name)
 {