Resolve conflict with harfbuzz include file hb.h

Rename hb.h to handbrake.h

97 files changed, 98 insertions, 98 deletions

diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 5863f5118..e922d40f7 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "ghbcompat.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 67453cce5..b8c41321e 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -74,7 +74,7 @@
 #include <dbt.h>
 #endif
 
-#include "hb.h"
+#include "handbrake.h"
 #include "callbacks.h"
 #include "chapters.h"
 #include "queuehandler.h"
diff --git a/gtk/src/callbacks.h b/gtk/src/callbacks.h
index 39e570eac..94f64bb74 100644
--- a/gtk/src/callbacks.h
+++ b/gtk/src/callbacks.h
@@ -30,7 +30,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "values.h"
 #include "settings.h"
 
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index e54b8964f..260f09034 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 "hb.h"
+#include "handbrake.h"
 #include "ghbcompat.h"
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
index bd9aabd16..37d21c14a 100644
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -26,7 +26,7 @@
 
 #include "values.h"
 #include "settings.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 
 enum
diff --git a/gtk/src/main.c b/gtk/src/main.c
index f0ca67a3b..7b59bc460 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 "hb.h"
+#include "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 74cff997f..f06f4552d 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 "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "callbacks.h"
 #include "audiohandler.h"
diff --git a/gtk/src/presets.h b/gtk/src/presets.h
index 1f12ea790..32011e4e2 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 "hb.h"
+#include "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 3272d4787..7ae956355 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 "hb.h"
+#include "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 9ba93c9b7..efc8292db 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 "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"
diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c
index fea0f0175..5e31f684f 100644
--- a/gtk/src/subtitlehandler.c
+++ b/gtk/src/subtitlehandler.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "ghbcompat.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"
diff --git a/libhb/batch.c b/libhb/batch.c
index 02c79893a..ca61d3932 100644
--- a/libhb/batch.c
+++ b/libhb/batch.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
  
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 
 struct hb_batch_s
diff --git a/libhb/bd.c b/libhb/bd.c
index 46ffae3d4..ba230d98f 100644
--- a/libhb/bd.c
+++ b/libhb/bd.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 #include "hbffmpeg.h"
 
diff --git a/libhb/chroma_smooth.c b/libhb/chroma_smooth.c
index 4b4938891..0cbfbeea1 100644
--- a/libhb/chroma_smooth.c
+++ b/libhb/chroma_smooth.c
@@ -8,7 +8,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 #define CHROMA_SMOOTH_STRENGTH_DEFAULT 0.25
 #define CHROMA_SMOOTH_SIZE_DEFAULT 7
diff --git a/libhb/comb_detect.c b/libhb/comb_detect.c
index 4ab53057e..6bd922398 100644
--- a/libhb/comb_detect.c
+++ b/libhb/comb_detect.c
@@ -28,7 +28,7 @@ Original "Faster" settings:
 #define FILTER_CLASSIC 1
 #define FILTER_ERODE_DILATE 2
 
-#include "hb.h"
+#include "handbrake.h"
 #include "taskset.h"
 
 typedef struct decomb_thread_arg_s {
diff --git a/libhb/common.c b/libhb/common.c
index 58a809720..a3edef84a 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include <sys/time.h>
 
-#include "hb.h"
+#include "handbrake.h"
 #include "x264.h"
 #include "lang.h"
 #include "common.h"
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index a99c28d7b..f705d7035 100644
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -38,7 +38,7 @@
     VC1 decoder) can't easily be used by the HB mpeg stream reader.
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "hbavfilter.h"
 #include "libavfilter/avfilter.h"
diff --git a/libhb/deccc608sub.c b/libhb/deccc608sub.c
index f949c6829..e0defc785 100644
--- a/libhb/deccc608sub.c
+++ b/libhb/deccc608sub.c
@@ -13,7 +13,7 @@
  *
  * Note that the SRT sub generation from CC could be useful for mkv subs.
  */
