s/struct dom_string/dom_string/g

svn path=/trunk/libdom/; revision=12172

12 files changed, 121 insertions, 123 deletions

diff --git a/include/dom/events/custom_event.h b/include/dom/events/custom_event.h
index cb97732..a5bc2f6 100644
--- a/include/dom/events/custom_event.h
+++ b/include/dom/events/custom_event.h
@@ -10,8 +10,7 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
-
-struct dom_string;
+#include <dom/core/string.h>
 
 typedef struct dom_custom_event dom_custom_event;
 
@@ -22,11 +21,11 @@ dom_exception _dom_custom_event_get_detail(dom_custom_event *evt,
 		(void **) (d))
 
 dom_exception _dom_custom_event_init_ns(dom_custom_event *evt, 
-		struct dom_string *namespace, struct dom_string *type,
+		dom_string *namespace, dom_string *type,
 		bool bubble, bool cancelable, void *detail);
 #define dom_custom_event_init_ns(e, n, t, b, c, d) \
 		_dom_custom_event_init_ns((dom_custom_event *) (e), \
-		(struct dom_string *) (n), (struct dom_string *) (t), \
+		(dom_string *) (n), (dom_string *) (t), \
 		(bool) (b), (bool) (c), (void *) (d))
 
 #endif
diff --git a/include/dom/events/document_event.h b/include/dom/events/document_event.h
index be0646f..bbb9f83 100644
--- a/include/dom/events/document_event.h
+++ b/include/dom/events/document_event.h
@@ -11,8 +11,8 @@
 #include <stdbool.h>
 
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 
-struct dom_string;
 struct dom_event;
 struct dom_document;
 struct lwc_string_s;
@@ -84,17 +84,17 @@ typedef dom_default_action_callback (*dom_events_default_action_fetcher)
 		void **pw);
 
 dom_exception _dom_document_event_create_event(dom_document_event *de,
-		struct dom_string *type, struct dom_event **evt);
+		dom_string *type, struct dom_event **evt);
 #define dom_document_event_create_event(d, t, e) \
 		_dom_document_event_create_event((dom_document_event *) (d), \
-		(struct dom_string *) (t), (struct dom_event **) (e))
+		(dom_string *) (t), (struct dom_event **) (e))
 
 dom_exception _dom_document_event_can_dispatch(dom_document_event *de,
-		struct dom_string *namespace, struct dom_string *type,
+		dom_string *namespace, dom_string *type,
 		bool* can);
 #define dom_document_event_can_dispatch(d, n, t, c) \
 		_dom_document_event_can_dispatch((dom_document_event *) (d), \
-		(struct dom_string *) (n), (struct dom_string *) (t),\
+		(dom_string *) (n), (dom_string *) (t),\
 		(bool *) (c))
 
 #endif
diff --git a/include/dom/events/event.h b/include/dom/events/event.h
index df50f2e..73e7ec0 100644
--- a/include/dom/events/event.h
+++ b/include/dom/events/event.h
@@ -10,10 +10,9 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 #include <dom/events/event_target.h>
 
-struct dom_string;
-
 typedef enum {
 	DOM_CAPTURING_PHASE = 1,
 	DOM_AT_TARGET       = 2,
@@ -28,9 +27,9 @@ void _dom_event_ref(dom_event *evt);
 void _dom_event_unref(dom_event *evt);
 #define dom_event_unref(n) _dom_event_unref((dom_event *) (n))
 
-dom_exception _dom_event_get_type(dom_event *evt, struct dom_string **type);
+dom_exception _dom_event_get_type(dom_event *evt, dom_string **type);
 #define dom_event_get_type(e, t) _dom_event_get_type((dom_event *) (e), \
-		(struct dom_string **) (t))
+		(dom_string **) (t))
 
 dom_exception _dom_event_get_target(dom_event *evt, dom_event_target **target);
 #define dom_event_get_target(e, t) _dom_event_get_target((dom_event *) (e), \
@@ -62,15 +61,15 @@ dom_exception _dom_event_prevent_default(dom_event *evt);
 #define dom_event_prevent_default(e) _dom_event_prevent_default(\
 		(dom_event *) (e))
 
