Rearrange included header files

Change-Id: I2996c759ab5ecdc6768642e448d5a772415edd9d

diff --git a/include/media-svc.h b/include/media-svc.h
index 3b685e2..a46ee1d 100755 (executable)
--- a/include/media-svc.h
+++ b/include/media-svc.h
@@ -25,7 +25,6 @@
 #define _MEDIA_SVC_H_
 
 #include <media-util.h>
-#include <time.h>
 #include <stdbool.h>
 #include <sqlite3.h>
 

diff --git a/src/common/media-svc-localize_ch.c b/src/common/media-svc-localize_ch.c
index b805d9c..03d49de 100755 (executable)
--- a/src/common/media-svc-localize_ch.c
+++ b/src/common/media-svc-localize_ch.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "media-util-err.h"
 #include "media-svc-debug.h"

diff --git a/src/common/media-svc-noti.c b/src/common/media-svc-noti.c
index 9f7172c..aa2dac1 100755 (executable)
--- a/src/common/media-svc-noti.c
+++ b/src/common/media-svc-noti.c
@@ -22,6 +22,7 @@
 #include <unistd.h>
 #include "media-svc-noti.h"
 #include "media-svc-util.h"
+#include "media-svc-debug.h"
 
 static __thread GSList *g_inserted_noti_list = NULL;
 static __thread int g_noti_from_pid = -1;
@@ -79,7 +80,6 @@ int _media_svc_publish_dir_noti(media_item_update_type_e update_type, const char
        return ret;
 }
 
-
 void _media_svc_set_noti_from_pid(int pid)
 {
        g_noti_from_pid = pid;

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 5c8ef28..bf8839f 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include <string.h>
-#include <errno.h>
-#include "media-svc.h"
 #include "media-svc-media.h"
 #include "media-svc-debug.h"
 #include "media-svc-util.h"

diff --git a/src/include/common/media-svc-db-utils.h b/src/include/common/media-svc-db-utils.h
index cb62307..aa272d0 100755 (executable)
--- a/src/include/common/media-svc-db-utils.h
+++ b/src/include/common/media-svc-db-utils.h
@@ -25,6 +25,7 @@
 
 #include <sqlite3.h>
 #include <glib.h>
+#include "media-svc-env.h"
 
 #define SQLITE3_FINALIZE(x)            if (x != NULL) sqlite3_finalize(x);
 #define SQLITE3_SAFE_FREE(x)     {if (x != NULL) {sqlite3_free(x); x = NULL; } }

diff --git a/src/include/common/media-svc-debug.h b/src/include/common/media-svc-debug.h
index bfdfbda..25a6402 100755 (executable)
--- a/src/include/common/media-svc-debug.h
+++ b/src/include/common/media-svc-debug.h
@@ -24,8 +24,6 @@
 #ifndef _MEDIA_SVC_DEBUG_H_
 #define _MEDIA_SVC_DEBUG_H_
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <dlog.h>
 #include <errno.h>
 

diff --git a/src/include/common/media-svc-env.h b/src/include/common/media-svc-env.h
index e7c3b63..a428d27 100755 (executable)
--- a/src/include/common/media-svc-env.h
+++ b/src/include/common/media-svc-env.h
@@ -24,7 +24,7 @@
 #ifndef _MEDIA_SVC_ENV_H_
 #define _MEDIA_SVC_ENV_H_
 
-#include <media-util.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/include/common/media-svc-media.h b/src/include/common/media-svc-media.h
index 26c8735..8d8b401 100755 (executable)
--- a/src/include/common/media-svc-media.h
+++ b/src/include/common/media-svc-media.h
@@ -24,9 +24,8 @@
 
 #include <sqlite3.h>
 #include <stdbool.h>
-#include "media-svc-env.h"
 #include "media-svc-noti.h"
-#include "media-svc-util.h"
+#include "media-svc-env.h"
 
 int _media_svc_check_data_by_path(sqlite3 *handle, const char *path);
 int _media_svc_get_modified_time(sqlite3 *handle, const char *path, int *modified_time);

diff --git a/src/include/common/media-svc-noti.h b/src/include/common/media-svc-noti.h
index ae8cbce..1351b47 100755 (executable)
--- a/src/include/common/media-svc-noti.h
+++ b/src/include/common/media-svc-noti.h
@@ -22,11 +22,8 @@
 #ifndef _MEDIA_SVC_NOTI_H_
 #define _MEDIA_SVC_NOTI_H_
 
-#include "media-svc-env.h"
-#include "media-svc-debug.h"
-#include "media-svc-util.h"
-
 #include <media-util-noti-internal.h>
+#include "media-svc-util.h"
 
 typedef struct _media_svc_noti_item media_svc_noti_item;
 
@@ -48,9 +45,4 @@ void _media_svc_destroy_noti_item(media_svc_noti_item *item);
 int _media_svc_publish_noti(media_item_update_type_e update_type, const char *path, media_type_e media_type, const char *uuid, const char *mime_type);
 int _media_svc_publish_dir_noti(media_item_update_type_e update_type, const char *path, const char *uuid, int pid);
 
-
-
-
-
 #endif /*_MEDIA_SVC_NOTI_H_*/
-

diff --git a/src/include/common/media-svc-util.h b/src/include/common/media-svc-util.h
index 7129bbf..982f3ba 100755 (executable)
--- a/src/include/common/media-svc-util.h
+++ b/src/include/common/media-svc-util.h
@@ -28,7 +28,7 @@
 #include <stdbool.h>
 #include <sqlite3.h>
 #include <time.h>
-#include "media-svc-env.h"
+#include <media-util.h>
 
 #ifdef __cplusplus
 extern "C" {