-#include "hb.h"
+#include "handbrake.h"
 #include "deccc608sub.h"
 
 #define SSA_PREAMBLE_LEN 24
diff --git a/libhb/declpcm.c b/libhb/declpcm.c
index 9de01e62d..1c322c568 100644
--- a/libhb/declpcm.c
+++ b/libhb/declpcm.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "audio_resample.h"
 
diff --git a/libhb/decomb.c b/libhb/decomb.c
index 6bcd113c0..13adfd01c 100644
--- a/libhb/decomb.c
+++ b/libhb/decomb.c
@@ -54,7 +54,7 @@ which will feed EEDI2 interpolations to yadif.
 12-15: EEDI2 will override cubic interpolation
 *****/
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "eedi2.h"
 #include "taskset.h"
diff --git a/libhb/decpgssub.c b/libhb/decpgssub.c
index 176f4c971..cafc4cf5c 100644
--- a/libhb/decpgssub.c
+++ b/libhb/decpgssub.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
  
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 struct hb_work_private_s
diff --git a/libhb/decsrtsub.c b/libhb/decsrtsub.c
index 6157d69eb..303387c32 100644
--- a/libhb/decsrtsub.c
+++ b/libhb/decsrtsub.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <iconv.h>
 #include <errno.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "colormap.h"
 #include "decsrtsub.h"
 
diff --git a/libhb/decssasub.c b/libhb/decssasub.c
index 9d27fab2e..9729e6863 100644
--- a/libhb/decssasub.c
+++ b/libhb/decssasub.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#include "hb.h"
+#include "handbrake.h"
 
 #include <ass/ass.h>
 #include "decssasub.h"
diff --git a/libhb/dectx3gsub.c b/libhb/dectx3gsub.c
index 42cbf3332..49ea0e9b7 100644
--- a/libhb/dectx3gsub.c
+++ b/libhb/dectx3gsub.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "colormap.h"
 
 struct hb_work_private_s
diff --git a/libhb/decutf8sub.c b/libhb/decutf8sub.c
index 003aba6e9..45f522c22 100644
--- a/libhb/decutf8sub.c
+++ b/libhb/decutf8sub.c
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "decsrtsub.h"
 
 struct hb_work_private_s
