Include atk-enum-types.h on atk.h

Also updating some atk includes to use atk.h

https://bugzilla.gnome.org/show_bug.cgi?id=652965

diff --git a/atk/atk.h b/atk/atk.h
index f686212..0febcf8 100755 (executable)
--- a/atk/atk.h
+++ b/atk/atk.h
@@ -27,6 +27,7 @@
 #include <atk/atkcomponent.h>
 #include <atk/atkdocument.h>
 #include <atk/atkeditabletext.h>
+#include <atk/atk-enum-types.h>
 #include <atk/atkgobjectaccessible.h>
 #include <atk/atkhyperlink.h>
 #include <atk/atkhyperlinkimpl.h>

diff --git a/atk/atkobject.c b/atk/atkobject.c
index cadf734..e034c91 100755 (executable)
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -32,7 +32,6 @@
 
 #include "atk.h"
 #include "atkmarshal.h"
-#include "atk-enum-types.h"
 #include "atkintl.h"
 
 /**

diff --git a/atk/atkrelation.c b/atk/atkrelation.c
index b6ba50f..835d30c 100755 (executable)
--- a/atk/atkrelation.c
+++ b/atk/atkrelation.c
@@ -19,9 +19,7 @@
 
 #include <string.h>
 #include <glib-object.h>
-#include "atkobject.h"
-#include "atkrelation.h"
-#include "atk-enum-types.h"
+#include "atk.h"
 
 /**
  * SECTION:atkrelation

diff --git a/atk/atkstate.c b/atk/atkstate.c
index cd9c5fe..581b641 100755 (executable)
--- a/atk/atkstate.c
+++ b/atk/atkstate.c
@@ -17,8 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "atkstate.h"
-#include "atk-enum-types.h"
+#include "atk.h"
 
 #include <string.h>
 

diff --git a/atk/atktext.c b/atk/atktext.c
index 309e4d7..b1ad02f 100755 (executable)
--- a/atk/atktext.c
+++ b/atk/atktext.c
@@ -17,9 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "atktext.h"
+#include "atk.h"
 #include "atkmarshal.h"
-#include "atk-enum-types.h"
 
 #include <string.h>