120 files changed, 264 insertions, 268 deletions
diff --git a/libhb/audio_remap.c b/libhb/audio_remap.c
index b480a69dd..e44a9572c 100644
--- a/libhb/audio_remap.c
+++ b/libhb/audio_remap.c
@@ -7,9 +7,9 @@
  * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "hbffmpeg.h"
-#include "audio_remap.h"
+#include "handbrake/common.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/audio_remap.h"
 
 // source: libavutil/channel_layout.h
 hb_chan_map_t hb_libav_chan_map =
diff --git a/libhb/audio_resample.c b/libhb/audio_resample.c
index d415b574a..3c1bb6f00 100644
--- a/libhb/audio_resample.c
+++ b/libhb/audio_resample.c
@@ -7,9 +7,9 @@
  * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "hbffmpeg.h"
-#include "audio_resample.h"
+#include "handbrake/common.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/audio_resample.h"
 
 hb_audio_resample_t* hb_audio_resample_init(enum AVSampleFormat sample_fmt,
                                             int sample_rate,
diff --git a/libhb/avfilter.c b/libhb/avfilter.c
index d7fe4ea04..64dab8371 100644
--- a/libhb/avfilter.c
+++ b/libhb/avfilter.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "hbavfilter.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/hbavfilter.h"
+#include "handbrake/avfilter_priv.h"
 
 static int  avfilter_init(hb_filter_object_t * filter, hb_filter_init_t * init);
 static int  avfilter_post_init( hb_filter_object_t * filter, hb_job_t * job );
diff --git a/libhb/batch.c b/libhb/batch.c
index ca61d3932..d633d83b8 100644
--- a/libhb/batch.c
+++ b/libhb/batch.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
  
-#include "handbrake.h"
-#include "lang.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/lang.h"
 
 struct hb_batch_s
 {
diff --git a/libhb/bd.c b/libhb/bd.c
index ba230d98f..c5a41c7fc 100644
--- a/libhb/bd.c
+++ b/libhb/bd.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "lang.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/lang.h"
+#include "handbrake/hbffmpeg.h"
 
 #include "libbluray/bluray.h"
 
diff --git a/libhb/chroma_smooth.c b/libhb/chroma_smooth.c
index 0cbfbeea1..1b14dc8cb 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 "handbrake.h"
+#include "handbrake/handbrake.h"
 
 #define CHROMA_SMOOTH_STRENGTH_DEFAULT 0.25
 #define CHROMA_SMOOTH_SIZE_DEFAULT 7
diff --git a/libhb/colormap.c b/libhb/colormap.c
index 071af4d88..862036254 100644
--- a/libhb/colormap.c
+++ b/libhb/colormap.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <strings.h>
-#include "colormap.h"
+#include "handbrake/colormap.h"
 
 typedef struct
 {
diff --git a/libhb/colorspace.c b/libhb/colorspace.c
index 581886561..2e94fc045 100644
--- a/libhb/colorspace.c
+++ b/libhb/colorspace.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/avfilter_priv.h"
 
 static int colorspace_init(hb_filter_object_t * filter,
                            hb_filter_init_t * init);
diff --git a/libhb/comb_detect.c b/libhb/comb_detect.c
index 6bd922398..b0917cb9c 100644
--- a/libhb/comb_detect.c
+++ b/libhb/comb_detect.c
@@ -28,8 +28,8 @@ Original "Faster" settings:
 #define FILTER_CLASSIC 1
 #define FILTER_ERODE_DILATE 2
 
-#include "handbrake.h"
-#include "taskset.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/taskset.h"
 
 typedef struct decomb_thread_arg_s {
     hb_filter_private_t *pv;
diff --git a/libhb/common.c b/libhb/common.c
index a3edef84a..f7fb9dbb5 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -12,15 +12,15 @@
 #include <ctype.h>
 #include <sys/time.h>
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "x264.h"
-#include "lang.h"
-#include "common.h"
-#include "h264_common.h"
-#include "h265_common.h"
-#include "encx264.h"
+#include "handbrake/lang.h"
+#include "handbrake/common.h"
+#include "handbrake/h264_common.h"
+#include "handbrake/h265_common.h"
+#include "handbrake/encx264.h"
 #if HB_PROJECT_FEATURE_QSV
-#include "qsv_common.h"
+#include "handbrake/qsv_common.h"
 #endif
 
 #if HB_PROJECT_FEATURE_X265
@@ -32,10 +32,10 @@
 #endif
 
 #if HB_PROJECT_FEATURE_NVENC
-#include "nvenc_common.h"
+#include "handbrake/nvenc_common.h"
 #endif
 #if HB_PROJECT_FEATURE_VCE
-#include "vce_common.h"
+#include "handbrake/vce_common.h"
 #endif
 
 #ifdef __APPLE__
diff --git a/libhb/compat.c b/libhb/compat.c
index 67a5dba7e..fd69dec8b 100644
--- a/libhb/compat.c
+++ b/libhb/compat.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 "compat.h"
+#include "handbrake/compat.h"
 
 #ifdef HB_NEED_STRTOK_R
 #include <string.h>
diff --git a/libhb/cropscale.c b/libhb/cropscale.c
index 09af92e09..10e7d01c9 100644
--- a/libhb/cropscale.c
+++ b/libhb/cropscale.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/avfilter_priv.h"
 
 static int crop_scale_init(hb_filter_object_t * filter,
                            hb_filter_init_t * init);
diff --git a/libhb/deblock.c b/libhb/deblock.c
index 31efc1d15..42627b48c 100644
--- a/libhb/deblock.c
+++ b/libhb/deblock.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/avfilter_priv.h"
 
 static int deblock_init(hb_filter_object_t * filter, hb_filter_init_t * init);
 
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index f705d7035..4c4fb3446 100644
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -38,20 +38,20 @@
     VC1 decoder) can't easily be used by the HB mpeg stream reader.
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "hbavfilter.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/hbavfilter.h"
 #include "libavfilter/avfilter.h"
 #include "libavfilter/buffersrc.h"
 #include "libavfilter/buffersink.h"
 #include "libavutil/hwcontext.h"
-#include "lang.h"
-#include "audio_resample.h"
+#include "handbrake/lang.h"
+#include "handbrake/audio_resample.h"
 
 #if HB_PROJECT_FEATURE_QSV
 #include "libavutil/hwcontext_qsv.h"
-#include "qsv_common.h"
-#include "qsv_libav.h"
+#include "handbrake/qsv_common.h"
+#include "handbrake/qsv_libav.h"
 #endif
 
 static void compute_frame_duration( hb_work_private_t *pv );
diff --git a/libhb/deccc608sub.c b/libhb/deccc608sub.c
index e0defc785..6a6a8494d 100644
--- a/libhb/deccc608sub.c
+++ b/libhb/deccc608sub.c
@@ -13,8 +13,8 @@
  *
  * Note that the SRT sub generation from CC could be useful for mkv subs.
  */
-#include "handbrake.h"
-#include "deccc608sub.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/deccc608sub.h"
 
 #define SSA_PREAMBLE_LEN 24
 /*
diff --git a/libhb/declpcm.c b/libhb/declpcm.c
index 1c322c568..cf2f99de3 100644
--- a/libhb/declpcm.c
+++ b/libhb/declpcm.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "audio_resample.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/audio_resample.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/decomb.c b/libhb/decomb.c
index 13adfd01c..3721f9a59 100644
--- a/libhb/decomb.c
+++ b/libhb/decomb.c
@@ -54,11 +54,11 @@ which will feed EEDI2 interpolations to yadif.
 12-15: EEDI2 will override cubic interpolation
 *****/
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "eedi2.h"
-#include "taskset.h"
-#include "decomb.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/eedi2.h"
+#include "handbrake/taskset.h"
+#include "handbrake/decomb.h"
 
 #define PARITY_DEFAULT   -1
 
diff --git a/libhb/decpgssub.c b/libhb/decpgssub.c
index cafc4cf5c..c7120484a 100644
--- a/libhb/decpgssub.c
+++ b/libhb/decpgssub.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
  
-#include "handbrake.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/decsrtsub.c b/libhb/decsrtsub.c
index 303387c32..35aa9c157 100644
--- a/libhb/decsrtsub.c
+++ b/libhb/decsrtsub.c
@@ -12,9 +12,9 @@
 #include <string.h>
 #include <iconv.h>
 #include <errno.h>
-#include "handbrake.h"
-#include "colormap.h"
-#include "decsrtsub.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/colormap.h"
+#include "handbrake/decsrtsub.h"
 
 struct start_and_end {
     unsigned long start, end;
diff --git a/libhb/decssasub.c b/libhb/decssasub.c
index 9729e6863..b5d8339b9 100644
--- a/libhb/decssasub.c
+++ b/libhb/decssasub.c
@@ -26,11 +26,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 
 #include <ass/ass.h>
-#include "decssasub.h"
-#include "colormap.h"
+#include "handbrake/decssasub.h"
+#include "handbrake/colormap.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/dectx3gsub.c b/libhb/dectx3gsub.c
index 49ea0e9b7..f2f5d4eea 100644
--- a/libhb/dectx3gsub.c
+++ b/libhb/dectx3gsub.c
@@ -19,8 +19,8 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "handbrake.h"
-#include "colormap.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/colormap.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/decutf8sub.c b/libhb/decutf8sub.c
index 45f522c22..c3336d1ab 100644
--- a/libhb/decutf8sub.c
+++ b/libhb/decutf8sub.c
@@ -18,8 +18,8 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "handbrake.h"
-#include "decsrtsub.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/decsrtsub.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/decvobsub.c b/libhb/decvobsub.c
index 4a6a6ec94..be64a9013 100644
--- a/libhb/decvobsub.c
+++ b/libhb/decvobsub.c
@@ -27,7 +27,7 @@
  *   }
  */
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/deinterlace.c b/libhb/deinterlace.c
index de91a8202..4ab1c1d16 100644
--- a/libhb/deinterlace.c
+++ b/libhb/deinterlace.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "decomb.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/decomb.h"
+#include "handbrake/avfilter_priv.h"
 
 static int deinterlace_init(hb_filter_object_t * filter,
                             hb_filter_init_t * init);
diff --git a/libhb/demuxmpeg.c b/libhb/demuxmpeg.c
index 09a9325b0..e76578586 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 "handbrake.h"
+#include "handbrake/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 0da2bf8af..b43acaa84 100644
--- a/libhb/denoise.c
+++ b/libhb/denoise.c
@@ -17,8 +17,8 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
 
 #define HQDN3D_SPATIAL_LUMA_DEFAULT    4.0f
 #define HQDN3D_SPATIAL_CHROMA_DEFAULT  3.0f
diff --git a/libhb/detelecine.c b/libhb/detelecine.c
index 2d2026124..3d8283876 100644
--- a/libhb/detelecine.c
+++ b/libhb/detelecine.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
 
 /*
  *
diff --git a/libhb/dvd.c b/libhb/dvd.c
index 9b1c6fca0..2ae506c7d 100644
--- a/libhb/dvd.c
+++ b/libhb/dvd.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "lang.h"
-#include "dvd.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/lang.h"
+#include "handbrake/dvd.h"
 
 #include "dvdread/ifo_read.h"
 #include "dvdread/ifo_print.h"
diff --git a/libhb/dvdnav.c b/libhb/dvdnav.c
index 72833fcd4..52a48adfe 100644
--- a/libhb/dvdnav.c
+++ b/libhb/dvdnav.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "lang.h"
-#include "dvd.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/lang.h"
+#include "handbrake/dvd.h"
 
 #include "dvdnav/dvdnav.h"
 #include "dvdread/ifo_read.h"
diff --git a/libhb/eedi2.c b/libhb/eedi2.c
index e531ea96a..92606183f 100644
--- a/libhb/eedi2.c
+++ b/libhb/eedi2.c
@@ -10,8 +10,8 @@
    http://web.missouri.edu/~kes25c/
 */
 
-#include "handbrake.h"
-#include "eedi2.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/eedi2.h"
 
 /**
  * EEDI2 directional limit lookup table
diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c
index 0b4f78a68..750bd35f2 100644
--- a/libhb/enc_qsv.c
+++ b/libhb/enc_qsv.c
@@ -26,16 +26,16 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 \* ********************************************************************* */
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "handbrake.h"
-#include "nal_units.h"
-#include "qsv_common.h"
-#include "qsv_memory.h"
-#include "h264_common.h"
-#include "h265_common.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/nal_units.h"
+#include "handbrake/qsv_common.h"
+#include "handbrake/qsv_memory.h"
+#include "handbrake/h264_common.h"
+#include "handbrake/h265_common.h"
 
 #include "libavutil/hwcontext_qsv.h"
 #include "libavutil/hwcontext.h"
diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
index 99bf4010b..1c949249c 100644
--- a/libhb/encavcodec.c
+++ b/libhb/encavcodec.c
@@ -7,12 +7,12 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hb_dict.h"
-#include "hbffmpeg.h"
-#include "h264_common.h"
-#include "h265_common.h"
-#include "nal_units.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hb_dict.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/h264_common.h"
+#include "handbrake/h265_common.h"
+#include "handbrake/nal_units.h"
 
 /*
  * The frame info struct remembers information about each frame across calls
diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
index 29117ded6..7c81d1736 100644
--- a/libhb/encavcodecaudio.c
+++ b/libhb/encavcodecaudio.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/enctheora.c b/libhb/enctheora.c
index 429f8e2fa..7a3f969c8 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 "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "theora/codec.h"
 #include "theora/theoraenc.h"
 
diff --git a/libhb/encvobsub.c b/libhb/encvobsub.c
index 0650f3501..33b611ed0 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 "handbrake.h"
+#include "handbrake/handbrake.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/encvorbis.c b/libhb/encvorbis.c
index 3d521e3ea..92f24a13f 100644
--- a/libhb/encvorbis.c
+++ b/libhb/encvorbis.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "audio_remap.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/audio_remap.h"
 
 #include "vorbis/vorbisenc.h"
 
diff --git a/libhb/encx264.c b/libhb/encx264.c
index b0f6781bc..a94eb066e 100644
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -9,9 +9,9 @@
 
 #include <stdarg.h>
 
-#include "handbrake.h"
-#include "hb_dict.h"
-#include "encx264.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hb_dict.h"
+#include "handbrake/encx264.h"
 
 int  encx264Init( hb_work_object_t *, hb_job_t * );
 int  encx264Work( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
diff --git a/libhb/encx265.c b/libhb/encx265.c
index 39e912737..025f80120 100644
--- a/libhb/encx265.c
+++ b/libhb/encx265.c
@@ -7,13 +7,13 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_X265
 
-#include "handbrake.h"
-#include "hb_dict.h"
-#include "h265_common.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hb_dict.h"
+#include "handbrake/h265_common.h"
 #include "x265.h"
 
 int  encx265Init (hb_work_object_t*, hb_job_t*);
diff --git a/libhb/fifo.c b/libhb/fifo.c
index 1bc89f823..1ded249fc 100644
--- a/libhb/fifo.c
+++ b/libhb/fifo.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #if HB_PROJECT_FEATURE_QSV
-#include "qsv_libav.h"
+#include "handbrake/qsv_libav.h"
 #endif
 
 #ifndef SYS_DARWIN
diff --git a/libhb/grayscale.c b/libhb/grayscale.c
index 1608f8f45..d8de86224 100644
--- a/libhb/grayscale.c
+++ b/libhb/grayscale.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "taskset.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/taskset.h"
 
 // Settings:
 //  This filter has no settings.
diff --git a/libhb/audio_remap.h b/libhb/handbrake/audio_remap.h
index d8f1ed3b6..d8f1ed3b6 100644
--- a/libhb/audio_remap.h
+++ b/libhb/handbrake/audio_remap.h
diff --git a/libhb/audio_resample.h b/libhb/handbrake/audio_resample.h
index 103237758..103237758 100644
--- a/libhb/audio_resample.h
+++ b/libhb/handbrake/audio_resample.h
diff --git a/libhb/avfilter_priv.h b/libhb/handbrake/avfilter_priv.h
index 8c6b0a627..20e616cc2 100644
--- a/libhb/avfilter_priv.h
+++ b/libhb/handbrake/avfilter_priv.h
@@ -11,7 +11,7 @@
 #define HB_AVFILTER_PRIV_H
 
 #include "libavfilter/avfilter.h"
-#include "hbavfilter.h"
+#include "handbrake/hbavfilter.h"
 
 struct hb_filter_private_s
 {
diff --git a/libhb/bits.h b/libhb/handbrake/bits.h
index 8785f4b5c..8785f4b5c 100644
--- a/libhb/bits.h
+++ b/libhb/handbrake/bits.h
diff --git a/libhb/colormap.h b/libhb/handbrake/colormap.h
index 7ea9ac57c..7ea9ac57c 100644
--- a/libhb/colormap.h
+++ b/libhb/handbrake/colormap.h
diff --git a/libhb/common.h b/libhb/handbrake/common.h
index cd66d6f16..8ab21fa8a 100644
--- a/libhb/common.h
+++ b/libhb/handbrake/common.h
@@ -10,9 +10,9 @@
 #ifndef HB_COMMON_H
 #define HB_COMMON_H
 
-#include "project.h"
-#include "hbtypes.h"
-#include "hb_dict.h"
+#include "handbrake/project.h"
+#include "handbrake/hbtypes.h"
+#include "handbrake/hb_dict.h"
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libhb/compat.h b/libhb/handbrake/compat.h
index f8ab40614..f8ab40614 100644
--- a/libhb/compat.h
+++ b/libhb/handbrake/compat.h
diff --git a/libhb/deccc608sub.h b/libhb/handbrake/deccc608sub.h
index 14f98c25d..044fc78f7 100644
--- a/libhb/deccc608sub.h
+++ b/libhb/handbrake/deccc608sub.h
@@ -13,7 +13,7 @@
 #ifndef __DECCC608SUB_H__
 #define __DECCC608SUB_H__
 
-#include "common.h"
+#include "handbrake/common.h"
 
 struct s_write;
 
diff --git a/libhb/decomb.h b/libhb/handbrake/decomb.h
index 181bb8ad3..181bb8ad3 100644
--- a/libhb/decomb.h
+++ b/libhb/handbrake/decomb.h
diff --git a/libhb/decsrtsub.h b/libhb/handbrake/decsrtsub.h
index d38357d25..d38357d25 100644
--- a/libhb/decsrtsub.h
+++ b/libhb/handbrake/decsrtsub.h
diff --git a/libhb/decssasub.h b/libhb/handbrake/decssasub.h
index 19c7ce633..19c7ce633 100644
--- a/libhb/decssasub.h
+++ b/libhb/handbrake/decssasub.h
diff --git a/libhb/dvd.h b/libhb/handbrake/dvd.h
index 7ac673ca0..7ac673ca0 100644
--- a/libhb/dvd.h
+++ b/libhb/handbrake/dvd.h
diff --git a/libhb/eedi2.h b/libhb/handbrake/eedi2.h
index e524092f0..e524092f0 100644
--- a/libhb/eedi2.h
+++ b/libhb/handbrake/eedi2.h
diff --git a/libhb/encx264.h b/libhb/handbrake/encx264.h
index 75b98675b..29085e50c 100644
--- a/libhb/encx264.h
+++ b/libhb/handbrake/encx264.h
@@ -11,7 +11,7 @@
 #define HB_ENCX264_H
 
 #include "x264.h"
-#include "h264_common.h"
+#include "handbrake/h264_common.h"
 
 /* x264 preferred option names (left) and synonyms (right).
  * The "preferred" names match names used in x264's param2string function more
diff --git a/libhb/h264_common.h b/libhb/handbrake/h264_common.h
index afe240113..afe240113 100644
--- a/libhb/h264_common.h
+++ b/libhb/handbrake/h264_common.h
diff --git a/libhb/h265_common.h b/libhb/handbrake/h265_common.h
index 067b652e5..8b5c1072d 100644
--- a/libhb/h265_common.h
+++ b/libhb/handbrake/h265_common.h
@@ -10,7 +10,7 @@
 #ifndef HB_H265_COMMON_H
 #define HB_H265_COMMON_H
 
-#include "project.h"
+#include "handbrake/project.h"
 
 // inspired by libavcodec/hevc.h
 // in HEVC, all "random access point" NAL units are keyframes
diff --git a/libhb/handbrake.h b/libhb/handbrake/handbrake.h
index 9cf744476..6143316d5 100644
--- a/libhb/handbrake.h
+++ b/libhb/handbrake/handbrake.h
@@ -14,14 +14,14 @@
 extern "C" {
 #endif
 
-#include "common.h"
-#include "project.h"
-#include "compat.h"
-#include "hb_json.h"
-#include "preset.h"
-#include "plist.h"
-#include "param.h"
-#include "colormap.h"
+#include "handbrake/common.h"
+#include "handbrake/project.h"
+#include "handbrake/compat.h"
+#include "handbrake/hb_json.h"
+#include "handbrake/preset.h"
+#include "handbrake/plist.h"
+#include "handbrake/param.h"
+#include "handbrake/colormap.h"
 
 /* hb_init()
    Initializes a libhb session (launches his own thread, detects CPUs,
diff --git a/libhb/hb_dict.h b/libhb/handbrake/hb_dict.h
index 3984d1a0d..5d8a188e0 100644
--- a/libhb/hb_dict.h
+++ b/libhb/handbrake/hb_dict.h
@@ -9,7 +9,7 @@
 #if !defined(HB_DICT_H)
 #define HB_DICT_H
 
-#include "hbtypes.h"
+#include "handbrake/hbtypes.h"
 #include <jansson.h>
 
 #define HB_VALUE_TYPE_DICT      JSON_OBJECT
diff --git a/libhb/hb_json.h b/libhb/handbrake/hb_json.h
index 8f8a08cbc..aac3223f7 100644
--- a/libhb/hb_json.h
+++ b/libhb/handbrake/hb_json.h
@@ -14,7 +14,7 @@
 extern "C" {
 #endif
 
-#include "common.h"
+#include "handbrake/common.h"
 
 hb_dict_t  * hb_state_to_dict( hb_state_t * state);
 hb_dict_t  * hb_job_to_dict( const hb_job_t * job );
diff --git a/libhb/hbavfilter.h b/libhb/handbrake/hbavfilter.h
index 1495d3b41..319b48871 100644
--- a/libhb/hbavfilter.h
+++ b/libhb/handbrake/hbavfilter.h
@@ -10,7 +10,7 @@
 #ifndef HB_AVFILTER_H
 #define HB_AVFILTER_H
 
-#include "common.h"
+#include "handbrake/common.h"
 
 typedef struct hb_avfilter_graph_s hb_avfilter_graph_t;
 
diff --git a/libhb/hbffmpeg.h b/libhb/handbrake/hbffmpeg.h
index 119347153..6357dcd9c 100644
--- a/libhb/hbffmpeg.h
+++ b/libhb/handbrake/hbffmpeg.h
@@ -21,7 +21,7 @@
 #include "libavutil/display.h"
 #include "libswscale/swscale.h"
 #include "libswresample/swresample.h"
-#include "common.h"
+#include "handbrake/common.h"
 
 #define HB_FFMPEG_THREADS_AUTO (-1) // let hb_avcodec_open() decide thread_count
 
diff --git a/libhb/hbtypes.h b/libhb/handbrake/hbtypes.h
index 127f9d50c..127f9d50c 100644
--- a/libhb/hbtypes.h
+++ b/libhb/handbrake/hbtypes.h
diff --git a/libhb/internal.h b/libhb/handbrake/internal.h
index e642c2d2c..93ae27dca 100644
--- a/libhb/internal.h
+++ b/libhb/handbrake/internal.h
@@ -10,10 +10,10 @@
 #ifndef HB_INTERNAL_H
 #define HB_INTERNAL_H
 
-#include "project.h"
-#include "hbffmpeg.h"
+#include "handbrake/project.h"
+#include "handbrake/hbffmpeg.h"
 #if HB_PROJECT_FEATURE_QSV
-#include "qsv_libav.h"
+#include "handbrake/qsv_libav.h"
 #endif
 
 /***********************************************************************
diff --git a/libhb/lang.h b/libhb/handbrake/lang.h
index 9017de066..9017de066 100644
--- a/libhb/lang.h
+++ b/libhb/handbrake/lang.h
diff --git a/libhb/nal_units.h b/libhb/handbrake/nal_units.h
index 210419041..0efccc476 100644
--- a/libhb/nal_units.h
+++ b/libhb/handbrake/nal_units.h
@@ -12,7 +12,7 @@
 
 #include <stdint.h>
 
-#include "common.h"
+#include "handbrake/common.h"
 
 /*
  * Write a NAL unit of the specified size to the provided
diff --git a/libhb/nlmeans.h b/libhb/handbrake/nlmeans.h
index 3ed4d7461..3ed4d7461 100644
--- a/libhb/nlmeans.h
+++ b/libhb/handbrake/nlmeans.h
diff --git a/libhb/nvenc_common.h b/libhb/handbrake/nvenc_common.h
index f7873b882..f7873b882 100644
--- a/libhb/nvenc_common.h
+++ b/libhb/handbrake/nvenc_common.h
diff --git a/libhb/param.h b/libhb/handbrake/param.h
index 378c5e578..378c5e578 100644
--- a/libhb/param.h
+++ b/libhb/handbrake/param.h
diff --git a/libhb/plist.h b/libhb/handbrake/plist.h
index e33d7fc33..12b51dd2e 100644
--- a/libhb/plist.h
+++ b/libhb/handbrake/plist.h
@@ -11,7 +11,7 @@
 #define _HB_PLIST_H_
 
 #include <stdio.h>
-#include "hb_dict.h"
+#include "handbrake/hb_dict.h"
 
 hb_value_t * hb_plist_parse(const char *buf, size_t len);
 hb_value_t * hb_plist_parse_file(const char *filename);
diff --git a/libhb/ports.h b/libhb/handbrake/ports.h
index e1eef623d..6b793da28 100644
--- a/libhb/ports.h
+++ b/libhb/handbrake/ports.h
@@ -24,7 +24,7 @@
 #define IS_DIR_SEP(c) (c == '/')
 #endif
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 #include "mfx/mfxstructures.h"
diff --git a/libhb/preset.h b/libhb/handbrake/preset.h
index fda7ebefd..abb188487 100644
--- a/libhb/preset.h
+++ b/libhb/handbrake/preset.h
@@ -9,8 +9,8 @@
 #if !defined(HB_PRESET_H)
 #define HB_PRESET_H
 
-#include "common.h"
-#include "hb_dict.h"
+#include "handbrake/common.h"
+#include "handbrake/hb_dict.h"
 
 #define HB_MAX_PRESET_FOLDER_DEPTH  8
 
diff --git a/libhb/preset_builtin.h b/libhb/handbrake/preset_builtin.h
index 294dfb556..294dfb556 100644
--- a/libhb/preset_builtin.h
+++ b/libhb/handbrake/preset_builtin.h
diff --git a/libhb/project.h.m4 b/libhb/handbrake/project.h.m4
index 93af47419..93af47419 100644
--- a/libhb/project.h.m4
+++ b/libhb/handbrake/project.h.m4
diff --git a/libhb/qsv_common.h b/libhb/handbrake/qsv_common.h
index 9522f7488..ca844c5e9 100644
--- a/libhb/qsv_common.h
+++ b/libhb/handbrake/qsv_common.h
@@ -12,14 +12,14 @@
 
 int            hb_qsv_available();
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 
 #include "mfx/mfxvideo.h"
 #include "mfx/mfxplugin.h"
 #include "libavcodec/avcodec.h"
-#include "hb_dict.h"
+#include "handbrake/hb_dict.h"
 
 /* Minimum Intel Media SDK version (currently 1.3, for Sandy Bridge support) */
 #define HB_QSV_MINVERSION_MAJOR HB_QSV_MSDK_VERSION_MAJOR
diff --git a/libhb/qsv_filter.h b/libhb/handbrake/qsv_filter.h
index fc3ba95f8..6d2650059 100644
--- a/libhb/qsv_filter.h
+++ b/libhb/handbrake/qsv_filter.h
@@ -29,7 +29,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef QSV_FILTER_H
 #define QSV_FILTER_H
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 void qsv_filter_close( hb_qsv_context* qsv, HB_QSV_STAGE_TYPE vpp_type );
diff --git a/libhb/qsv_filter_pp.h b/libhb/handbrake/qsv_filter_pp.h
index bb2c3cc68..c0e7f605e 100644
--- a/libhb/qsv_filter_pp.h
+++ b/libhb/handbrake/qsv_filter_pp.h
@@ -29,7 +29,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef QSV_FILTER_PP_H
 #define QSV_FILTER_PP_H
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 
diff --git a/libhb/qsv_libav.h b/libhb/handbrake/qsv_libav.h
index b74b50c2b..b74b50c2b 100644
--- a/libhb/qsv_libav.h
+++ b/libhb/handbrake/qsv_libav.h
diff --git a/libhb/qsv_memory.h b/libhb/handbrake/qsv_memory.h
index 9397306f0..3434114e1 100644
--- a/libhb/qsv_memory.h
+++ b/libhb/handbrake/qsv_memory.h
@@ -29,12 +29,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef QSV_MEMORY_H
 #define QSV_MEMORY_H
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 
 #include "mfx/mfxplugin.h"
-#include "qsv_libav.h"
+#include "handbrake/qsv_libav.h"
 
 typedef struct{
 
diff --git a/libhb/ssautil.h b/libhb/handbrake/ssautil.h
index 319262b73..319262b73 100644
--- a/libhb/ssautil.h
+++ b/libhb/handbrake/ssautil.h
diff --git a/libhb/taskset.h b/libhb/handbrake/taskset.h
index 07a7e32bc..35c21e1c0 100644
--- a/libhb/taskset.h
+++ b/libhb/handbrake/taskset.h
@@ -12,7 +12,7 @@
 
 #define TASKSET_POSIX_COMPLIANT 1
 
-#include "bits.h"
+#include "handbrake/bits.h"
 
 typedef struct hb_taskset_s {
     int                thread_count;
diff --git a/libhb/vce_common.h b/libhb/handbrake/vce_common.h
index 0c5da62b2..0c5da62b2 100644
--- a/libhb/vce_common.h
+++ b/libhb/handbrake/vce_common.h
diff --git a/libhb/hb.c b/libhb/hb.c
index b44c2679e..da65650a1 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -7,16 +7,16 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "encx264.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/encx264.h"
 #include "libavfilter/avfilter.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 
 #if HB_PROJECT_FEATURE_QSV
-#include "qsv_common.h"
+#include "handbrake/qsv_common.h"
 #endif
 
 #if defined( SYS_MINGW )
diff --git a/libhb/hb_dict.c b/libhb/hb_dict.c
index b9bd5a8d3..52f585a94 100644
--- a/libhb/hb_dict.c
+++ b/libhb/hb_dict.c
@@ -9,8 +9,8 @@
 
 #include <ctype.h>
 #include <stdio.h>
-#include "handbrake.h"
-#include "hb_dict.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/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 5fb92b8b8..8ad0a720d 100644
--- a/libhb/hb_json.c
+++ b/libhb/hb_json.c
@@ -8,10 +8,10 @@
  */
 
 #include <jansson.h>
-#include "handbrake.h"
-#include "hb_json.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hb_json.h"
 #include "libavutil/base64.h"
-#include "qsv_common.h"
+#include "handbrake/qsv_common.h"
 
 /**
  * Convert an hb_state_t to a jansson dict
diff --git a/libhb/hbavfilter.c b/libhb/hbavfilter.c
index 5e050e28f..fa86ac5f8 100644
--- a/libhb/hbavfilter.c
+++ b/libhb/hbavfilter.c
@@ -7,13 +7,13 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
 #include "libavfilter/avfilter.h"
 #include "libavfilter/buffersrc.h"
 #include "libavfilter/buffersink.h"
-#include "hbavfilter.h"
-#include "avfilter_priv.h"
+#include "handbrake/hbavfilter.h"
+#include "handbrake/avfilter_priv.h"
 
 struct hb_avfilter_graph_s
 {
diff --git a/libhb/hbffmpeg.c b/libhb/hbffmpeg.c
index af0707874..f5a140c75 100644
--- a/libhb/hbffmpeg.c
+++ b/libhb/hbffmpeg.c
@@ -1,5 +1,5 @@
-#include "handbrake.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
 
 static int get_frame_type(int type)
 {
diff --git a/libhb/lang.c b/libhb/lang.c
index cd3c8887f..0cf828a61 100644
--- a/libhb/lang.c
+++ b/libhb/lang.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 "lang.h"
+#include "handbrake/lang.h"
 #include <string.h>
 #include <ctype.h>
 
diff --git a/libhb/lapsharp.c b/libhb/lapsharp.c
index 192b26721..9174ac394 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 "handbrake.h"
+#include "handbrake/handbrake.h"
 
 #define LAPSHARP_STRENGTH_LUMA_DEFAULT   0.2
 #define LAPSHARP_STRENGTH_CHROMA_DEFAULT 0.2
diff --git a/libhb/module.defs b/libhb/module.defs
index e76358f39..a2d444447 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -15,7 +15,7 @@ $(eval $(call import.GCC,LIBHB))
 LIBHB.src/   = $(SRC/)libhb/
 LIBHB.build/ = $(BUILD/)libhb/
 
-LIBHB.m4.in  = $(wildcard $(LIBHB.src/)*.m4)
+LIBHB.m4.in  = $(wildcard $(LIBHB.src/)handbrake/*.m4)
 LIBHB.m4.out = $(patsubst $(LIBHB.src/)%.m4,$(LIBHB.build/)%,$(LIBHB.m4.in))
 
 LIBHB.c   = $(wildcard $(LIBHB.src/)*.c)
@@ -24,7 +24,7 @@ LIBHB.m.o = $(patsubst $(SRC/)%.m,$(BUILD/)%.o,$(LIBHB.m))
 LIBHB.d   = $(LIBHB.m4.out) $(LIBHB.h.out) \
     $(foreach n,$(LIBHB.prerequisites),$($n.INSTALL.target) )
 
-LIBHB.h.in  = $(wildcard $(LIBHB.src/)*.h)
+LIBHB.h.in  = $(wildcard $(LIBHB.src/)handbrake/*.h)
 LIBHB.h.in += $(wildcard $(LIBHB.src/)extras/*.h)
 LIBHB.h.out = $(patsubst $(SRC/)%,$(BUILD/)%,$(LIBHB.h.in))
 
diff --git a/libhb/mt_frame_filter.c b/libhb/mt_frame_filter.c
index fd6bf780e..11f5ffc72 100644
--- a/libhb/mt_frame_filter.c
+++ b/libhb/mt_frame_filter.c
@@ -12,8 +12,8 @@
  * operate on each frame independently with no context carried over
  * from one frame to the next. */
 
-#include "handbrake.h"
-#include "taskset.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/taskset.h"
 
 typedef struct
 {
diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
index 1d630ebd2..983c5d348 100644
--- a/libhb/muxavformat.c
+++ b/libhb/muxavformat.c
@@ -12,9 +12,9 @@
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 
-#include "handbrake.h"
-#include "ssautil.h"
-#include "lang.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/ssautil.h"
+#include "handbrake/lang.h"
 
 struct hb_mux_data_s
 {
diff --git a/libhb/muxcommon.c b/libhb/muxcommon.c
index a16a27a52..842ed86e8 100644
--- a/libhb/muxcommon.c
+++ b/libhb/muxcommon.c
@@ -6,8 +6,8 @@
    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 "handbrake.h"
-#include "decssasub.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/decssasub.h"
 
 #define MIN_BUFFERING (1024*1024*10)
 #define MAX_BUFFERING (1024*1024*50)
diff --git a/libhb/nal_units.c b/libhb/nal_units.c
index 5fd332a37..9c326b81a 100644
--- a/libhb/nal_units.c
+++ b/libhb/nal_units.c
@@ -10,8 +10,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "common.h"
-#include "nal_units.h"
+#include "handbrake/common.h"
+#include "handbrake/nal_units.h"
 
 static const uint8_t hb_annexb_startcode[] = { 0x00, 0x00, 0x00, 0x01, };
 
diff --git a/libhb/nlmeans.c b/libhb/nlmeans.c
index d838e0575..2297d4f7b 100644
--- a/libhb/nlmeans.c
+++ b/libhb/nlmeans.c
@@ -50,10 +50,10 @@
  *        etc...
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "taskset.h"
-#include "nlmeans.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/taskset.h"
+#include "handbrake/nlmeans.h"
 
 #define NLMEANS_STRENGTH_LUMA_DEFAULT      6
 #define NLMEANS_STRENGTH_CHROMA_DEFAULT    6
diff --git a/libhb/nlmeans_x86.c b/libhb/nlmeans_x86.c
index 131b81007..423fa50e4 100644
--- a/libhb/nlmeans_x86.c
+++ b/libhb/nlmeans_x86.c
@@ -8,14 +8,14 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"     // needed for ARCH_X86
+#include "handbrake/handbrake.h"     // needed for ARCH_X86
 
 #if defined(ARCH_X86)
 
 #include <emmintrin.h>
 
 #include "libavutil/cpu.h"
-#include "nlmeans.h"
+#include "handbrake/nlmeans.h"
 
 static void build_integral_sse2(uint32_t *integral,
                                 int       integral_stride,
diff --git a/libhb/nvenc_common.c b/libhb/nvenc_common.c
index fb711b0ed..c6897a84c 100644
--- a/libhb/nvenc_common.c
+++ b/libhb/nvenc_common.c
@@ -7,8 +7,8 @@
  * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hbffmpeg.h"
-#include "handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/handbrake.h"
 
 #if HB_PROJECT_FEATURE_NVENC
 #include <ffnvcodec/nvEncodeAPI.h>
diff --git a/libhb/pad.c b/libhb/pad.c
index 10631bffe..eee3e1c79 100644
--- a/libhb/pad.c
+++ b/libhb/pad.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "colormap.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/colormap.h"
+#include "handbrake/avfilter_priv.h"
 
 static int pad_init(hb_filter_object_t * filter, hb_filter_init_t * init);
 
diff --git a/libhb/param.c b/libhb/param.c
index 1f73de622..e5baa9d26 100644
--- a/libhb/param.c
+++ b/libhb/param.c
@@ -8,13 +8,13 @@
  * http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "project.h"
-#include "hb_dict.h"
-#include "param.h"
-#include "common.h"
-#include "colormap.h"
+#include "handbrake/project.h"
+#include "handbrake/hb_dict.h"
+#include "handbrake/param.h"
+#include "handbrake/common.h"
+#include "handbrake/colormap.h"
 #if HB_PROJECT_FEATURE_QSV
-#include "qsv_common.h"
+#include "handbrake/qsv_common.h"
 #endif
 #include <regex.h>
 
diff --git a/libhb/platform/macosx/encca_aac.c b/libhb/platform/macosx/encca_aac.c
index 8d770c2e9..5c108cba4 100644
--- a/libhb/platform/macosx/encca_aac.c
+++ b/libhb/platform/macosx/encca_aac.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "audio_remap.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/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 51c0ff97c..3ea9ce15e 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 "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "vt_common.h"
 
 #include <VideoToolbox/VideoToolbox.h>
diff --git a/libhb/plist.c b/libhb/plist.c
index 6db6dd389..2bd5a02ec 100644
--- a/libhb/plist.c
+++ b/libhb/plist.c
@@ -14,9 +14,9 @@
 #include <inttypes.h>
 #include "libxml/parser.h"
 
-#include "common.h"
-#include "hb_dict.h"
-#include "plist.h"
+#include "handbrake/common.h"
+#include "handbrake/hb_dict.h"
+#include "handbrake/plist.h"
 
 #define BUF_SZ  (128*1024)
 
diff --git a/libhb/ports.c b/libhb/ports.c
index 6086aa628..917da62b9 100644
--- a/libhb/ports.c
+++ b/libhb/ports.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 "project.h"
+#include "handbrake/project.h"
 
 #ifdef SYS_MINGW
 #define _WIN32_WINNT 0x600
@@ -88,7 +88,7 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "libavutil/cpu.h"
 
 /************************************************************************
diff --git a/libhb/preset.c b/libhb/preset.c
index b592a2bba..b7a30013a 100644
--- a/libhb/preset.c
+++ b/libhb/preset.c
@@ -7,14 +7,14 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "preset_builtin.h"
-#include "handbrake.h"
-#include "hb_dict.h"
-#include "plist.h"
-#include "lang.h"
+#include "handbrake/preset_builtin.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hb_dict.h"
+#include "handbrake/plist.h"
+#include "handbrake/lang.h"
 
 #if HB_PROJECT_FEATURE_QSV
-#include "qsv_common.h"
+#include "handbrake/qsv_common.h"
 #endif
 
 #if defined(SYS_LINUX)
diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c
index 9f7762159..08d4f030b 100644
--- a/libhb/qsv_common.c
+++ b/libhb/qsv_common.c
@@ -7,20 +7,26 @@
  * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 
 #include <stdio.h>
 #include <string.h>
 
-#include "handbrake.h"
-#include "ports.h"
-#include "common.h"
-#include "hb_dict.h"
-#include "qsv_common.h"
-#include "h264_common.h"
-#include "h265_common.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/ports.h"
+#include "handbrake/common.h"
+#include "handbrake/hb_dict.h"
+#include "handbrake/qsv_common.h"
+#include "handbrake/h264_common.h"
+#include "handbrake/h265_common.h"
+#include "handbrake/hbffmpeg.h"
+#include "libavfilter/avfilter.h"
+#include "libavfilter/buffersrc.h"
+#include "libavfilter/buffersink.h"
+#include "libavutil/hwcontext_qsv.h"
+#include "libavutil/hwcontext.h"
 
 // QSV info for each codec
 static hb_qsv_info_t *hb_qsv_info_avc       = NULL;
@@ -2279,16 +2285,6 @@ void hb_qsv_force_workarounds()
 #undef FORCE_WORKAROUNDS
 }
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "libavfilter/avfilter.h"
-#include "libavfilter/buffersrc.h"
-#include "libavfilter/buffersink.h"
-#include "libavutil/hwcontext_qsv.h"
-#include "libavutil/hwcontext.h"
-#include "lang.h"
-#include "audio_resample.h"
-
 AVBufferRef *enc_hw_frames_ctx = NULL;
 extern EncQSVFramesContext hb_enc_qsv_frames_ctx;
 AVBufferRef *hb_hw_device_ctx = NULL;
diff --git a/libhb/qsv_filter.c b/libhb/qsv_filter.c
index b330c78ad..925e43a1e 100644
--- a/libhb/qsv_filter.c
+++ b/libhb/qsv_filter.c
@@ -26,14 +26,14 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 \* ********************************************************************* */
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "qsv_filter.h"
-#include "qsv_libav.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/qsv_filter.h"
+#include "handbrake/qsv_libav.h"
 
 struct hb_filter_private_s
 {
diff --git a/libhb/qsv_filter_pp.c b/libhb/qsv_filter_pp.c
index ddab314fd..512b2bd9f 100644
--- a/libhb/qsv_filter_pp.c
+++ b/libhb/qsv_filter_pp.c
@@ -26,16 +26,16 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 \* ********************************************************************* */
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "qsv_filter_pp.h"
-#include "qsv_filter.h"
-#include "qsv_libav.h"
-#include "qsv_memory.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/qsv_filter_pp.h"
+#include "handbrake/qsv_filter.h"
+#include "handbrake/qsv_libav.h"
+#include "handbrake/qsv_memory.h"
 
 
 static int hb_qsv_filter_pre_init( hb_filter_object_t * filter,
diff --git a/libhb/qsv_libav.c b/libhb/qsv_libav.c
index 797aee184..0a6a1a6ce 100644
--- a/libhb/qsv_libav.c
+++ b/libhb/qsv_libav.c
@@ -26,12 +26,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 \* ********************************************************************* */
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "hbffmpeg.h"
-#include "qsv_libav.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/qsv_libav.h"
 
 int hb_qsv_get_free_encode_task(hb_qsv_list * tasks)
 {
diff --git a/libhb/qsv_memory.c b/libhb/qsv_memory.c
index bb6c91a6c..625674910 100644
--- a/libhb/qsv_memory.c
+++ b/libhb/qsv_memory.c
@@ -26,13 +26,13 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 \* ********************************************************************* */
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "qsv_memory.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/qsv_memory.h"
 
 int qsv_nv12_to_yuv420(struct SwsContext* sws_context,hb_buffer_t* dst, mfxFrameSurface1* src, mfxCoreInterface *core){
     int ret = 0;
diff --git a/libhb/reader.c b/libhb/reader.c
index a0496a8f5..2f9f72288 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 "handbrake.h"
+#include "handbrake/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 a909ce4f2..40613598e 100644
--- a/libhb/rendersub.c
+++ b/libhb/rendersub.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
 #include <ass/ass.h>
 
 #define ABS(a) ((a) > 0 ? (a) : (-(a)))
diff --git a/libhb/rotate.c b/libhb/rotate.c
index 7ba140514..c21c4d802 100644
--- a/libhb/rotate.c
+++ b/libhb/rotate.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/avfilter_priv.h"
 
 static int rotate_init(hb_filter_object_t * filter, hb_filter_init_t * init);
 
diff --git a/libhb/scan.c b/libhb/scan.c
index 97567c8b3..9aed75d19 100644
--- a/libhb/scan.c
+++ b/libhb/scan.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
 
 typedef struct
 {
diff --git a/libhb/ssautil.c b/libhb/ssautil.c
index 291620dfe..8ff5ea50f 100644
--- a/libhb/ssautil.c
+++ b/libhb/ssautil.c
@@ -8,8 +8,8 @@
  */
 #include <stdio.h>
 #include <ctype.h>
-#include "handbrake.h"
-#include "ssautil.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/ssautil.h"
 
 struct hb_subtitle_style_s
 {
diff --git a/libhb/stream.c b/libhb/stream.c
index aaeaf022e..feb390c07 100644
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -11,9 +11,9 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "lang.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/lang.h"
 #include "libbluray/bluray.h"
 
 #define min(a, b) a < b ? a : b
diff --git a/libhb/sync.c b/libhb/sync.c
index 0af052471..446129b09 100644
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -7,10 +7,10 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
 #include <stdio.h>
-#include "audio_resample.h"
+#include "handbrake/audio_resample.h"
 
 #define SYNC_MAX_VIDEO_QUEUE_LEN    40
 #define SYNC_MIN_VIDEO_QUEUE_LEN    20
diff --git a/libhb/taskset.c b/libhb/taskset.c
index e829fd79b..936ef4de5 100644
--- a/libhb/taskset.c
+++ b/libhb/taskset.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "ports.h"
-#include "taskset.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/ports.h"
+#include "handbrake/taskset.h"
 
 int
 taskset_init( taskset_t *ts, int thread_count, size_t arg_size )
diff --git a/libhb/unsharp.c b/libhb/unsharp.c
index f47c6a1bd..bf5e8b99b 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 "handbrake.h"
+#include "handbrake/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 da0476a64..51d9c07ac 100644
--- a/libhb/vce_common.c
+++ b/libhb/vce_common.c
@@ -7,13 +7,13 @@
  * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "project.h"
+#include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_VCE
 #include "AMF/core/Factory.h"
 #include "AMF/components/VideoEncoderVCE.h"
 #include "AMF/components/VideoEncoderHEVC.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 
 AMF_RESULT check_component_available(const wchar_t *componentID)
 {
diff --git a/libhb/vfr.c b/libhb/vfr.c
index a42a5342e..728b32644 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 "handbrake.h"
+#include "handbrake/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 7d096aca5..05bd0b04c 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -7,14 +7,14 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "libavformat/avformat.h"
-#include "decomb.h"
-#include "hbavfilter.h"
+#include "handbrake/decomb.h"
+#include "handbrake/hbavfilter.h"
 
 #if HB_PROJECT_FEATURE_QSV
-#include "qsv_common.h"
-#include "qsv_filter_pp.h"
+#include "handbrake/qsv_common.h"
+#include "handbrake/qsv_filter_pp.h"
 #endif
 
 typedef struct