--- ./src/lib_ccx/ccx_sub_entry_message.pb-c.h.orig	2017-07-20 07:52:05.332211851 -0600
+++ ./src/lib_ccx/ccx_sub_entry_message.pb-c.h	2017-07-20 07:52:13.973212509 -0600
@@ -4,7 +4,7 @@
 #ifndef PROTOBUF_C_ccx_5fsub_5fentry_5fmessage_2eproto__INCLUDED
 #define PROTOBUF_C_ccx_5fsub_5fentry_5fmessage_2eproto__INCLUDED
 
-#include "protobuf-c.h"
+#include "protobuf-c/protobuf-c.h"
 #include "lib_ccx.h"
 
 #ifdef ENABLE_SHARING
--- ./src/lib_ccx/ccx_decoders_vbi.h.orig	2017-07-20 07:59:34.031245999 -0600
+++ ./src/lib_ccx/ccx_decoders_vbi.h	2017-07-20 08:00:05.648248405 -0600
@@ -1,7 +1,7 @@
 #ifndef CCX_DECODER_VBI
 #define CCX_DECODER_VBI
 
-#include <zvbi_decoder.h>
+#include <libzvbi.h>
 #define VBI_DEBUG
 
 #include "ccx_decoders_structs.h"
--- ./linux/build.orig	2017-07-20 08:28:16.242377064 -0600
+++ ./linux/build	2017-07-20 12:42:59.014540131 -0600
@@ -1,20 +1,16 @@
 #!/bin/bash
-BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR"
-BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi -I../src/lib_hash -I../src/protobuf-c -I../src/utf8proc"
-SRC_LIBPNG="$(find ../src/libpng/ -name '*.c')"
-SRC_ZLIB="$(find ../src/zlib/ -name '*.c')"
-SRC_ZVBI="$(find ../src/zvbi/ -name '*.c')"
+BLD_FLAGS="-std=gnu99 -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR"
+BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/lib_hash"
 SRC_CCX="$(find ../src/lib_ccx/ -name '*.c')"
 SRC_GPAC="$(find ../src/gpacmp4/ -name '*.c')"
 SRC_HASH="$(find ../src/lib_hash/ -name '*.c')"
-SRC_PROTOBUF="$(find ../src/protobuf-c/ -name '*.c')"
-SRC_UTF8PROC="../src/utf8proc/utf8proc.c"
-BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZLIB $SRC_ZVBI $SRC_LIBPNG $SRC_HASH $SRC_PROTOBUF $SRC_UTF8PROC"
-BLD_LINKER="-lm -zmuldefs -l tesseract -l lept"
+BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_HASH"
+BLD_SOURCES="../src/ccextractor.c"
+BLD_LINKER="-lm -zmuldefs -l tesseract -l lept -lz -lpng16 -lprotobuf-c -lzvbi -lpthread -lutf8proc"
 
 ./pre-build.sh
 
-out=$((LC_ALL=C gcc $BLD_FLAGS $BLD_INCLUDE -o ccextractor $BLD_SOURCES $BLD_LINKER) 2>&1)
+out=$(gcc $BLD_FLAGS $BLD_INCLUDE -o ccextractor $BLD_SOURCES $BLD_LINKER)
 res=$?
 if [[ $out == *"gcc: command not found"* ]]
 then
--- ./linux/Makefile.orig	2017-07-20 07:38:54.758151686 -0600
+++ linux/Makefile	2017-07-20 12:41:32.544533551 -0600
@@ -2,11 +2,10 @@
 
 CC = gcc
 SYS := $(shell gcc -dumpmachine)
-CFLAGS = -O3 -std=gnu99 -s
-INCLUDE = -I../src/gpacmp4/ -I../src/libpng -I../src/lib_hash -I../src/protobuf-c -I../src/zlib -I../src/lib_ccx -I../src/.
-INCLUDE += -I../src/zvbi -I../src/utf8proc
+CFLAGS = -std=gnu99 -s
+INCLUDE = -I../src/gpacmp4/ -I../src/lib_hash -I../src/lib_ccx
 ALL_FLAGS = -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT
-LDFLAGS = -lm
+LDFLAGS = -lm -lz -lpng16 -lprotobuf-c -lzvbi -lpthread -lutf8proc
 
 ifneq (, $(findstring linux, $(SYS)))
 CFLAGS +=-DGPAC_CONFIG_LINUX
@@ -14,7 +13,7 @@
 TARGET = ccextractor
 
 OBJS_DIR = objs
-VPATH = ../src:../src/gpacmp4:../src/libpng:../src/zlib:../src/lib_ccx:../src/zvbi:../src/lib_hash:../src/utf8proc:../src/protobuf-c
+VPATH = ../src:../src/gpacmp4:../src/lib_ccx:../src/lib_hash
 
 SRCS_DIR = ../src
 SRCS_C = $(wildcard $(SRCS_DIR)/*.c)
@@ -24,32 +23,16 @@
 SRCS_CCX = $(wildcard $(SRCS_CCX_DIR)/*.c)
 OBJS_CCX = $(SRCS_CCX:$(SRCS_CCX_DIR)/%.c=$(OBJS_DIR)/%.o)
 
-SRCS_PNG_DIR = $(SRCS_DIR)/libpng
-SRCS_PNG = $(wildcard $(SRCS_PNG_DIR)/*.c)
-OBJS_PNG = $(SRCS_PNG:$(SRCS_PNG_DIR)/%.c=$(OBJS_DIR)/%.o)
-
-SRCS_ZVBI_DIR = $(SRCS_DIR)/zvbi
-SRCS_ZVBI = $(wildcard $(SRCS_ZVBI_DIR)/*.c)
-OBJS_ZVBI = $(SRCS_ZVBI:$(SRCS_ZVBI_DIR)/%.c=$(OBJS_DIR)/%.o)
-
 SRCS_GPACMP4_DIR = $(SRCS_DIR)/gpacmp4
 SRCS_GPACMP4_C = $(wildcard $(SRCS_GPACMP4_DIR)/*.c)
 SRCS_GPACMP4_CPP = $(wildcard $(SRCS_GPACMP4_DIR)/*.cpp)
 OBJS_GPACMP4 = $(SRCS_GPACMP4_C:$(SRCS_GPACMP4_DIR)/%.c=$(OBJS_DIR)/%.o) \
 			   $(SRCS_GPACMP4_CPP:$(SRCS_GPACMP4_DIR)/%.cpp=$(OBJS_DIR)/%.o)
 
-SRCS_ZLIB_DIR = $(SRCS_DIR)/zlib
-SRCS_ZLIB = $(wildcard $(SRCS_ZLIB_DIR)/*.c)
-OBJS_ZLIB = $(SRCS_ZLIB:$(SRCS_ZLIB_DIR)/%.c=$(OBJS_DIR)/%.o)
-
 SRCS_HASH_DIR = $(SRCS_DIR)/lib_hash
 SRCS_HASH = $(wildcard $(SRCS_HASH_DIR)/*.c)
 OBJS_HASH = $(SRCS_HASH:$(SRCS_HASH_DIR)/%.c=$(OBJS_DIR)/%.o)
 
-SRCS_UTF8_DIR = $(SRCS_DIR)/utf8proc
-SRCS_UTF8 = $(SRCS_UTF8_DIR)/utf8proc.c
-OBJS_UTF8 = $(SRCS_UTF8:$(SRCS_UTF8_DIR)/%.c=$(OBJS_DIR)/%.o)
-
 INSTLALL = cp -f -p
 INSTLALL_PROGRAM = $(INSTLALL)
 DESTDIR = /usr/bin