-dom_exception _dom_event_init(dom_event *evt, struct dom_string *type, 
+dom_exception _dom_event_init(dom_event *evt, dom_string *type, 
 		bool bubble, bool cancelable);
 #define dom_event_init(e, t, b, c) _dom_event_init((dom_event *) (e), \
-		(struct dom_string *) (t), (bool) (b), (bool) (c))
+		(dom_string *) (t), (bool) (b), (bool) (c))
 
 dom_exception _dom_event_get_namespace(dom_event *evt,
-		struct dom_string **namespace);
+		dom_string **namespace);
 #define dom_event_get_namespace(e, n) _dom_event_get_namespace(\
-		(dom_event *) (e), (struct dom_string **) (n))
+		(dom_event *) (e), (dom_string **) (n))
 
 dom_exception _dom_event_is_custom(dom_event *evt, bool *custom);
 #define dom_event_is_custom(e, c) _dom_event_is_custom((dom_event *) (e), \
@@ -84,10 +83,10 @@ dom_exception _dom_event_is_default_prevented(dom_event *evt, bool *prevented);
 #define dom_event_is_default_prevented(e, p) \
 		_dom_event_is_default_prevented((dom_event *) (e), (bool *) (p))
 
-dom_exception _dom_event_init_ns(dom_event *evt, struct dom_string *namespace,
-		struct dom_string *type, bool bubble, bool cancelable);
+dom_exception _dom_event_init_ns(dom_event *evt, dom_string *namespace,
+		dom_string *type, bool bubble, bool cancelable);
 #define dom_event_init_ns(e, n, t, b, c) _dom_event_init_ns( \
-		(dom_event *) (e), (struct dom_string *) (n), \
-		(struct dom_string *) (t), (bool) (b), (bool) (c))
+		(dom_event *) (e), (dom_string *) (n), \
+		(dom_string *) (t), (bool) (b), (bool) (c))
 
 #endif
diff --git a/include/dom/events/event_target.h b/include/dom/events/event_target.h
index bf3233e..51226ed 100644
--- a/include/dom/events/event_target.h
+++ b/include/dom/events/event_target.h
@@ -10,8 +10,8 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 
-struct dom_string;
 struct dom_event_listener;
 struct dom_event;
 struct dom_node_internal;
