Ship missing headers, and remove wrong includes

elm_gen_common.h was not installed, but is needed by installed headers.
Remove dependencies on internal headers from shipped headers.

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 443f68c..9f2cb9e 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -43,6 +43,7 @@ Elementary_Cursor.h
 includesdir = $(includedir)/elementary-@VMAJ@
 
 includesunstable_HEADERS = \
+elm_gen_common.h \
 elm_interface_fileselector.h \
 elm_interface_scrollable.h \
 elm_widget.h \
@@ -392,7 +393,6 @@ elm_win_legacy.h
 includesubdir = $(includedir)/elementary-@VMAJ@/
 
 libelementary_la_SOURCES = \
-elm_gen_common.h \
 elm_priv.h \
 els_box.h \
 elc_ctxpopup.c \

diff --git a/src/lib/elm_gen_common.h b/src/lib/elm_gen_common.h
index 19e4a11..3df68a5 100644 (file)
--- a/src/lib/elm_gen_common.h
+++ b/src/lib/elm_gen_common.h
@@ -3,7 +3,6 @@
 
 #include <Elementary.h>
 #include <Elementary_Cursor.h>
-#include "elm_priv.h"
 
 #define ELM_GEN_ITEM_FROM_INLIST(it) \
   ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL)

diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index a6d3072..160538f 100644 (file)
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -7,6 +7,8 @@
 #include "elm_priv.h"
 #include "elm_widget_panel.h"
 
+#include "els_box.h"
+
 EAPI Eo_Op ELM_OBJ_PANEL_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_PANEL_CLASS

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 1e0ae05..e5623aa 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -6,6 +6,7 @@
 
 #include "elm_priv.h"
 #include "elm_widget_toolbar.h"
+#include "els_box.h"
 
 EAPI Eo_Op ELM_OBJ_TOOLBAR_BASE_ID = EO_NOOP;
 

diff --git a/src/lib/elm_widget_panel.h b/src/lib/elm_widget_panel.h
index e869f01..c72f606 100644 (file)
--- a/src/lib/elm_widget_panel.h
+++ b/src/lib/elm_widget_panel.h
@@ -2,7 +2,6 @@
 #define ELM_WIDGET_PANEL_H
 
 #include "elm_widget_layout.h"
-#include "els_box.h"
 
 /**
  * @addtogroup Widget

diff --git a/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h
index 500b53a..9c731ea 100644 (file)
--- a/src/lib/elm_widget_toolbar.h
+++ b/src/lib/elm_widget_toolbar.h
@@ -2,7 +2,6 @@
 #define ELM_WIDGET_TOOLBAR_H
 
 #include "elm_interface_scrollable.h"
-#include "els_box.h"
 
 /**
  * @addtogroup Widget