diff --git a/include/cutils b/include/cutils
deleted file mode 120000
index ac2ed40..0000000
--- a/include/cutils
+++ /dev/null
@@ -1 +0,0 @@
-../libcutils/include/cutils/
\ No newline at end of file
diff --git a/libcutils/include/cutils/android_get_control_file.h b/include/cutils/android_get_control_file.h
similarity index 100%
rename from libcutils/include/cutils/android_get_control_file.h
rename to include/cutils/android_get_control_file.h
diff --git a/libcutils/include/cutils/android_reboot.h b/include/cutils/android_reboot.h
similarity index 100%
rename from libcutils/include/cutils/android_reboot.h
rename to include/cutils/android_reboot.h
diff --git a/libcutils/include/cutils/ashmem.h b/include/cutils/ashmem.h
similarity index 100%
rename from libcutils/include/cutils/ashmem.h
rename to include/cutils/ashmem.h
diff --git a/libcutils/include/cutils/atomic.h b/include/cutils/atomic.h
similarity index 100%
rename from libcutils/include/cutils/atomic.h
rename to include/cutils/atomic.h
diff --git a/libcutils/include/cutils/bitops.h b/include/cutils/bitops.h
similarity index 100%
rename from libcutils/include/cutils/bitops.h
rename to include/cutils/bitops.h
diff --git a/libcutils/include/cutils/compiler.h b/include/cutils/compiler.h
similarity index 100%
rename from libcutils/include/cutils/compiler.h
rename to include/cutils/compiler.h
diff --git a/libcutils/include/cutils/config_utils.h b/include/cutils/config_utils.h
similarity index 100%
rename from libcutils/include/cutils/config_utils.h
rename to include/cutils/config_utils.h
diff --git a/libcutils/include/cutils/fs.h b/include/cutils/fs.h
similarity index 100%
rename from libcutils/include/cutils/fs.h
rename to include/cutils/fs.h
diff --git a/libcutils/include/cutils/hashmap.h b/include/cutils/hashmap.h
similarity index 100%
rename from libcutils/include/cutils/hashmap.h
rename to include/cutils/hashmap.h
diff --git a/libcutils/include/cutils/iosched_policy.h b/include/cutils/iosched_policy.h
similarity index 100%
rename from libcutils/include/cutils/iosched_policy.h
rename to include/cutils/iosched_policy.h
diff --git a/libcutils/include/cutils/jstring.h b/include/cutils/jstring.h
similarity index 100%
rename from libcutils/include/cutils/jstring.h
rename to include/cutils/jstring.h
diff --git a/libcutils/include/cutils/klog.h b/include/cutils/klog.h
similarity index 100%
rename from libcutils/include/cutils/klog.h
rename to include/cutils/klog.h
diff --git a/libcutils/include/cutils/list.h b/include/cutils/list.h
similarity index 100%
rename from libcutils/include/cutils/list.h
rename to include/cutils/list.h
diff --git a/libcutils/include/cutils/log.h b/include/cutils/log.h
similarity index 100%
rename from libcutils/include/cutils/log.h
rename to include/cutils/log.h
diff --git a/libcutils/include/cutils/memory.h b/include/cutils/memory.h
similarity index 100%
rename from libcutils/include/cutils/memory.h
rename to include/cutils/memory.h
diff --git a/libcutils/include/cutils/misc.h b/include/cutils/misc.h
similarity index 100%
rename from libcutils/include/cutils/misc.h
rename to include/cutils/misc.h
diff --git a/libcutils/include/cutils/multiuser.h b/include/cutils/multiuser.h
similarity index 100%
rename from libcutils/include/cutils/multiuser.h
rename to include/cutils/multiuser.h
diff --git a/libcutils/include/cutils/native_handle.h b/include/cutils/native_handle.h
similarity index 100%
rename from libcutils/include/cutils/native_handle.h
rename to include/cutils/native_handle.h
diff --git a/libcutils/include/cutils/open_memstream.h b/include/cutils/open_memstream.h
similarity index 100%
rename from libcutils/include/cutils/open_memstream.h
rename to include/cutils/open_memstream.h
diff --git a/libcutils/include/cutils/partition_utils.h b/include/cutils/partition_utils.h
similarity index 100%
rename from libcutils/include/cutils/partition_utils.h
rename to include/cutils/partition_utils.h
diff --git a/libcutils/include/cutils/properties.h b/include/cutils/properties.h
similarity index 100%
rename from libcutils/include/cutils/properties.h
rename to include/cutils/properties.h
diff --git a/libcutils/include/cutils/qtaguid.h b/include/cutils/qtaguid.h
similarity index 100%
rename from libcutils/include/cutils/qtaguid.h
rename to include/cutils/qtaguid.h
diff --git a/libcutils/include/cutils/record_stream.h b/include/cutils/record_stream.h
similarity index 100%
rename from libcutils/include/cutils/record_stream.h
rename to include/cutils/record_stream.h
diff --git a/libcutils/include/cutils/sched_policy.h b/include/cutils/sched_policy.h
similarity index 100%
rename from libcutils/include/cutils/sched_policy.h
rename to include/cutils/sched_policy.h
diff --git a/libcutils/include/cutils/sockets.h b/include/cutils/sockets.h
similarity index 100%
rename from libcutils/include/cutils/sockets.h
rename to include/cutils/sockets.h
diff --git a/libcutils/include/cutils/str_parms.h b/include/cutils/str_parms.h
similarity index 100%
rename from libcutils/include/cutils/str_parms.h
rename to include/cutils/str_parms.h
diff --git a/libcutils/include/cutils/threads.h b/include/cutils/threads.h
similarity index 100%
rename from libcutils/include/cutils/threads.h
rename to include/cutils/threads.h
diff --git a/libcutils/include/cutils/trace.h b/include/cutils/trace.h
similarity index 100%
rename from libcutils/include/cutils/trace.h
rename to include/cutils/trace.h
diff --git a/libcutils/include/cutils/uevent.h b/include/cutils/uevent.h
similarity index 100%
rename from libcutils/include/cutils/uevent.h
rename to include/cutils/uevent.h
diff --git a/include/log b/include/log
deleted file mode 120000
index 714065f..0000000
--- a/include/log
+++ /dev/null
@@ -1 +0,0 @@
-../liblog/include/log
\ No newline at end of file
diff --git a/liblog/include/log/event_tag_map.h b/include/log/event_tag_map.h
similarity index 100%
rename from liblog/include/log/event_tag_map.h
rename to include/log/event_tag_map.h
diff --git a/liblog/include/log/log.h b/include/log/log.h
similarity index 100%
rename from liblog/include/log/log.h
rename to include/log/log.h
diff --git a/liblog/include/log/log_event_list.h b/include/log/log_event_list.h
similarity index 100%
rename from liblog/include/log/log_event_list.h
rename to include/log/log_event_list.h
diff --git a/libcutils/include/cutils/log.h b/include/log/logd.h
similarity index 100%
copy from libcutils/include/cutils/log.h
copy to include/log/logd.h
diff --git a/libcutils/include/cutils/log.h b/include/log/logger.h
similarity index 100%
copy from libcutils/include/cutils/log.h
copy to include/log/logger.h
diff --git a/liblog/include/log/logprint.h b/include/log/logprint.h
similarity index 100%
rename from liblog/include/log/logprint.h
rename to include/log/logprint.h
diff --git a/liblog/include/log/uio.h b/include/log/uio.h
similarity index 100%
rename from liblog/include/log/uio.h
rename to include/log/uio.h
diff --git a/include/private/android_logger.h b/include/private/android_logger.h
deleted file mode 120000
index f187a6d..0000000
--- a/include/private/android_logger.h
+++ /dev/null
@@ -1 +0,0 @@
-../../liblog/include/private/android_logger.h
\ No newline at end of file
diff --git a/liblog/include/private/android_logger.h b/include/private/android_logger.h
similarity index 100%
rename from liblog/include/private/android_logger.h
rename to include/private/android_logger.h
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index f6c0f0e..b96e3ae 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -30,23 +30,6 @@
     "str_parms.c",
 ]
 