@@ -19,19 +19,19 @@ struct dom_node_internal;
 typedef struct dom_node_internal dom_event_target;
 
 dom_exception _dom_event_target_add_event_listener(dom_event_target *et,
-		struct dom_string *type, struct dom_event_listener *listener, 
+		dom_string *type, struct dom_event_listener *listener, 
 		bool capture);
 #define dom_event_target_add_event_listener(et, t, l, c) \
 		_dom_event_target_add_event_listener((dom_event_target *) (et),\
-		(struct dom_string *) (t), (struct dom_event_listener *) (l), \
+		(dom_string *) (t), (struct dom_event_listener *) (l), \
 		(bool) (c))
 
 dom_exception _dom_event_target_remove_event_listener(dom_event_target *et,
-		struct dom_string *type, struct dom_event_listener *listener, 
+		dom_string *type, struct dom_event_listener *listener, 
 		bool capture);
 #define dom_event_target_remove_event_listener(et, t, l, c) \
 		_dom_event_target_remove_event_listener(\
-		(dom_event_target *) (et), (struct dom_string *) (t),\
+		(dom_event_target *) (et), (dom_string *) (t),\
 		(struct dom_event_listener *) (l), (bool) (c))
 
 dom_exception _dom_event_target_dispatch_event(dom_event_target *et,
@@ -41,21 +41,21 @@ dom_exception _dom_event_target_dispatch_event(dom_event_target *et,
 		(struct dom_event *) (e), (bool *) (s))
 
 dom_exception _dom_event_target_add_event_listener_ns(dom_event_target *et,
-		struct dom_string *namespace, struct dom_string *type, 
+		dom_string *namespace, dom_string *type, 
 		struct dom_event_listener *listener, bool capture);
 #define dom_event_target_add_event_listener_ns(et, n, t, l, c) \
 		_dom_event_target_add_event_listener_ns(\
-		(dom_event_target *) (et), (struct dom_string *) (n),\
-		(struct dom_string *) (t), (struct dom_event_listener *) (l),\
+		(dom_event_target *) (et), (dom_string *) (n),\
+		(dom_string *) (t), (struct dom_event_listener *) (l),\
 		(bool) (c))
 
 dom_exception _dom_event_target_remove_event_listener_ns(dom_event_target *et,
-		struct dom_string *namespace, struct dom_string *type, 
+		dom_string *namespace, dom_string *type, 
 		struct dom_event_listener *listener, bool capture);
 #define dom_event_target_remove_event_listener_ns(et, n, t, l, c) \
 		_dom_event_target_remove_event_listener_ns(\
-		(dom_event_target *) (et), (struct dom_string *) (n),\
-		(struct dom_string *) (t), (struct dom_event_listener *) (l),\
+		(dom_event_target *) (et), (dom_string *) (n),\
+		(dom_string *) (t), (struct dom_event_listener *) (l),\
 		(bool) (c))
 
 #endif
diff --git a/include/dom/events/keyboard_event.h b/include/dom/events/keyboard_event.h
index bbac4a1..132049e 100644
--- a/include/dom/events/keyboard_event.h
+++ b/include/dom/events/keyboard_event.h
@@ -10,8 +10,8 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 
-struct dom_string;
 struct dom_abstract_view;
 
 typedef struct dom_keyboard_event dom_keyboard_event;
@@ -24,10 +24,10 @@ typedef enum {
 } dom_key_location;
 
 dom_exception _dom_keyboard_event_get_key_identifier(dom_keyboard_event *evt,
-		struct dom_string **ident);
+		dom_string **ident);
 #define dom_keyboard_event_get_key_identifier(e, i) \
 		_dom_keyboard_event_get_key_identifier( \
-		(dom_keyboard_event *) (e), (struct dom_string **) (i))
+		(dom_keyboard_event *) (e), (dom_string **) (i))
 
 dom_exception _dom_keyboard_event_get_key_location(dom_keyboard_event *evt,
 		dom_key_location *loc);
@@ -57,33 +57,33 @@ dom_exception _dom_keyboard_event_get_meta_key(dom_keyboard_event *evt,
 		(dom_keyboard_event *) (e), (bool *) (k))
 
 dom_exception _dom_keyboard_event_get_modifier_state(dom_keyboard_event *evt,
-		struct dom_string *m, bool *state);
+		dom_string *m, bool *state);
 #define dom_keyboard_event_get_modifier_state(e, m, s) \
 		_dom_keyboard_event_get_modifier_state( \
-		(dom_keyboard_event *) (e), (struct dom_string *) (m),\
+		(dom_keyboard_event *) (e), (dom_string *) (m),\
 		(bool *) (s))
 
 dom_exception _dom_keyboard_event_init(dom_keyboard_event *evt, 
-		struct dom_string *type, bool bubble, bool cancelable, 
-		struct dom_abstract_view *view, struct dom_string *key_ident,
-		dom_key_location key_loc, struct dom_string *modifier_list);
+		dom_string *type, bool bubble, bool cancelable, 
+		struct dom_abstract_view *view, dom_string *key_ident,
+		dom_key_location key_loc, dom_string *modifier_list);
 #define dom_keyboard_event_init(e, t, b, c, v, ki, kl, m) \
 		_dom_keyboard_event_init((dom_keyboard_event *) (e), \
-		(struct dom_string *) (t), (bool) (b), (bool) (c), \
-		(struct dom_abstract_view *) (v), (struct dom_string *) (ki), \
-		(dom_key_location) (kl), (struct dom_string *) (m))
+		(dom_string *) (t), (bool) (b), (bool) (c), \
+		(struct dom_abstract_view *) (v), (dom_string *) (ki), \
+		(dom_key_location) (kl), (dom_string *) (m))
 
 dom_exception _dom_keyboard_event_init_ns(dom_keyboard_event *evt, 
-		struct dom_string *namespace, struct dom_string *type,
+		dom_string *namespace, dom_string *type,
 		bool bubble, bool cancelable, struct dom_abstract_view *view,
-		struct dom_string *key_ident, dom_key_location key_loc,
-		struct dom_string *modifier_list);
+		dom_string *key_ident, dom_key_location key_loc,
+		dom_string *modifier_list);
 #define dom_keyboard_event_init_ns(e, n, t, b, c, v, ki, kl, m) \
 		_dom_keyboard_event_init_ns((dom_keyboard_event *) (e), \
-		(struct dom_string *) (n), (struct dom_string *) (t), \
+		(dom_string *) (n), (dom_string *) (t), \
 		(bool) (b), (bool) (c), (struct dom_abstract_view *) (v), \
-		(struct dom_string *) (ki), (dom_key_location) (kl), \
-		(struct dom_string *) (m)) 
+		(dom_string *) (ki), (dom_key_location) (kl), \
+		(dom_string *) (m)) 
 
 #endif
 