diff --git a/libhb/decvobsub.c b/libhb/decvobsub.c
index 344b423f3..5e7f34701 100644
--- a/libhb/decvobsub.c
+++ b/libhb/decvobsub.c
@@ -27,7 +27,7 @@
  *   }
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/demuxmpeg.c b/libhb/demuxmpeg.c
index 0a4122e64..09a9325b0 100644
--- a/libhb/demuxmpeg.c
+++ b/libhb/demuxmpeg.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 static inline int check_mpeg_scr( hb_psdemux_t *state, int64_t scr, int tol )
 {
diff --git a/libhb/denoise.c b/libhb/denoise.c
index 58c7935c1..0da2bf8af 100644
--- a/libhb/denoise.c
+++ b/libhb/denoise.c
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 #define HQDN3D_SPATIAL_LUMA_DEFAULT    4.0f
diff --git a/libhb/detelecine.c b/libhb/detelecine.c
index a9abf8601..2d2026124 100644
--- a/libhb/detelecine.c
+++ b/libhb/detelecine.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 /*
diff --git a/libhb/dvd.c b/libhb/dvd.c
index fa991bf5c..9b1c6fca0 100644
--- a/libhb/dvd.c
+++ b/libhb/dvd.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 #include "dvd.h"
 
diff --git a/libhb/dvdnav.c b/libhb/dvdnav.c
index bd2906568..72833fcd4 100644
--- a/libhb/dvdnav.c
+++ b/libhb/dvdnav.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 #include "dvd.h"
 
diff --git a/libhb/eedi2.c b/libhb/eedi2.c
index 5bc22c4ac..e531ea96a 100644
--- a/libhb/eedi2.c
+++ b/libhb/eedi2.c
@@ -10,7 +10,7 @@
    http://web.missouri.edu/~kes25c/
 */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "eedi2.h"
 
 /**
diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c
index f7f84cb38..0b4f78a68 100644
--- a/libhb/enc_qsv.c
+++ b/libhb/enc_qsv.c
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "hb.h"
+#include "handbrake.h"
 #include "nal_units.h"
 #include "qsv_common.h"
 #include "qsv_memory.h"
diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
index 8417ac455..99bf4010b 100644
--- a/libhb/encavcodec.c
+++ b/libhb/encavcodec.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_dict.h"
 #include "hbffmpeg.h"
 #include "h264_common.h"
diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
index a3b5b2363..29117ded6 100644
--- a/libhb/encavcodecaudio.c
+++ b/libhb/encavcodecaudio.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 struct hb_work_private_s
diff --git a/libhb/enctheora.c b/libhb/enctheora.c
index 81da203cd..429f8e2fa 100644
--- a/libhb/enctheora.c
+++ b/libhb/enctheora.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "theora/codec.h"
 #include "theora/theoraenc.h"
 
diff --git a/libhb/encvobsub.c b/libhb/encvobsub.c
index 4d365279f..0650f3501 100644
--- a/libhb/encvobsub.c
+++ b/libhb/encvobsub.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
  
-#include "hb.h"
+#include "handbrake.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/encvorbis.c b/libhb/encvorbis.c
index a9236271d..3d521e3ea 100644
--- a/libhb/encvorbis.c
+++ b/libhb/encvorbis.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "audio_remap.h"
 
 #include "vorbis/vorbisenc.h"
diff --git a/libhb/encx264.c b/libhb/encx264.c
index e4d8deac2..b0f6781bc 100644
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -9,7 +9,7 @@
 
 #include <stdarg.h>
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_dict.h"
 #include "encx264.h"
 
diff --git a/libhb/encx265.c b/libhb/encx265.c
index 6e196eafd..39e912737 100644
--- a/libhb/encx265.c
+++ b/libhb/encx265.c
@@ -11,7 +11,7 @@
 
 #if HB_PROJECT_FEATURE_X265
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_dict.h"
 #include "h265_common.h"
 #include "x265.h"
diff --git a/libhb/fifo.c b/libhb/fifo.c
index c52aef17f..1bc89f823 100644
--- a/libhb/fifo.c
+++ b/libhb/fifo.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #if HB_PROJECT_FEATURE_QSV
 #include "qsv_libav.h"
 #endif
diff --git a/libhb/grayscale.c b/libhb/grayscale.c
index 1afd55e36..1608f8f45 100644
--- a/libhb/grayscale.c
+++ b/libhb/grayscale.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "taskset.h"
 
diff --git a/libhb/hb.h b/libhb/handbrake.h
index 910b74733..9cf744476 100644
--- a/libhb/hb.h
+++ b/libhb/handbrake.h
@@ -1,4 +1,4 @@
-/* hb.h
+/* handbrake.h
 
    Copyright (c) 2003-2019 HandBrake Team
    This file is part of the HandBrake source code
diff --git a/libhb/hb.c b/libhb/hb.c
index 407c2554d..b44c2679e 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "encx264.h"
 #include "libavfilter/avfilter.h"
diff --git a/libhb/hb_dict.c b/libhb/hb_dict.c
index 6e075cef0..b9bd5a8d3 100644
--- a/libhb/hb_dict.c
+++ b/libhb/hb_dict.c
@@ -9,7 +9,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_dict.h"
 
 hb_value_type_t hb_value_type(const hb_value_t *value)
diff --git a/libhb/hb_json.c b/libhb/hb_json.c
index ace8e4310..5fb92b8b8 100644
--- a/libhb/hb_json.c
+++ b/libhb/hb_json.c
@@ -8,7 +8,7 @@
  */
 
 #include <jansson.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_json.h"
 #include "libavutil/base64.h"
 #include "qsv_common.h"
diff --git a/libhb/hbavfilter.c b/libhb/hbavfilter.c
index 1669dab0b..5e050e28f 100644
--- a/libhb/hbavfilter.c
+++ b/libhb/hbavfilter.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "libavfilter/avfilter.h"
 #include "libavfilter/buffersrc.h"
diff --git a/libhb/hbffmpeg.c b/libhb/hbffmpeg.c
index e0168a8cb..af0707874 100644
--- a/libhb/hbffmpeg.c
+++ b/libhb/hbffmpeg.c
@@ -1,4 +1,4 @@
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 static int get_frame_type(int type)
diff --git a/libhb/lapsharp.c b/libhb/lapsharp.c
index e80a8480b..192b26721 100644
--- a/libhb/lapsharp.c
+++ b/libhb/lapsharp.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 #define LAPSHARP_STRENGTH_LUMA_DEFAULT   0.2
 #define LAPSHARP_STRENGTH_CHROMA_DEFAULT 0.2
diff --git a/libhb/mt_frame_filter.c b/libhb/mt_frame_filter.c
index d6afc923b..fd6bf780e 100644
--- a/libhb/mt_frame_filter.c
+++ b/libhb/mt_frame_filter.c
@@ -12,7 +12,7 @@
  * operate on each frame independently with no context carried over
  * from one frame to the next. */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "taskset.h"
 
 typedef struct
diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
index 4ce4841fe..1d630ebd2 100644
--- a/libhb/muxavformat.c
+++ b/libhb/muxavformat.c
@@ -12,7 +12,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 
-#include "hb.h"
+#include "handbrake.h"
 #include "ssautil.h"
 #include "lang.h"
 
diff --git a/libhb/muxcommon.c b/libhb/muxcommon.c
index 59a1f9457..a16a27a52 100644
--- a/libhb/muxcommon.c
+++ b/libhb/muxcommon.c
@@ -6,7 +6,7 @@
    It may be used under the terms of the GNU General Public License v2.
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
-#include "hb.h"
+#include "handbrake.h"
 #include "decssasub.h"
 
 #define MIN_BUFFERING (1024*1024*10)
diff --git a/libhb/nlmeans.c b/libhb/nlmeans.c
index e68e24739..d838e0575 100644
--- a/libhb/nlmeans.c
+++ b/libhb/nlmeans.c
@@ -50,7 +50,7 @@
  *        etc...
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "taskset.h"
 #include "nlmeans.h"
diff --git a/libhb/nlmeans_x86.c b/libhb/nlmeans_x86.c
index 4b18fcf85..131b81007 100644
--- a/libhb/nlmeans_x86.c
+++ b/libhb/nlmeans_x86.c
@@ -8,7 +8,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"     // needed for ARCH_X86
+#include "handbrake.h"     // needed for ARCH_X86
 
 #if defined(ARCH_X86)
 
diff --git a/libhb/nvenc_common.c b/libhb/nvenc_common.c
index 538ea4f39..fb711b0ed 100644
--- a/libhb/nvenc_common.c
+++ b/libhb/nvenc_common.c
@@ -8,7 +8,7 @@
  */
 
 #include "hbffmpeg.h"
-#include "hb.h"
+#include "handbrake.h"
 
 #if HB_PROJECT_FEATURE_NVENC
 #include <ffnvcodec/nvEncodeAPI.h>
diff --git a/libhb/platform/macosx/encca_aac.c b/libhb/platform/macosx/encca_aac.c
index 789a49e71..8d770c2e9 100644
--- a/libhb/platform/macosx/encca_aac.c
+++ b/libhb/platform/macosx/encca_aac.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "audio_remap.h"
 #include <AudioToolbox/AudioToolbox.h>
 #include <CoreAudio/CoreAudio.h>
diff --git a/libhb/platform/macosx/vt_common.c b/libhb/platform/macosx/vt_common.c
index 948ae52fd..51c0ff97c 100644
--- a/libhb/platform/macosx/vt_common.c
+++ b/libhb/platform/macosx/vt_common.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "vt_common.h"
 
 #include <VideoToolbox/VideoToolbox.h>
diff --git a/libhb/ports.c b/libhb/ports.c
index 0ad98ad53..6086aa628 100644
--- a/libhb/ports.c
+++ b/libhb/ports.c
@@ -88,7 +88,7 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#include "hb.h"
+#include "handbrake.h"
 #include "libavutil/cpu.h"
 
 /************************************************************************
diff --git a/libhb/preset.c b/libhb/preset.c
index f82dba7f4..b592a2bba 100644
--- a/libhb/preset.c
+++ b/libhb/preset.c
@@ -8,7 +8,7 @@
  */
 
 #include "preset_builtin.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_dict.h"
 #include "plist.h"
 #include "lang.h"
diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c
index b13fcbd96..9f7762159 100644
--- a/libhb/qsv_common.c
+++ b/libhb/qsv_common.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "hb.h"
+#include "handbrake.h"
 #include "ports.h"
 #include "common.h"
 #include "hb_dict.h"
@@ -2279,7 +2279,7 @@ void hb_qsv_force_workarounds()
 #undef FORCE_WORKAROUNDS
 }
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "libavfilter/avfilter.h"
 #include "libavfilter/buffersrc.h"
