diff --git a/llvm/src/main/resources/org/bytedeco/llvm/include/FullOptimization.h b/llvm/src/main/resources/org/bytedeco/llvm/include/FullOptimization.h
index 96ee6517c53..5b0eebc62aa 100644
--- a/llvm/src/main/resources/org/bytedeco/llvm/include/FullOptimization.h
+++ b/llvm/src/main/resources/org/bytedeco/llvm/include/FullOptimization.h
@@ -26,16 +26,16 @@
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Transforms/IPO.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
+//#include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "llvm/IR/Verifier.h"
 #include "llvm/IR/LegacyPassManager.h"
 #include "llvm/CodeGen/TargetPassConfig.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
-#include "llvm/MC/SubtargetFeature.h"
+//#include "llvm/MC/SubtargetFeature.h"
 #include "llvm/Pass.h"
-#include "llvm-c/Transforms/PassManagerBuilder.h"
+//#include "llvm-c/Transforms/PassManagerBuilder.h"
 #include "llvm-c/Types.h"
 #include "llvm-c/Error.h"
 
diff --git a/tensorflow-lite/cppbuild.sh b/tensorflow-lite/cppbuild.sh
index eddcb8a9f99..cabdb33666e 100755
--- a/tensorflow-lite/cppbuild.sh
+++ b/tensorflow-lite/cppbuild.sh
@@ -87,7 +87,7 @@ case $PLATFORM in
         ;;
 esac
 
-"$CMAKE" $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR=lib ../tensorflow-$TENSORFLOW_VERSION/tensorflow/lite/c
+"$CMAKE" $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR=lib -DTFLITE_C_BUILD_SHARED_LIBS=OFF ../tensorflow-$TENSORFLOW_VERSION/tensorflow/lite/c
 "$CMAKE" --build . --parallel $MAKEJ
 #"$CMAKE" --install .