diff --git a/include/dom/events/mouse_event.h b/include/dom/events/mouse_event.h
index c153dd8..8212c72 100644
--- a/include/dom/events/mouse_event.h
+++ b/include/dom/events/mouse_event.h
@@ -10,9 +10,9 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 #include <dom/events/event_target.h>
 
-struct dom_string;
 struct dom_abstract_view;
 
 typedef struct dom_mouse_event dom_mouse_event;
@@ -69,13 +69,13 @@ dom_exception _dom_mouse_event_get_related_target(dom_mouse_event *evt,
 		(dom_event_target **) (t))
 
 dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt,
-		struct dom_string *m, bool *state);
+		dom_string *m, bool *state);
 #define dom_mouse_event_get_modifier_state(e, m, s) \
 		_dom_mouse_event_get_modifier_state((dom_mouse_event *) (e), \
-		(struct dom_string *) (m), (bool *) (s))
+		(dom_string *) (m), (bool *) (s))
 
 dom_exception _dom_mouse_event_init(dom_mouse_event *evt, 
-		struct dom_string *type, bool bubble, bool cancelable, 
+		dom_string *type, bool bubble, bool cancelable, 
 		struct dom_abstract_view *view, long detail, long screen_x,
 		long screen_y, long client_x, long client_y, bool ctrl,
 		bool alt, bool shift, bool meta, unsigned short button,
@@ -83,14 +83,14 @@ dom_exception _dom_mouse_event_init(dom_mouse_event *evt,
 #define dom_mouse_event_init(e, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt, \
 		shift, meta, button, et) \
 		_dom_mouse_event_init((dom_mouse_event *) (e), \
-		(struct dom_string *) (t), (bool) (b), (bool) (c),\
+		(dom_string *) (t), (bool) (b), (bool) (c),\
 		(struct dom_abstract_view *) (v), (long) (d), (long) (sx), \
 		(long) (sy), (long) (cx), (long) (cy), (bool) (ctrl),\
 		(bool) (alt), (bool) (shift), (bool) (meta), \
 		(unsigned short) (button), (dom_event_target *) (et))
 
 dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt,
-		struct dom_string *namespace, struct dom_string *type,
+		dom_string *namespace, dom_string *type,
 		bool bubble, bool cancelable, struct dom_abstract_view *view,
 		long detail, long screen_x, long screen_y, long client_x,
 		long client_y, bool ctrl, bool alt, bool shift, bool meta,
@@ -98,7 +98,7 @@ dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt,
 #define dom_mouse_event_init_ns(e, n, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt,\
 		shift, meta, button, et) \
 		_dom_mouse_event_init_ns((dom_mouse_event *) (e), \
-		(struct dom_string *) (n), (struct dom_string *) (t),\
+		(dom_string *) (n), (dom_string *) (t),\
 		(bool) (b), (bool) (c), (struct dom_abstract_view *) (v),\
 		(long) (d), (long) (sx), (long) (sy), (long) (cx),\
 		(long) (cy), (bool) (ctrl), (bool) (alt), (bool) (shift),\
diff --git a/include/dom/events/mouse_multi_wheel_event.h b/include/dom/events/mouse_multi_wheel_event.h
index 7bb85ff..8d2a4eb 100644
--- a/include/dom/events/mouse_multi_wheel_event.h
+++ b/include/dom/events/mouse_multi_wheel_event.h
@@ -10,9 +10,9 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 #include <dom/events/event_target.h>
 
-struct dom_string;
 struct dom_abstract_view;
 
 typedef struct dom_mouse_multi_wheel_event dom_mouse_multi_wheel_event;
@@ -36,21 +36,21 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z(
 		(dom_mouse_multi_wheel_event *) (e), (long *) (z))
 
 dom_exception _dom_mouse_multi_wheel_event_init_ns(
-		dom_mouse_multi_wheel_event *evt, struct dom_string *namespace,
-		struct dom_string *type,  bool bubble, bool cancelable,
+		dom_mouse_multi_wheel_event *evt, dom_string *namespace,
+		dom_string *type,  bool bubble, bool cancelable,
 		struct dom_abstract_view *view, long detail, long screen_x,
 		long screen_y, long client_x, long client_y,
 		unsigned short button, dom_event_target *et,
-		struct dom_string *modifier_list, long wheel_delta_x,
+		dom_string *modifier_list, long wheel_delta_x,
 		long wheel_delta_y, long wheel_delta_z);
 #define dom_mouse_multi_wheel_event_init_ns(e, n, t, b, c, v, \
 		d, sx, sy, cx, cy, button, et, ml, x, y, z) \
 		_dom_mouse_multi_wheel_event_init_ns( \
-		(dom_mouse_multi_wheel_event *) (e), (struct dom_string *) (n),\
-		(struct dom_string *) (t), (bool) (b), (bool) (c), \
+		(dom_mouse_multi_wheel_event *) (e), (dom_string *) (n),\
+		(dom_string *) (t), (bool) (b), (bool) (c), \
 		(struct dom_abstract_view *) (v), (long) (d), (long) (sx), \
 		(long) (sy), (long) (cx), (long) (cy),\
 		(unsigned short) (button), (dom_event_target *) (et),\
-		(struct dom_string *) (ml), (long) (x), (long) (y), (long) (z))
+		(dom_string *) (ml), (long) (x), (long) (y), (long) (z))
 
 #endif