diff --git a/libhb/qsv_filter.c b/libhb/qsv_filter.c
index a8ad4ef3c..b330c78ad 100644
--- a/libhb/qsv_filter.c
+++ b/libhb/qsv_filter.c
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "qsv_filter.h"
 #include "qsv_libav.h"
diff --git a/libhb/qsv_filter_pp.c b/libhb/qsv_filter_pp.c
index 93c5acd7c..ddab314fd 100644
--- a/libhb/qsv_filter_pp.c
+++ b/libhb/qsv_filter_pp.c
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "qsv_filter_pp.h"
 #include "qsv_filter.h"
diff --git a/libhb/qsv_memory.c b/libhb/qsv_memory.c
index 69ce2426d..bb6c91a6c 100644
--- a/libhb/qsv_memory.c
+++ b/libhb/qsv_memory.c
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "qsv_memory.h"
 
diff --git a/libhb/reader.c b/libhb/reader.c
index c4487a5be..a0496a8f5 100644
--- a/libhb/reader.c
+++ b/libhb/reader.c
@@ -6,7 +6,7 @@
    It may be used under the terms of the GNU General Public License v2.
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
-#include "hb.h"
+#include "handbrake.h"
 
 static int  reader_init( hb_work_object_t * w, hb_job_t * job );
 static void reader_close( hb_work_object_t * w );
