diff --git a/include/hardware/activity_recognition.h b/include/hardware/activity_recognition.h
deleted file mode 120000
index b1d4fbe..0000000
--- a/include/hardware/activity_recognition.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include_all/hardware/activity_recognition.h
\ No newline at end of file
diff --git a/include/hardware/audio_alsaops.h b/include/hardware/audio_alsaops.h
deleted file mode 120000
index a3087d2..0000000
--- a/include/hardware/audio_alsaops.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include_all/hardware/audio_alsaops.h
\ No newline at end of file
diff --git a/include/hardware/consumerir.h b/include/hardware/consumerir.h
deleted file mode 120000
index bde1d55..0000000
--- a/include/hardware/consumerir.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include_all/hardware/consumerir.h
\ No newline at end of file
diff --git a/include_all/hardware/activity_recognition.h b/include_vendor/hardware/activity_recognition.h
similarity index 100%
rename from include_all/hardware/activity_recognition.h
rename to include_vendor/hardware/activity_recognition.h
diff --git a/include_all/hardware/audio_alsaops.h b/include_vendor/hardware/audio_alsaops.h
similarity index 100%
rename from include_all/hardware/audio_alsaops.h
rename to include_vendor/hardware/audio_alsaops.h
diff --git a/include_all/hardware/consumerir.h b/include_vendor/hardware/consumerir.h
similarity index 100%
rename from include_all/hardware/consumerir.h
rename to include_vendor/hardware/consumerir.h
diff --git a/modules/radio/Android.bp b/modules/radio/Android.bp
index 7240869..3d9ddef 100644
--- a/modules/radio/Android.bp
+++ b/modules/radio/Android.bp
@@ -43,6 +43,7 @@
 // Stub radio tool that can be run in native.
 cc_binary {
     name: "radio_hal_tool",
+    vendor: true,
     srcs: ["radio_hal_tool.c"],
     cflags: [
         "-Wall",
diff --git a/tests/hardware/Android.bp b/tests/hardware/Android.bp
index b137684..a52a4ab 100644
--- a/tests/hardware/Android.bp
+++ b/tests/hardware/Android.bp
@@ -21,5 +21,7 @@
         "-Werror",
     ],
 
+    vendor: true,
+
     include_dirs: ["system/media/camera/include"],
 }