diff --git a/include/dom/events/mouse_wheel_event.h b/include/dom/events/mouse_wheel_event.h
index 5f1e83c..34f5e75 100644
--- a/include/dom/events/mouse_wheel_event.h
+++ b/include/dom/events/mouse_wheel_event.h
@@ -9,9 +9,9 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 #include <dom/events/event_target.h>
 
-struct dom_string;
 struct dom_abstract_view;
 
 typedef struct dom_mouse_wheel_event dom_mouse_wheel_event;
@@ -23,20 +23,20 @@ dom_exception _dom_mouse_wheel_event_get_wheel_delta(
 		(dom_mouse_wheel_event *) (e), (long *) (d))
 
 dom_exception _dom_mouse_wheel_event_init_ns(
-		dom_mouse_wheel_event *evt, struct dom_string *namespace,
-		struct dom_string *type,  bool bubble, bool cancelable,
+		dom_mouse_wheel_event *evt, dom_string *namespace,
+		dom_string *type,  bool bubble, bool cancelable,
 		struct dom_abstract_view *view, long detail, long screen_x,
 		long screen_y, long client_x, long client_y,
 		unsigned short button, dom_event_target *et,
-		struct dom_string *modifier_list, long wheel_delta);
+		dom_string *modifier_list, long wheel_delta);
 #define dom_mouse_wheel_event_init_ns(e, n, t, b, c, v, \
 		d, sx, sy, cx, cy, button, et, ml, dt) \
 		_dom_mouse_wheel_event_init_ns((dom_mouse_wheel_event *) (e), \
-		(struct dom_string *) (n), (struct dom_string *) (t), \
+		(dom_string *) (n), (dom_string *) (t), \
 		(bool) (b), (bool) (c), (struct dom_abstract_view *) (v),\
 		(long) (d), (long) (sx), (long) (sy), (long) (cx), (long) (cy),\
 		(unsigned short) (button), (dom_event_target *) (et),\
-		(struct dom_string *) (ml), (long) (dt))
+		(dom_string *) (ml), (long) (dt))
 
 #endif
 
