diff --git a/cc/binary.go b/cc/binary.go
index 083cf0d..0965886 100644
--- a/cc/binary.go
+++ b/cc/binary.go
@@ -18,7 +18,6 @@
 	"github.com/google/blueprint"
 	"github.com/google/blueprint/proptools"
 
-	"android/soong"
 	"android/soong/android"
 )
 
@@ -42,8 +41,8 @@
 }
 
 func init() {
-	soong.RegisterModuleType("cc_binary", binaryFactory)
-	soong.RegisterModuleType("cc_binary_host", binaryHostFactory)
+	android.RegisterModuleType("cc_binary", binaryFactory)
+	android.RegisterModuleType("cc_binary_host", binaryHostFactory)
 }
 
 // Module factory for binaries
diff --git a/cc/cc.go b/cc/cc.go
index 75292aa..791d9ea 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -26,14 +26,13 @@
 	"github.com/google/blueprint"
 	"github.com/google/blueprint/proptools"
 
-	"android/soong"
 	"android/soong/android"
 	"android/soong/cc/config"
 	"android/soong/genrule"
 )
 
 func init() {
-	soong.RegisterModuleType("cc_defaults", defaultsFactory)
+	android.RegisterModuleType("cc_defaults", defaultsFactory)
 
 	// LinkageMutator must be registered after common.ArchMutator, but that is guaranteed by
 	// the Go initialization order because this package depends on common, so common's init
diff --git a/cc/library.go b/cc/library.go
index 2c5f22f..cb4dc61 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -20,7 +20,6 @@
 	"github.com/google/blueprint"
 	"github.com/google/blueprint/pathtools"
 
-	"android/soong"
 	"android/soong/android"
 )
 
@@ -77,11 +76,11 @@
 }
 
 func init() {
-	soong.RegisterModuleType("cc_library_static", libraryStaticFactory)
-	soong.RegisterModuleType("cc_library_shared", librarySharedFactory)
-	soong.RegisterModuleType("cc_library", libraryFactory)
-	soong.RegisterModuleType("cc_library_host_static", libraryHostStaticFactory)
-	soong.RegisterModuleType("cc_library_host_shared", libraryHostSharedFactory)
+	android.RegisterModuleType("cc_library_static", libraryStaticFactory)
+	android.RegisterModuleType("cc_library_shared", librarySharedFactory)
+	android.RegisterModuleType("cc_library", libraryFactory)
+	android.RegisterModuleType("cc_library_host_static", libraryHostStaticFactory)
+	android.RegisterModuleType("cc_library_host_shared", libraryHostSharedFactory)
 }
 
 // Module factory for combined static + shared libraries, device by default but with possible host
diff --git a/cc/ndk_prebuilt.go b/cc/ndk_prebuilt.go
index 407a026..106c9b5 100644
--- a/cc/ndk_prebuilt.go
+++ b/cc/ndk_prebuilt.go
@@ -20,16 +20,15 @@
 
 	"github.com/google/blueprint"
 
-	"android/soong"
 	"android/soong/android"
 	"android/soong/cc/config"
 )
 
 func init() {
-	soong.RegisterModuleType("ndk_prebuilt_library", ndkPrebuiltLibraryFactory)
-	soong.RegisterModuleType("ndk_prebuilt_object", ndkPrebuiltObjectFactory)
-	soong.RegisterModuleType("ndk_prebuilt_static_stl", ndkPrebuiltStaticStlFactory)
-	soong.RegisterModuleType("ndk_prebuilt_shared_stl", ndkPrebuiltSharedStlFactory)
+	android.RegisterModuleType("ndk_prebuilt_library", ndkPrebuiltLibraryFactory)
+	android.RegisterModuleType("ndk_prebuilt_object", ndkPrebuiltObjectFactory)
+	android.RegisterModuleType("ndk_prebuilt_static_stl", ndkPrebuiltStaticStlFactory)
+	android.RegisterModuleType("ndk_prebuilt_shared_stl", ndkPrebuiltSharedStlFactory)
 }
 
 // NDK prebuilt libraries.
diff --git a/cc/ndk_sysroot.go b/cc/ndk_sysroot.go
index 144d91c..cbdaa26 100644
--- a/cc/ndk_sysroot.go
+++ b/cc/ndk_sysroot.go
@@ -55,14 +55,13 @@
 import (
 	"github.com/google/blueprint"
 
-	"android/soong"
 	"android/soong/android"
 )
 
 func init() {
-	soong.RegisterModuleType("ndk_headers", ndkHeadersFactory)
-	soong.RegisterModuleType("ndk_library", ndkLibraryFactory)
-	soong.RegisterSingletonType("ndk", NdkSingleton)
+	android.RegisterModuleType("ndk_headers", ndkHeadersFactory)
+	android.RegisterModuleType("ndk_library", ndkLibraryFactory)
+	android.RegisterSingletonType("ndk", NdkSingleton)
 
 	pctx.Import("android/soong/common")
 }
diff --git a/cc/object.go b/cc/object.go
index c9f0a06..72fd55b 100644
--- a/cc/object.go
+++ b/cc/object.go
@@ -19,7 +19,6 @@
 
 	"github.com/google/blueprint"
 
-	"android/soong"
 	"android/soong/android"
 )
 
@@ -28,7 +27,7 @@
 //
 
 func init() {
-	soong.RegisterModuleType("cc_object", objectFactory)
+	android.RegisterModuleType("cc_object", objectFactory)
 }
 
 type objectLinker struct {
diff --git a/cc/test.go b/cc/test.go
index 9c7c0de..9cc30c9 100644
--- a/cc/test.go
+++ b/cc/test.go
@@ -21,7 +21,6 @@
 
 	"github.com/google/blueprint"
 
-	"android/soong"
 	"android/soong/android"
 )
 
@@ -37,11 +36,11 @@
 }
 
 func init() {
-	soong.RegisterModuleType("cc_test", testFactory)
-	soong.RegisterModuleType("cc_test_library", testLibraryFactory)
-	soong.RegisterModuleType("cc_benchmark", benchmarkFactory)
-	soong.RegisterModuleType("cc_test_host", testHostFactory)
-	soong.RegisterModuleType("cc_benchmark_host", benchmarkHostFactory)
+	android.RegisterModuleType("cc_test", testFactory)
+	android.RegisterModuleType("cc_test_library", testLibraryFactory)
+	android.RegisterModuleType("cc_benchmark", benchmarkFactory)
+	android.RegisterModuleType("cc_test_host", testHostFactory)
+	android.RegisterModuleType("cc_benchmark_host", benchmarkHostFactory)
 }
 
 // Module factory for tests
diff --git a/cc/toolchain_library.go b/cc/toolchain_library.go
index 0548da9..0097ca3 100644
--- a/cc/toolchain_library.go
+++ b/cc/toolchain_library.go
@@ -18,7 +18,6 @@
 	"github.com/google/blueprint"
 	"github.com/google/blueprint/proptools"
 
-	"android/soong"
 	"android/soong/android"
 )
 
@@ -27,7 +26,7 @@
 //
 
 func init() {
-	soong.RegisterModuleType("toolchain_library", toolchainLibraryFactory)
+	android.RegisterModuleType("toolchain_library", toolchainLibraryFactory)
 }
 
 type toolchainLibraryDecorator struct {