diff --git a/libhb/rendersub.c b/libhb/rendersub.c
index 3a26005f7..a909ce4f2 100644
--- a/libhb/rendersub.c
+++ b/libhb/rendersub.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include <ass/ass.h>
 
diff --git a/libhb/scan.c b/libhb/scan.c
index bd314e3db..97567c8b3 100644
--- a/libhb/scan.c
+++ b/libhb/scan.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 typedef struct
diff --git a/libhb/ssautil.c b/libhb/ssautil.c
index 108b46f89..291620dfe 100644
--- a/libhb/ssautil.c
+++ b/libhb/ssautil.c
@@ -8,7 +8,7 @@
  */
 #include <stdio.h>
 #include <ctype.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "ssautil.h"
 
 struct hb_subtitle_style_s
diff --git a/libhb/stream.c b/libhb/stream.c
index b3f8d3076..aaeaf022e 100644
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -11,7 +11,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "lang.h"
 #include "libbluray/bluray.h"
diff --git a/libhb/sync.c b/libhb/sync.c
index 5ff7f1e17..0af052471 100644
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include <stdio.h>
 #include "audio_resample.h"
diff --git a/libhb/taskset.c b/libhb/taskset.c
index add7a4478..dc7809995 100644
--- a/libhb/taskset.c
+++ b/libhb/taskset.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "ports.h"
 #include "taskset.h"
 