diff --git a/include/dom/events/mutation_event.h b/include/dom/events/mutation_event.h
index 9dc3fdd..80a8b46 100644
--- a/include/dom/events/mutation_event.h
+++ b/include/dom/events/mutation_event.h
@@ -10,8 +10,8 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 
-struct dom_string;
 struct dom_node;
 
 typedef enum {
@@ -29,22 +29,22 @@ dom_exception _dom_mutation_event_get_related_node(dom_mutation_event *evt,
 		(dom_mutation_event *) (e), (struct dom_node **) (n))
 
 dom_exception _dom_mutation_event_get_prev_value(dom_mutation_event *evt,
-		struct dom_string **ret);
+		dom_string **ret);
 #define dom_mutation_event_get_prev_value(e, r) \
 		_dom_mutation_event_get_prev_value((dom_mutation_event *) (e), \
-		(struct dom_string **) (r))
+		(dom_string **) (r))
 
 dom_exception _dom_mutation_event_get_new_value(dom_mutation_event *evt,
-		struct dom_string **ret);
+		dom_string **ret);
 #define dom_mutation_event_get_new_value(e, r) \
 		_dom_mutation_event_get_new_value((dom_mutation_event *) (e), \
-		(struct dom_string **) (r))
+		(dom_string **) (r))
 
 dom_exception _dom_mutation_event_get_attr_name(dom_mutation_event *evt,
-		struct dom_string **ret);
+		dom_string **ret);
 #define dom_mutation_event_get_attr_name(e, r) \
 		_dom_mutation_event_get_attr_name((dom_mutation_event *) (e), \
-		(struct dom_string **) (r))
+		(dom_string **) (r))
 
 dom_exception _dom_mutation_event_get_attr_change(dom_mutation_event *evt,
 		dom_mutation_type *type);
@@ -53,28 +53,28 @@ dom_exception _dom_mutation_event_get_attr_change(dom_mutation_event *evt,
 		(dom_mutation_type *) (t))
 
 dom_exception _dom_mutation_event_init(dom_mutation_event *evt, 
-		struct dom_string *type, bool bubble, bool cancelable,
-		struct dom_node *node, struct dom_string *prev_value,
-		struct dom_string *new_value, struct dom_string *attr_name,
+		dom_string *type, bool bubble, bool cancelable,
+		struct dom_node *node, dom_string *prev_value,
+		dom_string *new_value, dom_string *attr_name,
 		dom_mutation_type change);
 #define dom_mutation_event_init(e, t, b, c, n, p, nv, a, ch) \
 		_dom_mutation_event_init((dom_mutation_event *) (e), \
-		(struct dom_string *) (t), (bool) (b), (bool) (c), \
-		(struct dom_node *) (n), (struct dom_string *) (p), \
-		(struct dom_string *) (nv), (struct dom_string *) (a), \
+		(dom_string *) (t), (bool) (b), (bool) (c), \
+		(struct dom_node *) (n), (dom_string *) (p), \
+		(dom_string *) (nv), (dom_string *) (a), \
 		(dom_mutation_type) (ch))
 
 dom_exception _dom_mutation_event_init_ns(dom_mutation_event *evt,
-		struct dom_string *namespace, struct dom_string *type,
+		dom_string *namespace, dom_string *type,
 		bool bubble, bool cancelable, struct dom_node *node,
-		struct dom_string *prev_value, struct dom_string *new_value,
-		struct dom_string *attr_name, dom_mutation_type change);
+		dom_string *prev_value, dom_string *new_value,
+		dom_string *attr_name, dom_mutation_type change);
 #define dom_mutation_event_init_ns(e, n, t, b, c, nd, p, nv, a, ch) \
 		_dom_mutation_event_init_ns((dom_mutation_event *) (e), \
-		(struct dom_string *) (n), (struct dom_string *) (t),\
+		(dom_string *) (n), (dom_string *) (t),\
 		(bool) (b), (bool) (c), (struct dom_node *) (nd), \
-		(struct dom_string *) (p), (struct dom_string *) (nv),\
-		(struct dom_string *) (a), (dom_mutation_type) (ch))
+		(dom_string *) (p), (dom_string *) (nv),\
+		(dom_string *) (a), (dom_mutation_type) (ch))
 
 #endif
 
