From a619ea61e98e39581ddf8335cf8d5e5610172a9c Mon Sep 17 00:00:00 2001
From: Inkyun Kil <inkyun.kil@samsung.com>
Date: Wed, 4 Mar 2020 16:36:30 +0900
Subject: [PATCH] Rearrange including header for apis

Change-Id: Ie5bd34dda348ee64aeb6fdf5d544ec916717786f
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>
---
 watch-holder/CMakeLists.txt        | 2 ++
 watch-holder/api/sharable_watch.cc | 4 +++-
 watch-holder/api/sharable_watch.h  | 2 +-
 watch-holder/api/watch.h           | 3 ++-
 watch-holder/api/watch_holder.h    | 3 ++-
 watch-holder/api/watch_mirror.cc   | 6 +++---
 watch-holder/api/watch_mirror.h    | 3 ++-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/watch-holder/CMakeLists.txt b/watch-holder/CMakeLists.txt
index c21437e..e7fe5e1 100644
--- a/watch-holder/CMakeLists.txt
+++ b/watch-holder/CMakeLists.txt
@@ -23,6 +23,8 @@ pkg_check_modules(watch-holder REQUIRED
 	vconf
 )
 
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/api)
+
 AUX_SOURCE_DIRECTORY(src BUILD_SOURCE)
 AUX_SOURCE_DIRECTORY(api BUILD_SOURCE)
 
diff --git a/watch-holder/api/sharable_watch.cc b/watch-holder/api/sharable_watch.cc
index 430c630..92270e4 100644
--- a/watch-holder/api/sharable_watch.cc
+++ b/watch-holder/api/sharable_watch.cc
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "../src/watch.hh"
 
 #include "watch.h"
 #include "sharable_watch.h"
 
+#include "../src/watch.hh"
+
+
 #ifndef C_EXPORT
 #define C_EXPORT extern "C" __attribute__((visibility("default")))
 #endif
diff --git a/watch-holder/api/sharable_watch.h b/watch-holder/api/sharable_watch.h
index a1599da..1f7fb6a 100644
--- a/watch-holder/api/sharable_watch.h
+++ b/watch-holder/api/sharable_watch.h
@@ -20,7 +20,7 @@
 #include <Evas.h>
 #include <bundle.h>
 
-#include "watch_holder_error.h"
+#include <watch_holder_error.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/watch-holder/api/watch.h b/watch-holder/api/watch.h
index 1147824..505035e 100644
--- a/watch-holder/api/watch.h
+++ b/watch-holder/api/watch.h
@@ -17,10 +17,11 @@
 #ifndef __WATCH_H__
 #define __WATCH_H__
 
-#include "watch_holder_error.h"
 #include <Evas.h>
 #include <bundle.h>
 
+#include <watch_holder_error.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/watch-holder/api/watch_holder.h b/watch-holder/api/watch_holder.h
index 62ed809..b72681d 100644
--- a/watch-holder/api/watch_holder.h
+++ b/watch-holder/api/watch_holder.h
@@ -21,7 +21,8 @@
 #include <bundle.h>
 #include <Evas.h>
 
-#include "watch.h"
+#include <watch.h>
+#include <watch_holder_error.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/watch-holder/api/watch_mirror.cc b/watch-holder/api/watch_mirror.cc
index 1c55a49..0490248 100644
--- a/watch-holder/api/watch_mirror.cc
+++ b/watch-holder/api/watch_mirror.cc
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <cstring>
-#include <list>
-
 #include "watch_mirror.h"
 #include "../src/watch_mirror.hh"
 
+#include <cstring>
+#include <list>
+
 #ifndef C_EXPORT
 #define C_EXPORT extern "C" __attribute__((visibility("default")))
 #endif
diff --git a/watch-holder/api/watch_mirror.h b/watch-holder/api/watch_mirror.h
index 18f36b9..0e3f4c8 100644
--- a/watch-holder/api/watch_mirror.h
+++ b/watch-holder/api/watch_mirror.h
@@ -20,7 +20,8 @@
 #include <Evas.h>
 #include <bundle.h>
 
-#include "sharable_watch.h"
+#include <watch_holder_error.h>
+#include <sharable_watch.h>
 
 #ifdef __cplusplus
 extern "C" {
-- 
2.7.4