e_client: remove the included header files in e_client.h

Remove header files which is useless.

Change-Id: I746d209ffd3431b9627857f0266919410e450a45

diff --git a/src/bin/compmgr/e_alpha_mask_rect.c b/src/bin/compmgr/e_alpha_mask_rect.c
index 371f3c25acfc74a172c3f3ee7a8e09770622d041..d2878edaccc9d5f9366c2455f11cbf17a7967690 100644 (file)
--- a/src/bin/compmgr/e_alpha_mask_rect.c
+++ b/src/bin/compmgr/e_alpha_mask_rect.c
@@ -1,6 +1,3 @@
-#include <wayland-server.h>
-#include <Evas.h>
-
 #include "e_alpha_mask_rect_intern.h"
 #include "e_client_intern.h"
 #include "e_comp_wl_intern.h"
@@ -10,6 +7,10 @@
 #include "e_view_intern.h"
 #include "e_view_client_intern.h"
 #include "e_view_rect.h"
+#include "e_pixmap_intern.h"
+
+#include <wayland-server.h>
+#include <Evas.h>
 
 struct _E_Alpha_Mask_Rect
 {

diff --git a/src/bin/compmgr/e_comp.c b/src/bin/compmgr/e_comp.c
index 70f699d962922b33fc1b7e643edd9895452dddb2..089fea3d7b1ab579cdd644131bf28060ed3b3075 100644 (file)
--- a/src/bin/compmgr/e_comp.c
+++ b/src/bin/compmgr/e_comp.c
@@ -17,6 +17,7 @@
 #include "e_policy_zone_intern.h"
 #include "e_comp_canvas_intern.h"
 #include "e_pointer_intern.h"
+#include "e_pixmap_intern.h"
 
 #include <sys/xattr.h>
 #include <sys/types.h>

diff --git a/src/bin/compmgr/e_comp_canvas_intern.h b/src/bin/compmgr/e_comp_canvas_intern.h
index 7c49af8831cc19dcc1818e4120a438dc0e96169a..863297eeefd5e5f680e926007d85ea60963e9548 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas_intern.h
+++ b/src/bin/compmgr/e_comp_canvas_intern.h
@@ -3,6 +3,7 @@
 
 #include "e_intern.h"
 #include "e_comp_canvas.h"
+#include "e_comp_screen_intern.h"
 
 EINTERN Eina_Bool  e_comp_canvas_init(E_Comp_Screen *comp_screen);
 EINTERN void       e_comp_canvas_clear(void);

diff --git a/src/bin/compmgr/e_comp_intern.h b/src/bin/compmgr/e_comp_intern.h
index 008539340cc616e285f440d4d14b5f8c7b9c12b1..039297fd5046739f3b2ea1d2ee18f038301830e1 100644 (file)
--- a/src/bin/compmgr/e_comp_intern.h
+++ b/src/bin/compmgr/e_comp_intern.h
@@ -12,7 +12,7 @@
 #define E_COMP_ZONE_REVERSE_FOREACH(ZONE) \
    for(ZONE = eina_list_last_data_get(e_comp_zone_list_get()) ; ZONE ; ZONE = eina_list_data_get(eina_list_prev(eina_list_data_find_list(e_comp_zone_list_get(), ZONE))))
 
-   struct _E_Comp
+struct _E_Comp
 {
    E_Object e_obj_inherit;
    int w, h;

diff --git a/src/bin/core/e_canvas.c b/src/bin/core/e_canvas.c
index a45e0eeb7cb8e54a099a2bcde7ee1b3b7bce64cc..83f468567f6b829d92f729b91b7d43b02d5b9aa8 100644 (file)
--- a/src/bin/core/e_canvas.c
+++ b/src/bin/core/e_canvas.c
@@ -2,6 +2,8 @@
 #include "e_canvas_intern.h"
 #include "e_view_intern.h"
 
+#include <Ecore_Evas.h>
+
 static void _canvas_cb_render_pre(void *data, Evas *e, void *event_info);
 static void _canvas_cb_render_post(void *data, Evas *e, void *event_info);
 static void _canvas_cb_render_flush_pre(void *data, Evas *e, void *event_info);

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 21edea234210c20a5f667feb5cdf9d455aa0fef5..9fd9d99f6277178a204fa0898ef37c593a917c21 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -29,6 +29,7 @@
 #include "e_desktop_shell_intern.h"
 #include "e_comp_cfdata_intern.h"
 #include "e_hints_intern.h"
+#include "e_pixmap_intern.h"
 
 #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
 

diff --git a/src/bin/core/e_client_intern.h b/src/bin/core/e_client_intern.h
index 55bf64711895ba0adf338ca97cc51af25d325154..d3f586d063718a9d14e4466984d73dbd91f55e0f 100644 (file)
--- a/src/bin/core/e_client_intern.h
+++ b/src/bin/core/e_client_intern.h
@@ -3,10 +3,15 @@
 
 #include "e_intern.h"
 #include "e_client.h"
-#include "e_pixmap_intern.h"
+#include "e_config_intern.h"
+#include "e_comp_intern.h"
 #include "e_comp_wl_capture_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_actions_intern.h"
+#include "e_view_image_intern.h"
+#include "e_pointer_intern.h"
+#include "e_desk_intern.h"
+#include "e_zone_intern.h"
 
 #include <wayland-server.h>
 

diff --git a/src/bin/core/e_comp_cfdata.c b/src/bin/core/e_comp_cfdata.c
index 17812d8fab4fc0acb8c53218ff61817e92999924..0f15bca60d7d37e182976bba06c8f482f0665b89 100644 (file)
--- a/src/bin/core/e_comp_cfdata.c
+++ b/src/bin/core/e_comp_cfdata.c
@@ -1,4 +1,5 @@
 #include "e_comp_cfdata_intern.h"
+#include "e_comp_intern.h"
 
 EINTERN void
 e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd)

diff --git a/src/bin/core/e_intern.h b/src/bin/core/e_intern.h
index 0f65154ab622d6254260975d8df03f0bd0aa2ce0..c8cf12f297d49e40037490fbbb7a272829bf2dec 100644 (file)
--- a/src/bin/core/e_intern.h
+++ b/src/bin/core/e_intern.h
@@ -12,6 +12,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <assert.h>
+#include <stdatomic.h>
 
 #ifdef ENABLE_TTRACE
 #include <ttrace.h>

diff --git a/src/bin/core/e_module.c b/src/bin/core/e_module.c
index 87229aceda204d49f685ccf1775ef13a53a9de03..e40e64d7bc8e47c1adbc254e335163c1bd758469 100644 (file)
--- a/src/bin/core/e_module.c
+++ b/src/bin/core/e_module.c
@@ -3,6 +3,7 @@
 #include "e_utils_intern.h"
 #include "e_main_intern.h"
 #include "e_config_intern.h"
+#include "e_object.h"
 
 #include <Eio.h>
 #include <dlfcn.h>

diff --git a/src/bin/core/e_object.c b/src/bin/core/e_object.c
index ac82eaa0f697d4283644f4596d342eea2d0cbf0f..489df2bc0ed305570bb6d8841bf238702a3fc649 100644 (file)
--- a/src/bin/core/e_object.c
+++ b/src/bin/core/e_object.c
@@ -1,3 +1,4 @@
+#include "e_object.h"
 #include "e_error_intern.h"
 #include "e_utils.h"
 

diff --git a/src/bin/core/e_pixmap_intern.h b/src/bin/core/e_pixmap_intern.h
index 7a8127f1592cdf2cdd6dce003d9ae6a3aad8ac25..016cde2eb712f7043848141fa073c3673be191ae 100644 (file)
--- a/src/bin/core/e_pixmap_intern.h
+++ b/src/bin/core/e_pixmap_intern.h
@@ -3,6 +3,7 @@
 
 #include "e_intern.h"
 #include "e_pixmap.h"
+#include "e_comp_wl_intern.h"
 
 struct _E_Pixmap_Hook
 {

diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c
index 6e450dddd185cebae6bd16ccd773fc67d7e110df..469b83fc7be260f82067aaa0fff705a7953efd3a 100644 (file)
--- a/src/bin/core/e_view_client.c
+++ b/src/bin/core/e_view_client.c
@@ -12,6 +12,7 @@
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_utils.h"
 #include "e_comp_cfdata_intern.h"
+#include "e_pixmap_intern.h"
 
 E_View_Tree_Impl view_client_tree_impl;
 

diff --git a/src/bin/inputmgr/e_devicemgr_conf_intern.h b/src/bin/inputmgr/e_devicemgr_conf_intern.h
index d5d7cdc5ff5e28c1baf61f570d38eeeb8420667a..3928b7e4af4a738c0663176159e0fb9d9cf97bb6 100644 (file)
--- a/src/bin/inputmgr/e_devicemgr_conf_intern.h
+++ b/src/bin/inputmgr/e_devicemgr_conf_intern.h
@@ -3,6 +3,7 @@
 
 #include "e_intern.h"
 #include "e_devicemgr.h"
+#include "e_config_intern.h"
 
 struct _E_Devicemgr_Conf_Edd
 {

diff --git a/src/bin/inputmgr/e_input_event_intern.h b/src/bin/inputmgr/e_input_event_intern.h
index 1ac25ee452d786834ec3dd7d1033c934776fb85e..c7c170007021467b36c6f423598fdb3a246a467b 100644 (file)
--- a/src/bin/inputmgr/e_input_event_intern.h
+++ b/src/bin/inputmgr/e_input_event_intern.h
@@ -4,6 +4,8 @@
 #include "e_intern.h"
 #include "e_input_event.h"
 
+#include <glib.h>
+
 typedef struct
 {
   void *eh;

diff --git a/src/bin/inputmgr/e_input_intern.h b/src/bin/inputmgr/e_input_intern.h
index e19acdda019468acb4f1c7b368d46861f7f997de..f2b89c6b70b16b4c23ef5c49503c7ff35f3286c7 100644 (file)
--- a/src/bin/inputmgr/e_input_intern.h
+++ b/src/bin/inputmgr/e_input_intern.h
@@ -6,6 +6,7 @@
 #include "e_device_intern.h"
 
 #include <libinput.h>
+#include <Ecore_Evas.h>
 
 typedef struct _E_Input E_Input;
 

diff --git a/src/bin/inputmgr/e_input_thread_client_intern.h b/src/bin/inputmgr/e_input_thread_client_intern.h
index 5f3afa50b7e85a81fd618e8b903ff0910eb6419c..de26ee5298a1e4c7035ed936218048f206501a95 100644 (file)
--- a/src/bin/inputmgr/e_input_thread_client_intern.h
+++ b/src/bin/inputmgr/e_input_thread_client_intern.h
@@ -4,8 +4,10 @@
 #include "e_intern.h"
 #include "e_view.h"
 #include "e_view_input_client_intern.h"
+#include "e_devicemgr_intern.h"
 
 #include <wayland-server.h>
+#include <glib.h>
 
 typedef struct _E_Input_Thread_Client E_Input_Thread_Client;
 

diff --git a/src/bin/inputmgr/e_keyrouter_conf_intern.h b/src/bin/inputmgr/e_keyrouter_conf_intern.h
index 89881890b304f371fde27fd756f639ab5cac979a..c5efdee02391d3652a46d46ca84a09e4f369fb35 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_conf_intern.h
+++ b/src/bin/inputmgr/e_keyrouter_conf_intern.h
@@ -2,6 +2,7 @@
 #define E_KEYROUTER_CONF_INTERN_H
 
 #include "e_intern.h"
+#include "e_config_intern.h"
 
 typedef struct _E_Keyrouter_Conf_Edd    E_Keyrouter_Conf_Edd;
 typedef struct _E_Keyrouter_Config_Data E_Keyrouter_Config_Data;

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index 8adc8494da459ec2e991543defe7a7edf5c0ba8d..2206c3e92f9d1c479a006c2728eafa1f95565694 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -55,6 +55,7 @@
 #include "e_config_intern.h"
 #include "e_devicemgr_intern.h"
 #include "e_comp_cfdata_intern.h"
+#include "e_pixmap_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 #include <relative-pointer-unstable-v1-server-protocol.h>

diff --git a/src/bin/server/e_comp_wl_subsurface_intern.h b/src/bin/server/e_comp_wl_subsurface_intern.h
index 97ac26cb19c53cdad1976d87ed6cbd4e53637ec5..7fe9bfe0dc54f43ec318744b6d02328ca906a277 100644 (file)
--- a/src/bin/server/e_comp_wl_subsurface_intern.h
+++ b/src/bin/server/e_comp_wl_subsurface_intern.h
@@ -2,6 +2,7 @@
 #define _E_COMP_WL_SUBSURFACE_H_
 
 #include "e_intern.h"
+#include "e_comp_wl_intern.h"
 
 #ifndef WL_HIDE_DEPRECATED
 # define WL_HIDE_DEPRECATED

diff --git a/src/bin/server/e_devicemgr_wl_intern.h b/src/bin/server/e_devicemgr_wl_intern.h
index 3bbdeba1331289fd852cf60e1f99de1360740dc6..521ac7a839a77d8bff432572df0fe8184655416c 100644 (file)
--- a/src/bin/server/e_devicemgr_wl_intern.h
+++ b/src/bin/server/e_devicemgr_wl_intern.h
@@ -2,6 +2,7 @@
 #define E_DEVICEMGR_WL_INTERN_H
 
 #include "e_intern.h"
+#include "e_devicemgr_intern.h"
 
 #include <wayland-server.h>
 

diff --git a/src/bin/server/e_explicit_sync_intern.h b/src/bin/server/e_explicit_sync_intern.h
index efdebc6483246956a991f50071c8f7cc12fa9945..9bab3f05739af2613377a48d4637cbd00e332ca2 100644 (file)
--- a/src/bin/server/e_explicit_sync_intern.h
+++ b/src/bin/server/e_explicit_sync_intern.h
@@ -3,6 +3,8 @@
 
 #include "e_intern.h"
 #include "e_explicit_sync.h"
+#include "e_comp_wl_intern.h"
+#include "e_object.h"
 
 typedef struct _E_Explicit_Sync E_Explicit_Sync;
 typedef struct _E_Explicit_Sync_Surface E_Explicit_Sync_Surface;

diff --git a/src/bin/server/e_video_shell.c b/src/bin/server/e_video_shell.c
index 115b7cd00042067cbaccab700ea51ab30d6f821c..510c3f6443767386ab9106ef474d60dcdadb56f7 100644 (file)
--- a/src/bin/server/e_video_shell.c
+++ b/src/bin/server/e_video_shell.c
@@ -9,6 +9,7 @@
 #include "e_view_rect.h"
 #include "e_view_client_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_pixmap_intern.h"
 
 #include <assert.h>
 #include <stdio.h>

diff --git a/src/bin/windowmgr/e_policy_desk_area.c b/src/bin/windowmgr/e_policy_desk_area.c
index c12483be9071a73e32d0410bab1f12aedb797848..108b541f85523397adc24cbdea890e503318084f 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk_area.c
+++ b/src/bin/windowmgr/e_policy_desk_area.c
@@ -35,6 +35,7 @@
 #include "services/e_service_cbhm_intern.h"
 #include "e_tizen_ws_shell_manager_intern.h"
 #include "e_magnifier_intern.h"
+#include "e_pixmap_intern.h"
 
 typedef struct _E_Policy_Desk_Area_Private_Client  E_Policy_Desk_Area_Private_Client;
 

diff --git a/src/include/e_client.h b/src/include/e_client.h
index 52bf37f2a37915af9c1555b0d87808105a27270d..9592b35d23a86c0b969343ca708634ffd2e1c8a5 100644 (file)
--- a/src/include/e_client.h
+++ b/src/include/e_client.h
@@ -6,18 +6,10 @@ extern "C" {
 #endif
 
 #include <e_types.h>
-#include <e_object.h>
-#include <e_comp.h>
-#include <e_pointer.h>
-#include <e_hwc_window.h>
-#include <e_desk.h>
-#include <e_zone.h>
-#include <e_util_transform.h>
 #include <e_pixmap.h>
-#include <e_config.h>
-#include <e_view.h>
-#include <e_view_image.h>
 #include <e_view_client.h>
+#include <e_util_transform.h>
+#include <e_hwc_window.h>
 
 #include <uuid.h>
 #include <Ecore.h>

diff --git a/src/include/e_comp_wl_input.h b/src/include/e_comp_wl_input.h
index bc9862df4ad9ccb014aa558ced8f5a7af909d05c..12eb2e835bae2156ec89bc2b8b85f1da42fe606c 100644 (file)
--- a/src/include/e_comp_wl_input.h
+++ b/src/include/e_comp_wl_input.h
@@ -7,6 +7,8 @@ extern "C" {
 
 #include <e_types.h>
 
+#include <xkbcommon/xkbcommon.h>
+
 typedef struct _E_Event_Text_Input_Panel_Visibility_Change E_Event_Text_Input_Panel_Visibility_Change;
 
 struct _E_Event_Text_Input_Panel_Visibility_Change

diff --git a/src/include/e_desk_area.h b/src/include/e_desk_area.h
index f2c044d4378bc74676added08706777843b229fe..fb9f9b3a93dbd1e49521d5dcc29d6d3960953fef 100644 (file)
--- a/src/include/e_desk_area.h
+++ b/src/include/e_desk_area.h
@@ -10,8 +10,6 @@ extern "C" {
 #include <e_comp.h>
 #include <e_comp_wl.h>
 
-typedef struct _E_Desk_Area E_Desk_Area;
-
 typedef struct _E_Desk_Area_Hook E_Desk_Area_Hook;
 
 typedef struct _E_Event_Desk_Area E_Event_Desk_Area;

diff --git a/src/include/e_log.h b/src/include/e_log.h
index 788ea373576ce83761a28e8c0276dbb9170a3b0a..507c1db50e1609ea46c00f36db4cec4a99ac9a90 100644 (file)
--- a/src/include/e_log.h
+++ b/src/include/e_log.h
@@ -8,6 +8,7 @@ extern "C" {
 #include <e_types.h>
 #include <e_client.h>
 #include <e_pixmap.h>
+#include <e_comp.h>
 
 #ifdef HAVE_DLOG
 # include <dlog.h>

diff --git a/src/include/e_pixmap.h b/src/include/e_pixmap.h
index 2b8fe473484061735d9af96931d8035262a35b4b..f7e16c25dc35a87a6c093c079d90999f488d5702 100644 (file)
--- a/src/include/e_pixmap.h
+++ b/src/include/e_pixmap.h
@@ -9,6 +9,9 @@ extern "C" {
 #include <e_client.h>
 #include <e_view_image.h>
 
+#include <Evas.h>
+
+
 typedef struct _E_Pixmap E_Pixmap;
 typedef struct _E_Pixmap_Hook E_Pixmap_Hook;
 

diff --git a/src/include/e_types.h b/src/include/e_types.h
index bd3fb72eed5488be5543f55dfe8e8a76cd5388f2..7f0bfe60ce72b003cb209a58ff5f6458eda4ea97 100644 (file)
--- a/src/include/e_types.h
+++ b/src/include/e_types.h
@@ -69,6 +69,7 @@ extern "C" {
 
 typedef struct _E_Client                      E_Client;                      // type of e_client.h
 typedef struct _E_Desk                        E_Desk;                        // type of e_desk.h
+typedef struct _E_Desk_Area                   E_Desk_Area;                   // type of e_desk_area.h
 typedef struct _E_Zone                        E_Zone;                        // type of e_zone.h
 typedef struct _E_Output                      E_Output;                      // type of e_output.h
 typedef struct _E_Comp_Wl_Buffer              E_Comp_Wl_Buffer;              // type of e_comp_wl.h