diff --git a/hybris/android-headers-4.4/APKBUILD b/hybris/android-headers-4.4/APKBUILD
index eba09b908..c90571513 100644
--- a/hybris/android-headers-4.4/APKBUILD
+++ b/hybris/android-headers-4.4/APKBUILD
@@ -1,13 +1,13 @@
+# Contributor: TheKit <nekit1000@gmail.com>
+# Maintainer: TheKit <nekit1000@gmail.com>
 pkgname=android-headers-4.4
 _pkgname=android-headers
 pkgver=4.4_git20171022
 _pkgver=4.4
 pkgrel=0
-arch="noarch !x86 !x86_64"
+arch="aarch64 armhf armv7"
 url="https://github.com/ubports/android-headers"
-license="Apache"
-makedepends=""
-depends=""
+license="Apache-2.0"
 _commit="f636fa26a61b36bef284a7aeba95eb767344b8b4"
 source="$pkgname-$_commit.tar.gz::https://github.com/ubports/android-headers/archive/$_commit.tar.gz
 	android-headers.pc"
@@ -17,12 +17,10 @@ options="!check"
 builddir="$srcdir/$_pkgname-$_commit"
 
 package() {
-	cd "$builddir"
+	mkdir -p "$pkgdir/usr/include"
+	cp -r "$builddir/19" "$pkgdir/usr/include/android-$_pkgver"
 
-	mkdir -p "${pkgdir}/usr/include"
-	cp -r "$builddir/19" "${pkgdir}/usr/include/android-$_pkgver"
-
-	install -Dm644 "$srcdir/android-headers.pc" "${pkgdir}/usr/lib/pkgconfig/android-headers-$_pkgver.pc"
+	install -Dm644 "$srcdir/android-headers.pc" "$pkgdir/usr/lib/pkgconfig/android-headers-$_pkgver.pc"
 }
 
 sha512sums="c146753908ae0dd9aca0138a0a63e8578d65200d6d9b5154b846a0ac3309d9e33f6edddd92cd420e7b7dcaf73630546eb1bd45927cf8b4921f67dec7db7bb55c  android-headers-4.4-f636fa26a61b36bef284a7aeba95eb767344b8b4.tar.gz
diff --git a/hybris/android-headers-7.1/APKBUILD b/hybris/android-headers-7.1/APKBUILD
index 948149199..a6b0b65b4 100644
--- a/hybris/android-headers-7.1/APKBUILD
+++ b/hybris/android-headers-7.1/APKBUILD
@@ -1,13 +1,13 @@
+# Contributor: TheKit <nekit1000@gmail.com>
+# Maintainer: TheKit <nekit1000@gmail.com>
 pkgname=android-headers-7.1
 _pkgname=android-headers
 pkgver=7.1_git20170630
 _pkgver=7.1
 pkgrel=0
-arch="noarch !x86 !x86_64"
+arch="aarch64 armhf armv7"
 url="https://github.com/Halium/android-headers"
-license="Apache"
-makedepends=""
-depends=""
+license="Apache-2.0"
 _commit="1f6591ba7d42b91c32acf5a65a2a4fae983d6865"
 source="$pkgname-$_commit.tar.gz::https://github.com/Halium/android-headers/archive/$_commit.tar.gz"
 pkgdesc="Android headers used for building libhybris"
@@ -16,12 +16,11 @@ subpackages="$pkgname-caf:package_caf"
 builddir="$srcdir/$_pkgname-$_commit"
 
 package() {
-	cd "$builddir"
-	make PREFIX=/usr DESTDIR="${pkgdir}" install
+	make PREFIX=/usr DESTDIR="$pkgdir" install
 
-	mv ${pkgdir}/usr/include/android ${pkgdir}/usr/include/android-$_pkgver
-	sed -i "s~${includedir}/android~${includedir}/android-$_pkgver~g" ${pkgdir}/usr/lib/pkgconfig/android-headers.pc
-	mv "${pkgdir}/usr/lib/pkgconfig/android-headers.pc" "${pkgdir}/usr/lib/pkgconfig/android-headers-$_pkgver.pc"
+	mv "$pkgdir/usr/include/android" "$pkgdir/usr/include/android-$_pkgver"
+	sed -i "s~$includedir/android~$includedir/android-$_pkgver~g" "$pkgdir"/usr/lib/pkgconfig/android-headers.pc
+	mv "$pkgdir/usr/lib/pkgconfig/android-headers.pc" "$pkgdir/usr/lib/pkgconfig/android-headers-$_pkgver.pc"
 }
 
 
