From 4864ea4c70c46073b4b0281ca8c08a1ebd3e28d5 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sun, 18 Sep 2005 06:35:38 +0000
Subject: [PATCH] Remove eobj.h from E.h, include where needed.

SVN revision: 16749
---
 src/E.h        | 2 --
 src/buttons.h  | 2 ++
 src/coords.c   | 1 +
 src/desktops.c | 1 +
 src/desktops.h | 2 ++
 src/ecompmgr.c | 1 +
 src/ecompmgr.h | 2 ++
 src/edge.c     | 1 +
 src/eobj.c     | 1 +
 src/ewin-ops.c | 1 +
 src/ewins.c    | 1 +
 src/ewins.h    | 2 ++
 src/hiwin.c    | 1 +
 src/iconify.c  | 1 +
 src/ipc.c      | 1 +
 src/menus.c    | 1 +
 src/misc.c     | 1 +
 src/progress.c | 1 +
 src/slideout.c | 1 +
 src/stacking.c | 1 +
 src/startup.c  | 1 +
 src/tooltips.c | 1 +
 22 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/E.h b/src/E.h
index 2d22b48b..5177dac5 100644
--- a/src/E.h
+++ b/src/E.h
@@ -157,8 +157,6 @@ int                 Esnprintf(va_alist);
 #define N_(String) (String)
 #endif
 
-#include "eobj.h"
-
 #ifndef MAX
 #define MAX(a,b)  ((a)>(b)?(a):(b))
 #endif
diff --git a/src/buttons.h b/src/buttons.h
index 0f1f9be7..e175dc50 100644
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -25,6 +25,8 @@
 #ifndef _BUTTONS_H_
 #define _BUTTONS_H_
 
+#include "eobj.h"
+
 typedef struct _button Button;
 struct _desk;
 
diff --git a/src/coords.c b/src/coords.c
index 084bba6f..b0301b62 100644
--- a/src/coords.c
+++ b/src/coords.c
@@ -22,6 +22,7 @@
  */
 #include "E.h"
 #include "desktops.h"
+#include "eobj.h"
 #include "ewins.h"
 #include "xwin.h"
 
diff --git a/src/desktops.c b/src/desktops.c
index 9d8aa1e3..9de87f16 100644
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -25,6 +25,7 @@
 #include "buttons.h"
 #include "desktops.h"
 #include "emodule.h"
+#include "eobj.h"
 #include "ewins.h"
 #include "tooltips.h"
 #include "xwin.h"
diff --git a/src/desktops.h b/src/desktops.h
index 941ea802..03a9324f 100644
--- a/src/desktops.h
+++ b/src/desktops.h
@@ -25,6 +25,8 @@
 #ifndef _DESKTOPS_H_
 #define _DESKTOPS_H_
 
+#include "eobj.h"
+
 typedef struct _desk Desk;
 struct _button;
 
diff --git a/src/ecompmgr.c b/src/ecompmgr.c
index 4fa15377..2dbd19f9 100644
--- a/src/ecompmgr.c
+++ b/src/ecompmgr.c
@@ -32,6 +32,7 @@
 #include "desktops.h"
 #include "ecompmgr.h"
 #include "emodule.h"
+#include "eobj.h"
 #include "xwin.h"
 
 #include <stdlib.h>
diff --git a/src/ecompmgr.h b/src/ecompmgr.h
index 642a05cf..7cdc1d8c 100644
--- a/src/ecompmgr.h
+++ b/src/ecompmgr.h
@@ -25,6 +25,8 @@
 
 #if USE_COMPOSITE
 
