diff --git a/avbImpl/build.gradle b/avbImpl/build.gradle
index 95aa0f2..4f75309 100644
--- a/avbImpl/build.gradle
+++ b/avbImpl/build.gradle
@@ -16,6 +16,7 @@ model {
             }
             binaries.all {
                 cCompiler.args << "-Wall" << "-g"
+                cppCompiler.args << "--std=c++11"
             }
         }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0f7b612..1485b37 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,4 +8,4 @@ include("aosp:libsparse:simg2img")
 include("aosp:libsparse:simg2simg")
 include("aosp:libsparse:append2simg")
 include("aosp:libavb")
-//include("avbImpl")
+include("avbImpl")
diff --git a/external/avb_print_property_desc.diff b/tools/avb_print_property_desc.diff
similarity index 100%
rename from external/avb_print_property_desc.diff
rename to tools/avb_print_property_desc.diff
diff --git a/external/extract_kernel.py.diff b/tools/extract_kernel.py.diff
similarity index 100%
rename from external/extract_kernel.py.diff
rename to tools/extract_kernel.py.diff
diff --git a/external/mkdtboimg.diff b/tools/mkdtboimg.diff
similarity index 100%
rename from external/mkdtboimg.diff
rename to tools/mkdtboimg.diff
diff --git a/external/remove_projects.diff b/tools/remove_projects.diff
similarity index 100%
rename from external/remove_projects.diff
rename to tools/remove_projects.diff