@@ -29,11 +28,11 @@ package_caf() {
 	cd "$builddir"
 
 	sed -i 's~/\* CONFIG GOES HERE \*/~#define QCOM_BSP 1\n#define QTI_BSP 1~g' android-config.h
-	make PREFIX=/usr DESTDIR="${subpkgdir}" install
+	make PREFIX=/usr DESTDIR="$subpkgdir" install
 
-	mv ${subpkgdir}/usr/include/android ${subpkgdir}/usr/include/android-$_pkgver-caf
-	sed -i "s~${includedir}/android~${includedir}/android-$_pkgver-caf~g" ${subpkgdir}/usr/lib/pkgconfig/android-headers.pc
-	mv "${subpkgdir}/usr/lib/pkgconfig/android-headers.pc" "${subpkgdir}/usr/lib/pkgconfig/android-headers-$_pkgver-caf.pc"
+	mv "$subpkgdir/usr/include/android" "$subpkgdir/usr/include/android-$_pkgver-caf"
+	sed -i "s~$includedir/android~$includedir/android-$_pkgver-caf~g" "$subpkgdir"/usr/lib/pkgconfig/android-headers.pc
+	mv "$subpkgdir/usr/lib/pkgconfig/android-headers.pc" "$subpkgdir/usr/lib/pkgconfig/android-headers-$_pkgver-caf.pc"
 }
 
 sha512sums="652641b469f7faf90c7adf03b14047f9eb24fdb190d9ab131d72f73b2d9357aad80cad48867ede66b0a737661cfb9e26fb4583b9fed15b8d6d667fe53ea14419  android-headers-7.1-1f6591ba7d42b91c32acf5a65a2a4fae983d6865.tar.gz"
diff --git a/hybris/android-headers-9.0/APKBUILD b/hybris/android-headers-9.0/APKBUILD
index 9841b7a6a..fc32eded0 100644
--- a/hybris/android-headers-9.0/APKBUILD
+++ b/hybris/android-headers-9.0/APKBUILD
@@ -1,13 +1,13 @@
+# Contributor: TheKit <nekit1000@gmail.com>
+# Maintainer: TheKit <nekit1000@gmail.com>
 pkgname=android-headers-9.0
 _pkgname=android-headers
 pkgver=9.0_git20190803
 _pkgver=9.0
 pkgrel=0
-arch="noarch !x86 !x86_64"
+arch="aarch64 armhf armv7"
 url="https://github.com/Halium/android-headers"
-license="Apache"
-makedepends=""
-depends=""
+license="Apache-2.0"
 _commit="00543b4ff3f56a9f96be336df276365aef46f8a2"
 source="$pkgname-$_commit.tar.gz::https://github.com/Halium/android-headers/archive/$_commit.tar.gz"
 pkgdesc="Android headers used for building libhybris"
@@ -15,12 +15,11 @@ pkgdesc="Android headers used for building libhybris"
 builddir="$srcdir/$_pkgname-$_commit"
 
 package() {
-	cd "$builddir"
-	make PREFIX=/usr DESTDIR="${pkgdir}" install
+	make PREFIX=/usr DESTDIR="$pkgdir" install
 
-	mv ${pkgdir}/usr/include/android ${pkgdir}/usr/include/android-$_pkgver
-	sed -i "s~${includedir}/android~${includedir}/android-$_pkgver~g" ${pkgdir}/usr/lib/pkgconfig/android-headers.pc
-	mv "${pkgdir}/usr/lib/pkgconfig/android-headers.pc" "${pkgdir}/usr/lib/pkgconfig/android-headers-$_pkgver.pc"
+	mv "$pkgdir/usr/include/android" "$pkgdir/usr/include/android-$_pkgver"
+	sed -i "s~$includedir/android~$includedir/android-$_pkgver~g" "$pkgdir/usr/lib/pkgconfig/android-headers.pc"
+	mv "$pkgdir/usr/lib/pkgconfig/android-headers.pc" "$pkgdir/usr/lib/pkgconfig/android-headers-$_pkgver.pc"
 }
 
 sha512sums="9b2ab8d7ee56f8e5a875ed139814ed4f6171c3ccd1542a19b74a23cea0fd03ed9aa9b1ee70f2660d858dab891fc55681af6e7510f10995083d23a06a058e6d6d  android-headers-9.0-00543b4ff3f56a9f96be336df276365aef46f8a2.tar.gz"