+#include "eobj.h"
+
 typedef struct
 {
    char                enable;
diff --git a/src/edge.c b/src/edge.c
index 320fa9b0..16ad3c0e 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -23,6 +23,7 @@
  */
 #include "E.h"
 #include "desktops.h"
+#include "eobj.h"
 #include "ewins.h"
 #include "menus.h"		/* FIXME - Should not be here */
 #include "xwin.h"
diff --git a/src/eobj.c b/src/eobj.c
index eee375c4..430e5f8d 100644
--- a/src/eobj.c
+++ b/src/eobj.c
@@ -24,6 +24,7 @@
 #include "desktops.h"
 #include "ecompmgr.h"
 #include "ecore-e16.h"
+#include "eobj.h"
 #include "ewins.h"		/* FIXME - Should not be here */
 #include "xwin.h"
 
diff --git a/src/ewin-ops.c b/src/ewin-ops.c
index 2c454821..8b231d40 100644
--- a/src/ewin-ops.c
+++ b/src/ewin-ops.c
@@ -24,6 +24,7 @@
 #include "E.h"
 #include "desktops.h"
 #include "emodule.h"
+#include "eobj.h"
 #include "ewins.h"
 #include "ewin-ops.h"
 #include "snaps.h"
diff --git a/src/ewins.c b/src/ewins.c
index e3a67c60..451a23c8 100644
--- a/src/ewins.c
+++ b/src/ewins.c
@@ -25,6 +25,7 @@
 #include "desktops.h"
 #include "ecompmgr.h"
 #include "emodule.h"
+#include "eobj.h"
 #include "ewins.h"
 #include "icons.h"
 #include "snaps.h"
diff --git a/src/ewins.h b/src/ewins.h
index 59b60312..854edb4d 100644
--- a/src/ewins.h
+++ b/src/ewins.h
@@ -24,6 +24,8 @@
 #ifndef _EWIN_H_
 #define _EWIN_H_
 
+#include "eobj.h"
+
 struct _desk;
 
 #if 0
diff --git a/src/hiwin.c b/src/hiwin.c
index ec9052e4..388d7df5 100644
--- a/src/hiwin.c
+++ b/src/hiwin.c
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "eobj.h"
 #include "ewins.h"
 #include "hiwin.h"
 #include "xwin.h"
diff --git a/src/iconify.c b/src/iconify.c
index 607c9e14..884e82e9 100644
--- a/src/iconify.c
+++ b/src/iconify.c
@@ -25,6 +25,7 @@
 #include "desktops.h"
 #include "ecore-e16.h"
 #include "emodule.h"
+#include "eobj.h"
 #include "ewins.h"
 #include "icons.h"
 #include "menus.h"
diff --git a/src/ipc.c b/src/ipc.c
index 0a01c6e4..aa3597fd 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -24,6 +24,7 @@
 #include "E.h"
 #include "desktops.h"
 #include "emodule.h"
+#include "eobj.h"
 #include "ewins.h"
 #include "ewin-ops.h"
 #include "xwin.h"
diff --git a/src/menus.c b/src/menus.c
index 148baf1b..2240127b 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -23,6 +23,7 @@
  */
 #include "E.h"
 #include "emodule.h"
+#include "eobj.h"
 #include "ewins.h"
 #include "menus.h"
 #include "tooltips.h"
diff --git a/src/misc.c b/src/misc.c
index 81a21dea..3083a875 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "eobj.h"
 #include "xwin.h"
 #include <sys/time.h>
 #include <time.h>
diff --git a/src/progress.c b/src/progress.c
index aa4fa87f..8f08067d 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "eobj.h"
 #include "xwin.h"
 
 struct _progressbar
diff --git a/src/slideout.c b/src/slideout.c
index 446a2737..4f05f741 100644
--- a/src/slideout.c
+++ b/src/slideout.c
@@ -25,6 +25,7 @@
 #include "buttons.h"
 #include "desktops.h"
 #include "emodule.h"
+#include "eobj.h"
 #include "ewins.h"
 #include "xwin.h"
 
diff --git a/src/stacking.c b/src/stacking.c
index 121ff0f7..9be68253 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -22,6 +22,7 @@
  */
 #include "E.h"
 #include "desktops.h"
+#include "eobj.h"
 #include "ewins.h"
 
 #define ENABLE_DEBUG_STACKING 1
diff --git a/src/startup.c b/src/startup.c
index d90b934c..b57d94fa 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "eobj.h"
 #include "xwin.h"
 #include <time.h>
 
diff --git a/src/tooltips.c b/src/tooltips.c
index f3445a16..822f8d7a 100644
--- a/src/tooltips.c
+++ b/src/tooltips.c
@@ -24,6 +24,7 @@
 #include "E.h"
 #include "conf.h"
 #include "emodule.h"
+#include "eobj.h"
 #include "tooltips.h"
 #include "xwin.h"