diff --git a/camera/Android.bp b/camera/Android.bp
index 609989e..c6f16f0 100644
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -12,6 +12,5 @@ cc_library_shared {
     vendor: true,
     shared_libs: [
         "libpiex",
-        "libutils",
     ],
 }
diff --git a/camera/libpiex_shim.cpp b/camera/libpiex_shim.cpp
index e0b2a3e..193b642 100644
--- a/camera/libpiex_shim.cpp
+++ b/camera/libpiex_shim.cpp
@@ -1,17 +1,16 @@
+/*
+ * Copyright (C) 2022 The LineageOS Project
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 #include <src/piex.h>
 
 namespace piex {
 
-using image_type_recognition::RawImageTypes;
-
-extern "C" void
-    _ZN4piex19GetPreviewImageDataEPNS_15StreamInterfaceEPNS_16PreviewImageDataEPNS_22image_type_recognition13RawImageTypesE(
-    StreamInterface* data, PreviewImageData* preview_image_data, RawImageTypes* output_type);
-
-
-extern "C" void _ZN4piex19GetPreviewImageDataEPNS_15StreamInterfaceEPNS_16PreviewImageDataE(
-    StreamInterface* data, PreviewImageData* preview_image_data) {
-	return _ZN4piex19GetPreviewImageDataEPNS_15StreamInterfaceEPNS_16PreviewImageDataEPNS_22image_type_recognition13RawImageTypesE(data, preview_image_data, nullptr);
+Error GetPreviewImageData(StreamInterface* data,
+                          PreviewImageData* preview_image_data) {
+    return GetPreviewImageData(data, preview_image_data, nullptr);
 }
 
-} // namespace android
+} // namespace piex