diff --git a/libhb/unsharp.c b/libhb/unsharp.c
index 0206283c4..f47c6a1bd 100644
--- a/libhb/unsharp.c
+++ b/libhb/unsharp.c
@@ -8,7 +8,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 #define UNSHARP_STRENGTH_LUMA_DEFAULT 0.25
 #define UNSHARP_SIZE_LUMA_DEFAULT 7
diff --git a/libhb/vce_common.c b/libhb/vce_common.c
index 8223e5671..da0476a64 100644
--- a/libhb/vce_common.c
+++ b/libhb/vce_common.c
@@ -13,7 +13,7 @@
 #include "AMF/core/Factory.h"
 #include "AMF/components/VideoEncoderVCE.h"
 #include "AMF/components/VideoEncoderHEVC.h"
-#include "hb.h"
+#include "handbrake.h"
 
 AMF_RESULT check_component_available(const wchar_t *componentID)
 {
diff --git a/libhb/vfr.c b/libhb/vfr.c
index 460f5eb14..a42a5342e 100644
--- a/libhb/vfr.c
+++ b/libhb/vfr.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 //#define HB_DEBUG_CFR_DROPS 1
 #define MAX_FRAME_ANALYSIS_DEPTH 10
diff --git a/libhb/work.c b/libhb/work.c
index 2675a073b..7d096aca5 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "libavformat/avformat.h"
 #include "decomb.h"
 #include "hbavfilter.h"
diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m
index 14ef1afdd..0d825ddf6 100644
--- a/macosx/HBAudio.m
+++ b/macosx/HBAudio.m
@@ -17,7 +17,7 @@
 #import "HBLocalizationUtilities.h"
 #import "HBJob+Private.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 #define NONE_TRACK_INDEX 0
 
diff --git a/macosx/HBAudioDefaults.m b/macosx/HBAudioDefaults.m
index 3041927a1..ac05c2b25 100644
--- a/macosx/HBAudioDefaults.m
+++ b/macosx/HBAudioDefaults.m
@@ -9,7 +9,7 @@
 #import "HBCodingUtilities.h"
 #import "HBMutablePreset.h"
 
-#import "hb.h"
+#import "handbrake.h"
 #import "lang.h"
 
 @interface HBAudioDefaults ()
diff --git a/macosx/HBAudioTrack.m b/macosx/HBAudioTrack.m
index 52f0bb53e..0ac7f619d 100644
--- a/macosx/HBAudioTrack.m
+++ b/macosx/HBAudioTrack.m
@@ -9,7 +9,7 @@
 #import "HBJob.h"
 #import "HBCodingUtilities.h"
 #import "HBTitle.h"
-#import "hb.h"
+#import "handbrake.h"
 
 #define DEFAULT_SAMPLERATE 48000
 
diff --git a/macosx/HBAudioTrackPreset.m b/macosx/HBAudioTrackPreset.m
index 5ac0bbef8..ea286c3f4 100644
--- a/macosx/HBAudioTrackPreset.m
+++ b/macosx/HBAudioTrackPreset.m
@@ -6,7 +6,7 @@
 
 #import "HBAudioTrackPreset.h"
 #import "HBCodingUtilities.h"
-#include "hb.h"
+#include "handbrake.h"
 
 #define DEFAULT_SAMPLERATE 48000
 
diff --git a/macosx/HBAudioTransformers.m b/macosx/HBAudioTransformers.m
index c282cb13d..95cd66116 100644
--- a/macosx/HBAudioTransformers.m
+++ b/macosx/HBAudioTransformers.m
@@ -6,7 +6,7 @@
 
 #import "HBAudioTransformers.h"
 #import "HBLocalizationUtilities.h"
-#include "hb.h"
+#include "handbrake.h"
 
 #pragma mark - Value Transformers
 
diff --git a/macosx/HBFilters+UIAdditions.m b/macosx/HBFilters+UIAdditions.m
index b5472a42e..d76f25feb 100644
--- a/macosx/HBFilters+UIAdditions.m
+++ b/macosx/HBFilters+UIAdditions.m
@@ -7,7 +7,7 @@
 #import "HBFilters+UIAdditions.h"
 #import "HBLocalizationUtilities.h"
 
-#import "hb.h"
+#import "handbrake.h"
 
 /**
  *  Converts a hb_filter_param_t * array to a NSArray of NSString.
diff --git a/macosx/HBFilters.m b/macosx/HBFilters.m
index 08c0a5a2d..d969d82ab 100644
--- a/macosx/HBFilters.m
+++ b/macosx/HBFilters.m
@@ -10,7 +10,7 @@
 #import "NSDictionary+HBAdditions.h"
 #import "HBMutablePreset.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 NSString * const HBFiltersChangedNotification = @"HBFiltersChangedNotification";
 
diff --git a/macosx/HBImageUtilities.m b/macosx/HBImageUtilities.m
index d5858c60d..61d1fcfae 100644
--- a/macosx/HBImageUtilities.m
+++ b/macosx/HBImageUtilities.m
@@ -6,7 +6,7 @@
 
 #import "HBImageUtilities.h"
 #import <Cocoa/Cocoa.h>
-#include "hb.h"
+#include "handbrake.h"
 
 CGImageRef CreateScaledCGImageFromCGImage(CGImageRef image, CGFloat thumbnailHeight)
 {
diff --git a/macosx/HBJob+HBAdditions.m b/macosx/HBJob+HBAdditions.m
index 9d10c52d6..552b8570e 100644
--- a/macosx/HBJob+HBAdditions.m
+++ b/macosx/HBJob+HBAdditions.m
@@ -6,7 +6,7 @@
 
 #import "HBJob+HBAdditions.h"
 #import "HBPreferencesKeys.h"
-#import "hb.h"
+#import "handbrake.h"
 
 static NSDateFormatter *_timeFormatter = nil;
 static NSDateFormatter *_dateFormatter = nil;
diff --git a/macosx/HBJob+HBJobConversion.h b/macosx/HBJob+HBJobConversion.h
index 58e51e5bc..fdbca64e4 100644
--- a/macosx/HBJob+HBJobConversion.h
+++ b/macosx/HBJob+HBJobConversion.h
@@ -6,7 +6,7 @@
 
 #import <Foundation/Foundation.h>
 #import "HBJob.h"
-#include "hb.h"
+#include "handbrake.h"
 
 @interface HBJob (HBJobConversion)
 
diff --git a/macosx/HBJob+UIAdditions.m b/macosx/HBJob+UIAdditions.m
index fdfddee6a..3ce379eed 100644
--- a/macosx/HBJob+UIAdditions.m
+++ b/macosx/HBJob+UIAdditions.m
@@ -20,7 +20,7 @@
 
 #import "HBLocalizationUtilities.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 // Text Styles
 static NSDictionary            *detailAttr;
diff --git a/macosx/HBJob.m b/macosx/HBJob.m
index bde7ffa2e..5960ee51b 100644
--- a/macosx/HBJob.m
+++ b/macosx/HBJob.m
@@ -17,7 +17,7 @@
 #import "HBUtilities.h"
 #import "HBSecurityAccessToken.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 NSString *HBContainerChangedNotification = @"HBContainerChangedNotification";
 NSString *HBChaptersChangedNotification  = @"HBChaptersChangedNotification";
diff --git a/macosx/HBPicture+UIAdditions.m b/macosx/HBPicture+UIAdditions.m
index 421abd1a5..9250d0211 100644
--- a/macosx/HBPicture+UIAdditions.m
+++ b/macosx/HBPicture+UIAdditions.m
@@ -8,7 +8,7 @@
 #import "HBTitle.h"
 #import "HBLocalizationUtilities.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 @implementation HBPicture (UIAdditions)
 
diff --git a/macosx/HBPicture.m b/macosx/HBPicture.m
index 6650fd60d..6048714d1 100644
--- a/macosx/HBPicture.m
+++ b/macosx/HBPicture.m
@@ -10,7 +10,7 @@
 #import "HBCodingUtilities.h"
 #import "HBMutablePreset.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 NSString * const HBPictureChangedNotification = @"HBPictureChangedNotification";
 
diff --git a/macosx/HBStateFormatter+Private.h b/macosx/HBStateFormatter+Private.h
index ee71b8141..e7d2e3624 100644
--- a/macosx/HBStateFormatter+Private.h
+++ b/macosx/HBStateFormatter+Private.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "HBStateFormatter.h"
-#include "hb.h"
+#include "handbrake.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/macosx/HBStateFormatter.m b/macosx/HBStateFormatter.m
index 876b10d41..39b69a6b2 100644
--- a/macosx/HBStateFormatter.m
+++ b/macosx/HBStateFormatter.m
@@ -6,7 +6,7 @@
 
 #import "HBStateFormatter.h"
 #import "HBLocalizationUtilities.h"
-#include "hb.h"
+#include "handbrake.h"
 
 @implementation HBStateFormatter
 
diff --git a/macosx/HBTitle+Private.h b/macosx/HBTitle+Private.h
index b55854e22..7afb7defc 100644
--- a/macosx/HBTitle+Private.h
+++ b/macosx/HBTitle+Private.h
@@ -7,7 +7,7 @@
 #import <Foundation/Foundation.h>
 #import "HBTitle.h"
 #import "HBPreset.h"
-#include "hb.h"
+#include "handbrake.h"
 
 @interface HBTitle (Private)
 
diff --git a/macosx/HBVideo+UIAdditions.m b/macosx/HBVideo+UIAdditions.m
index 4db1bb228..a2c1b4d39 100644
--- a/macosx/HBVideo+UIAdditions.m
+++ b/macosx/HBVideo+UIAdditions.m
@@ -8,7 +8,7 @@
 #import "HBJob+Private.h"
 #import "HBLocalizationUtilities.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 @implementation HBVideo (UIAdditions)
 
diff --git a/macosx/HBVideo.m b/macosx/HBVideo.m
index c4fc5f0da..815292157 100644
--- a/macosx/HBVideo.m
+++ b/macosx/HBVideo.m
@@ -9,7 +9,7 @@
 #import "HBCodingUtilities.h"
 #import "HBMutablePreset.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
 
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index f025c225f..f96e2958f 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -1861,7 +1861,7 @@
 			);
 			outputPaths = (
 				"$(EXTERNAL_BUILD)/libhb/hb_dict.h",
-				"$(EXTERNAL_BUILD)/libhb/hb.h",
+				"$(EXTERNAL_BUILD)/libhb/handbrake.h",
 				"$(EXTERNAL_BUILD)/macosx/Info.plist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/macosx/HandBrakeKitTests/HBDictTests.m b/macosx/HandBrakeKitTests/HBDictTests.m
index 905426488..00a2099d7 100644
--- a/macosx/HandBrakeKitTests/HBDictTests.m
+++ b/macosx/HandBrakeKitTests/HBDictTests.m
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 #import "NSDictionary+HBAdditions.h"
-#include "hb.h"
+#include "handbrake.h"
 
 @interface HBDictTests : XCTestCase
 
diff --git a/test/parsecsv.c b/test/parsecsv.c
index bf343baa8..b777d1dab 100644
--- a/test/parsecsv.c
+++ b/test/parsecsv.c
@@ -8,7 +8,7 @@
  */
 
 #include <fcntl.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "parsecsv.h"
 
 /* Internal declarations */
diff --git a/test/test.c b/test/test.c
index 19fdb86ec..c4abe7687 100644
--- a/test/test.c
+++ b/test/test.c
@@ -30,7 +30,7 @@
 #include <pthread.h>
 #endif
 
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 #include "parsecsv.h"