diff --git a/BoardConfig.mk b/BoardConfig.mk
index d8b9cf0f..c06c8aa3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -62,6 +62,8 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth
 COMMON_GLOBAL_CFLAGS += -DDISABLE_HW_ID_MATCH_CHECK
 COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE
 COMMON_GLOBAL_CFLAGS += -DSAMSUNG_DVFS
+COMMON_GLOBAL_CFLAGS += -DUSE_CHAR_BUFFERS
+COMMON_GLOBAL_CFLAGS += -DUSE_CONVERT_WITH_ROTATE
 
 # Graphics
 USE_OPENGL_RENDERER := true
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4bdf130a..898e956d 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -12,11 +12,7 @@ vendor/firmware/bcm4335_semco.hcd
 
 # Camera
 lib/hw/camera.universal5410.so:lib/hw/vendor-camera.universal5410.so
-lib/libcsc.so
 lib/libexynoscamera.so
-lib/libexynosutils.so
-lib/libexynosv4l2.so
-lib/libhwjpeg.so
 lib/libvdis.so
 
 # Graphics