diff --git a/Android.mk b/Android.mk
index 679c2ec..53a0884 100755
--- a/Android.mk
+++ b/Android.mk
@@ -62,7 +62,6 @@
     find_file.cpp \
     infomanager.cpp \
     data.cpp \
-    kernel_module_loader.cpp \
     partition.cpp \
     partitionmanager.cpp \
     progresstracking.cpp \
@@ -108,7 +107,6 @@
     bionic \
     system/extras \
     system/core/adb \
-    system/core/libmodprobe/include \
     system/core/libsparse \
     external/zlib \
     system/core/libziparchive/include \
@@ -129,7 +127,7 @@
     $(LOCAL_PATH)/minuitwrp/include \
     $(LOCAL_PATH)/twinstall/include
 
-LOCAL_STATIC_LIBRARIES += libguitwrp libmodprobe
+LOCAL_STATIC_LIBRARIES += libguitwrp
 LOCAL_SHARED_LIBRARIES += libz libc libcutils libstdc++ libtar libblkid libminuitwrp libmtdutils libtwadbbu 
 LOCAL_SHARED_LIBRARIES += libbootloader_message libcrecovery libtwrpdigest libc++ libaosprecovery libcrypto libbase 
 LOCAL_SHARED_LIBRARIES += libziparchive libselinux libdl_android.bootstrap
@@ -307,6 +305,9 @@
     LOCAL_CFLAGS += -DTW_ADDITIONAL_APEX_FILES=$(TW_ADDITIONAL_APEX_FILES)
 endif
 ifneq ($(TW_LOAD_VENDOR_MODULES),)
+    LOCAL_SRC_FILES += kernel_module_loader.cpp
+    LOCAL_C_INCLUDES += system/core/libmodprobe/include
+    LOCAL_STATIC_LIBRARIES += libmodprobe
     LOCAL_CFLAGS += -DTW_LOAD_VENDOR_MODULES=$(TW_LOAD_VENDOR_MODULES)
 endif
 ifeq ($(TW_INCLUDE_CRYPTO), true)
@@ -443,8 +444,7 @@
     me.twrp.twrpapp.apk \
     privapp-permissions-twrpapp.xml \
     adbd_system_api_recovery \
-    libsync.recovery \
-    libmodprobe
+    libsync.recovery
 
 ifneq ($(TW_EXCLUDE_TZDATA), true)
 TWRP_REQUIRED_MODULES += \
@@ -554,6 +554,9 @@
         fs_mgr \
         libinit
 endif
+ifneq ($(TW_LOAD_VENDOR_MODULES),)
+    TWRP_REQUIRED_MODULES += libmodprobe
+endif
 
 TWRP_REQUIRED_MODULES += file_contexts_text
 
diff --git a/twrp.cpp b/twrp.cpp
index dcc5764..69c8218 100644
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -44,7 +44,11 @@
 #include "twcommon.h"
 #include "twrp-functions.hpp"
 #include "data.hpp"
+
+#ifdef TW_LOAD_VENDOR_MODULES
 #include "kernel_module_loader.hpp"
+#endif
+
 #include "partitions.hpp"
 #ifdef __ANDROID_API_N__
 #include <android-base/strings.h>