-cc_library_headers {
-    name: "libcutils_vndk_headers",
-    host_supported: true,
-    export_include_dirs: ["include_vndk"],
-}
-
-cc_library_headers {
-    name: "libcutils_headers",
-    host_supported: true,
-    export_include_dirs: ["include"],
-    target: {
-       windows: {
-          enabled: true,
-       },
-    },
-}
-
 cc_library {
     name: "libcutils",
     host_supported: true,
@@ -68,7 +51,6 @@
         "threads.c",
     ],
 
-
     target: {
         host: {
             srcs: ["dlmalloc_stubs.c"],
@@ -135,9 +117,6 @@
     },
 
     shared_libs: ["liblog"],
-    header_libs: ["libcutils_headers"],
-    export_header_lib_headers: ["libcutils_headers"],
-
     product_variables: {
         cpusets: {
             cflags: ["-DUSE_CPUSETS"],
diff --git a/libcutils/include_vndk/cutils/android_get_control_file.h b/libcutils/include_vndk/cutils/android_get_control_file.h
deleted file mode 120000
index 70d6a3b..0000000
--- a/libcutils/include_vndk/cutils/android_get_control_file.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/android_get_control_file.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/android_reboot.h b/libcutils/include_vndk/cutils/android_reboot.h
deleted file mode 120000
index 9e1bf4c..0000000
--- a/libcutils/include_vndk/cutils/android_reboot.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/android_reboot.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/ashmem.h b/libcutils/include_vndk/cutils/ashmem.h
deleted file mode 120000
index 5c07beb..0000000
--- a/libcutils/include_vndk/cutils/ashmem.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/ashmem.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/atomic.h b/libcutils/include_vndk/cutils/atomic.h
deleted file mode 120000
index f4f14fe..0000000
--- a/libcutils/include_vndk/cutils/atomic.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/atomic.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/bitops.h b/libcutils/include_vndk/cutils/bitops.h
deleted file mode 120000
index edbd60c..0000000
--- a/libcutils/include_vndk/cutils/bitops.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/bitops.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/compiler.h b/libcutils/include_vndk/cutils/compiler.h
deleted file mode 120000
index 08ebc10..0000000
--- a/libcutils/include_vndk/cutils/compiler.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/compiler.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/config_utils.h b/libcutils/include_vndk/cutils/config_utils.h
deleted file mode 120000
index e011738..0000000
--- a/libcutils/include_vndk/cutils/config_utils.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/config_utils.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/fs.h b/libcutils/include_vndk/cutils/fs.h
deleted file mode 120000
index 576bfa3..0000000
--- a/libcutils/include_vndk/cutils/fs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/fs.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/hashmap.h b/libcutils/include_vndk/cutils/hashmap.h
deleted file mode 120000
index 6b18406..0000000
--- a/libcutils/include_vndk/cutils/hashmap.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/hashmap.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/iosched_policy.h b/libcutils/include_vndk/cutils/iosched_policy.h
deleted file mode 120000
index 26cf333..0000000
--- a/libcutils/include_vndk/cutils/iosched_policy.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/iosched_policy.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/jstring.h b/libcutils/include_vndk/cutils/jstring.h
deleted file mode 120000
index f3fd546..0000000
--- a/libcutils/include_vndk/cutils/jstring.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/jstring.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/klog.h b/libcutils/include_vndk/cutils/klog.h
deleted file mode 120000
index 8ca85ff..0000000
--- a/libcutils/include_vndk/cutils/klog.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/klog.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/list.h b/libcutils/include_vndk/cutils/list.h
deleted file mode 120000
index 9fa4c90..0000000
--- a/libcutils/include_vndk/cutils/list.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/list.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/log.h b/libcutils/include_vndk/cutils/log.h
deleted file mode 100644
index ae74024..0000000
--- a/libcutils/include_vndk/cutils/log.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*Special log.h file for VNDK linking modules*/
-/*
- * Copyright (C) 2005-2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-#ifndef _LIBS_CUTIL_LOG_H
-#define _LIBS_CUTIL_LOG_H
-#warning "Deprecated: don't include cutils/log.h, use either android/log.h or log/log.h"
-#include <log/log.h>
-#endif /* _LIBS_CUTIL_LOG_H */
diff --git a/libcutils/include_vndk/cutils/memory.h b/libcutils/include_vndk/cutils/memory.h
deleted file mode 120000
index e0e7abc..0000000
--- a/libcutils/include_vndk/cutils/memory.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/memory.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/misc.h b/libcutils/include_vndk/cutils/misc.h
deleted file mode 120000
index db09eb5..0000000
--- a/libcutils/include_vndk/cutils/misc.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/misc.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/multiuser.h b/libcutils/include_vndk/cutils/multiuser.h
deleted file mode 120000
index 524111f..0000000
--- a/libcutils/include_vndk/cutils/multiuser.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/multiuser.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/native_handle.h b/libcutils/include_vndk/cutils/native_handle.h
deleted file mode 120000
index e324d4e..0000000
--- a/libcutils/include_vndk/cutils/native_handle.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/native_handle.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/open_memstream.h b/libcutils/include_vndk/cutils/open_memstream.h
deleted file mode 120000
index c894084..0000000
--- a/libcutils/include_vndk/cutils/open_memstream.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/open_memstream.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/partition_utils.h b/libcutils/include_vndk/cutils/partition_utils.h
deleted file mode 120000
index d9734c8..0000000
--- a/libcutils/include_vndk/cutils/partition_utils.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/partition_utils.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/properties.h b/libcutils/include_vndk/cutils/properties.h
deleted file mode 120000
index d56118e..0000000
--- a/libcutils/include_vndk/cutils/properties.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/properties.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/qtaguid.h b/libcutils/include_vndk/cutils/qtaguid.h
deleted file mode 120000
index bc02441..0000000
--- a/libcutils/include_vndk/cutils/qtaguid.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/qtaguid.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/record_stream.h b/libcutils/include_vndk/cutils/record_stream.h
deleted file mode 120000
index 8de6494..0000000
--- a/libcutils/include_vndk/cutils/record_stream.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/record_stream.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/sched_policy.h b/libcutils/include_vndk/cutils/sched_policy.h
deleted file mode 120000
index ddebdd0..0000000
--- a/libcutils/include_vndk/cutils/sched_policy.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/sched_policy.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/sockets.h b/libcutils/include_vndk/cutils/sockets.h
deleted file mode 120000
index 585250c..0000000
--- a/libcutils/include_vndk/cutils/sockets.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/sockets.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/str_parms.h b/libcutils/include_vndk/cutils/str_parms.h
deleted file mode 120000
index 9c79a8f..0000000
--- a/libcutils/include_vndk/cutils/str_parms.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/str_parms.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/threads.h b/libcutils/include_vndk/cutils/threads.h
deleted file mode 120000
index 99330ff..0000000
--- a/libcutils/include_vndk/cutils/threads.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/threads.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/trace.h b/libcutils/include_vndk/cutils/trace.h
deleted file mode 120000
index b12e140..0000000
--- a/libcutils/include_vndk/cutils/trace.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/trace.h
\ No newline at end of file
diff --git a/libcutils/include_vndk/cutils/uevent.h b/libcutils/include_vndk/cutils/uevent.h
deleted file mode 120000
index 451283a..0000000
--- a/libcutils/include_vndk/cutils/uevent.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/cutils/uevent.h
\ No newline at end of file
diff --git a/liblog/Android.bp b/liblog/Android.bp
index dd0a778..bbe7d79 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -79,8 +79,6 @@
         },
     },
 
-    export_include_dirs: ["include"],
-
     cflags: [
         "-Werror",
         "-fvisibility=hidden",
@@ -113,11 +111,6 @@
     license: "NOTICE",
 }
 
-cc_library_headers {
-    name: "liblog_vndk_headers",
-    export_include_dirs: ["include_vndk"],
-}
-
 ndk_library {
     name: "liblog.ndk",
     symbol_file: "liblog.map.txt",
diff --git a/liblog/include/log/logd.h b/liblog/include/log/logd.h
deleted file mode 100644
index 77400ca..0000000
--- a/liblog/include/log/logd.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _LIBS_LOG_LOGD_H
-#define _LIBS_LOG_LOGD_H
-#include <log/log.h>
-#warning "Deprecated: do not include log/logd.h, use log/log.h instead"
-#endif /*_LIBS_LOG_LOGD_H*/
diff --git a/liblog/include/log/logger.h b/liblog/include/log/logger.h
deleted file mode 100644
index 1bf2d17..0000000
--- a/liblog/include/log/logger.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _LIBS_LOG_LOGGER_H
-#define _LIBS_LOG_LOGGER_H
-#include <log/log.h>
-#warning "Deprecated: do not include log/logger.h, use log/log.h instead"
-#endif /*_LIBS_LOG_LOGGER_H*/
diff --git a/liblog/include_vndk/android b/liblog/include_vndk/android
deleted file mode 120000
index 69fbc09..0000000
--- a/liblog/include_vndk/android
+++ /dev/null
@@ -1 +0,0 @@
-../../include/android/
\ No newline at end of file
diff --git a/liblog/include_vndk/log/log.h b/liblog/include_vndk/log/log.h
deleted file mode 100644
index f3eb3fe..0000000
--- a/liblog/include_vndk/log/log.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*Special log.h file for VNDK linking modules*/
-
-#ifndef _LIBS_LOG_LOG_H
-#define _LIBS_LOG_LOG_H
-
-#include <android/log.h>
-
-/*The following files will be included once they are available*/
-/*#include <log/log_id.h>*/
-/*#include <log/log_radio.h>*/
-
-/*
- * LOG_TAG is the local tag used for the following simplified
- * logging macros.  You can change this preprocessor definition
- * before using the other macros to change the tag.
- */
-
-#ifndef LOG_TAG
-#define LOG_TAG NULL
-#endif
-
-#endif /*_LIBS_LOG_LOG_H*/