diff --git a/include/dom/events/mutation_name_event.h b/include/dom/events/mutation_name_event.h
index 13d27a4..e0325d7 100644
--- a/include/dom/events/mutation_name_event.h
+++ b/include/dom/events/mutation_name_event.h
@@ -10,44 +10,44 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 
-struct dom_string;
 struct dom_node;
 
 typedef struct dom_mutation_name_event dom_mutation_name_event;
 
 dom_exception _dom_mutation_name_event_get_prev_namespace(
-		dom_mutation_name_event *evt, struct dom_string **namespace);
+		dom_mutation_name_event *evt, dom_string **namespace);
 #define dom_mutation_name_event_get_prev_namespace(e, n) \
 		_dom_mutation_name_event_get_prev_namespace(\
-		(dom_mutation_name_event *) (e), (struct dom_string **) (n))
+		(dom_mutation_name_event *) (e), (dom_string **) (n))
 
 dom_exception _dom_mutation_name_event_get_prev_node_name(
-		dom_mutation_name_event *evt, struct dom_string **name);
+		dom_mutation_name_event *evt, dom_string **name);
 #define dom_mutation_name_event_get_prev_node_name(e, n) \
 		_dom_mutation_name_event_get_prev_node_name(\
-		(dom_mutation_name_event *) (e), (struct dom_string **) (n))
+		(dom_mutation_name_event *) (e), (dom_string **) (n))
 
 dom_exception _dom_mutation_name_event_init(dom_mutation_name_event *evt, 
-		struct dom_string *type, bool bubble, bool cancelable,
-		struct dom_node *node, struct dom_string *prev_ns,
-		struct dom_string *prev_name); 
+		dom_string *type, bool bubble, bool cancelable,
+		struct dom_node *node, dom_string *prev_ns,
+		dom_string *prev_name); 
 #define dom_mutation_name_event_init(e, t, b, c, n, p, pn) \
 		_dom_mutation_name_event_init((dom_mutation_name_event *) (e), \
-		(struct dom_string *) (t), (bool) (b), (bool) (c), \
-		(struct dom_node *) (n), (struct dom_string *) (p), \
-		(struct dom_string *) (pn))
+		(dom_string *) (t), (bool) (b), (bool) (c), \
+		(struct dom_node *) (n), (dom_string *) (p), \
+		(dom_string *) (pn))
 
 dom_exception _dom_mutation_name_event_init_ns(dom_mutation_name_event *evt, 
-		struct dom_string *namespace, struct dom_string *type,
+		dom_string *namespace, dom_string *type,
 		bool bubble, bool cancelable, struct dom_node *node,
-		struct dom_string *prev_ns, struct dom_string *prev_name);
+		dom_string *prev_ns, dom_string *prev_name);
 #define dom_mutation_name_event_init_ns(e, n, t, b, c, nv, p, pn) \
 		_dom_mutation_name_event_init_ns(\
-		(dom_mutation_name_event *) (e), (struct dom_string *) (n),\
-		(struct dom_string *) (t), (bool) (b), (bool) (c),\
-		(struct dom_node *) (nv), (struct dom_string *) (p), \
-		(struct dom_string *) (pn))
+		(dom_mutation_name_event *) (e), (dom_string *) (n),\
+		(dom_string *) (t), (bool) (b), (bool) (c),\
+		(struct dom_node *) (nv), (dom_string *) (p), \
+		(dom_string *) (pn))
 
 #endif
 
diff --git a/include/dom/events/text_event.h b/include/dom/events/text_event.h
index cf040ce..5b5fe34 100644
--- a/include/dom/events/text_event.h
+++ b/include/dom/events/text_event.h
@@ -10,32 +10,32 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 
 struct dom_abstract_view;
