libhb: resolve header conflicts with pango/harfbuzz

Newest versions appear to have a "common.h" somewhere that is
interfering with libhb/common.h.

move headers into "handbrake" subdirectory

12 files changed, 15 insertions, 15 deletions

diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index e922d40f7..404c37659 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "ghbcompat.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index b8c41321e..0a9442c9b 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -74,7 +74,7 @@
 #include <dbt.h>
 #endif
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "callbacks.h"
 #include "chapters.h"
 #include "queuehandler.h"
diff --git a/gtk/src/callbacks.h b/gtk/src/callbacks.h
index 94f64bb74..d2390e0ff 100644
--- a/gtk/src/callbacks.h
+++ b/gtk/src/callbacks.h
@@ -30,7 +30,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "values.h"
 #include "settings.h"
 
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 260f09034..535d60f93 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -25,7 +25,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include <math.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "ghbcompat.h"
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
@@ -39,7 +39,7 @@
 #include "preview.h"
 #include "presets.h"
 #include "values.h"
-#include "lang.h"
+#include "handbrake/lang.h"
 #include "jansson.h"
 
 typedef struct
diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
index 37d21c14a..38b1545a8 100644
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -26,8 +26,8 @@
 
 #include "values.h"
 #include "settings.h"
-#include "handbrake.h"
-#include "lang.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/lang.h"
 
 enum
 {
diff --git a/gtk/src/main.c b/gtk/src/main.c
index 7b59bc460..c7c422724 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -47,7 +47,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "renderer_button.h"
 #include "hb-backend.h"
 #include "ghb-dvd.h"
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index f06f4552d..8e94cfb6c 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include "ghbcompat.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "settings.h"
 #include "callbacks.h"
 #include "audiohandler.h"
@@ -40,7 +40,7 @@
 #include "resources.h"
 #include "presets.h"
 #include "values.h"
-#include "lang.h"
+#include "handbrake/lang.h"
 #include "videohandler.h"
 
 #define MAX_NESTED_PRESET 3
diff --git a/gtk/src/presets.h b/gtk/src/presets.h
index 32011e4e2..aed1d5d56 100644
--- a/gtk/src/presets.h
+++ b/gtk/src/presets.h
@@ -24,7 +24,7 @@
 #if !defined(_GHB_PRESETS_H_)
 #define _GHB_PRESETS_H_
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "values.h"
 
 void ghb_presets_load(signal_user_data_t *ud);
diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index 7ae956355..be97edbe8 100644
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -43,7 +43,7 @@
 #include "preview.h"
 #include "values.h"
 #include "queuehandler.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 
 #define PREVIEW_STATE_IMAGE 0
 #define PREVIEW_STATE_LIVE 1
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index efc8292db..ace9064dd 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"
diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c
index 5e31f684f..d7d0c7e9c 100644
--- a/gtk/src/subtitlehandler.c
+++ b/gtk/src/subtitlehandler.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "ghbcompat.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"
diff --git a/gtk/src/values.h b/gtk/src/values.h
index fabc2021f..a6369a7a1 100644
--- a/gtk/src/values.h
+++ b/gtk/src/values.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "hb_dict.h"
+#include "handbrake/hb_dict.h"
 
 #define GHB_DICT    HB_VALUE_TYPE_DICT
 #define GHB_ARRAY   HB_VALUE_TYPE_ARRAY