-struct dom_string;
 
 typedef struct dom_text_event dom_text_event;
 
 dom_exception _dom_text_event_get_data(dom_text_event *evt, 
-		struct dom_string **data);
+		dom_string **data);
 #define dom_text_event_get_data(e, d) _dom_text_event_get_data(\
-		(dom_text_event *) (e), (struct dom_string **) (d))
+		(dom_text_event *) (e), (dom_string **) (d))
 
 dom_exception _dom_text_event_init(dom_text_event *evt, 
-		struct dom_string *type, bool bubble, bool cancelable,
-		struct dom_abstract_view *view, struct dom_string *data);
+		dom_string *type, bool bubble, bool cancelable,
+		struct dom_abstract_view *view, dom_string *data);
 #define dom_text_event_init(e, t, b, c, v, d) _dom_text_event_init( \
-		(dom_text_event *) (e), (struct dom_string *) (t), (bool) (b), \
+		(dom_text_event *) (e), (dom_string *) (t), (bool) (b), \
 		(bool) (c), (struct dom_abstract_view *) (v),\
-		(struct dom_string *) (d))
+		(dom_string *) (d))
 
 dom_exception _dom_text_event_init_ns(dom_text_event *evt, 
-		struct dom_string *namespace, struct dom_string *type,
+		dom_string *namespace, dom_string *type,
 		bool bubble, bool cancelable, struct dom_abstract_view *view,
-		struct dom_string *data);
+		dom_string *data);
 #define dom_text_event_init_ns(e, n, t, b, c, v, d) _dom_text_event_init_ns( \
-		(dom_text_event *) (e), (struct dom_string *) (n), \
-		(struct dom_string *) (t), (bool) (b), (bool) (c), \
-		(struct dom_abstract_view *) (v), (struct dom_string *) (d))
+		(dom_text_event *) (e), (dom_string *) (n), \
+		(dom_string *) (t), (bool) (b), (bool) (c), \
+		(struct dom_abstract_view *) (v), (dom_string *) (d))
 
 #endif
diff --git a/include/dom/events/ui_event.h b/include/dom/events/ui_event.h
index eaded99..da321e5 100644
--- a/include/dom/events/ui_event.h
+++ b/include/dom/events/ui_event.h
@@ -10,8 +10,8 @@
 
 #include <stdbool.h>
 #include <dom/core/exceptions.h>
+#include <dom/core/string.h>
 
-struct dom_string;
 struct dom_abstract_view;
 
 typedef struct dom_ui_event dom_ui_event;
@@ -26,20 +26,20 @@ dom_exception _dom_ui_event_get_detail(dom_ui_event *evt,
 #define dom_ui_event_get_detail(e, d) _dom_ui_event_get_detail(\
 		(dom_ui_event *) (e), (long *) (d))
 
-dom_exception _dom_ui_event_init(dom_ui_event *evt, struct dom_string *type, 
+dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type, 
 		bool bubble, bool cancelable, struct dom_abstract_view *view,
 		long detail);
 #define dom_ui_event_init(e, t, b, c, v, d) _dom_ui_event_init( \
-		(dom_ui_event *) (e), (struct dom_string *) (t), (bool) (b), \
+		(dom_ui_event *) (e), (dom_string *) (t), (bool) (b), \
 		(bool) (c), (struct dom_abstract_view *) (v), (long) (d))
 
 dom_exception _dom_ui_event_init_ns(dom_ui_event *evt,
-		struct dom_string *namespace, struct dom_string *type,
+		dom_string *namespace, dom_string *type,
 		bool bubble, bool cancelable, struct dom_abstract_view *view,
 		long detail);
 #define dom_ui_event_init_ns(e, n, t, b, c, v, d) _dom_ui_event_init_ns( \
-		(dom_ui_event *) (e), (struct dom_string *) (n), \
-		(struct dom_string *) (t), (bool) (b), (bool) (c), \
+		(dom_ui_event *) (e), (dom_string *) (n), \
+		(dom_string *) (t), (bool) (b), (bool) (c), \
 		(struct dom_abstract_view *) (v), (long) (d))
 
 #endif