diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index f8f9c5bacd3..60439d90b74 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -244,26 +244,6 @@ libstdc++32_package() {
 
 fi # !x86_64
 
-gcc_package() {
-	depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}"
-	pkg_install() {
-		vmove usr
-	}
-}
-
-gcc-c++_package() {
-	depends="gcc>=${_majorver} libstdc++-devel>=${_majorver}"
-	short_desc="GCC C++ support"
-
-	pkg_install() {
-		for f in g++ c++ ${_triplet}-g++ ${_triplet}-c++; do
-			vmove usr/bin/${f}
-		done
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1plus
-		vmove usr/share/man/man1/g++.1
-	}
-}
-
 # Disabled packages in cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 
@@ -297,6 +277,15 @@ gcc-go_package() {
 	}
 }
 
+gcc-objc++_package() {
+	depends="gcc-c++>=${_majorver} gcc-objc>=${_majorver}"
+	short_desc="GCC Objective-C++ support"
+
+	pkg_install() {
+		vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus
+	}
+}
+
 gcc-objc_package() {
 	depends="gcc>=${_majorver} libobjc>=${_majorver}"
 	short_desc="GCC Objective-C support"
@@ -307,15 +296,6 @@ gcc-objc_package() {
 	}
 }
 
-gcc-objc++_package() {
-	depends="gcc-c++>=${_majorver} gcc-objc>=${_majorver}"
-	short_desc="GCC Objective-C++ support"
-
-	pkg_install() {
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus
-	}
-}
-
 libgfortran-devel_package() {
 	depends="libgfortran>=${_majorver}"
 	short_desc="GCC Fortran library ${version} - development files"
@@ -378,6 +358,7 @@ libquadmath-devel_package() {
 	short_desc="GCC quadmath shared support library (development files)"
 
 	pkg_install() {
+		vmove "/usr/lib/gcc/${_triplet}/${_majorver}/include/quadmath*"
 		vmove "usr/lib/libquadmath*.a"
 		vmove usr/share/info/libquadmath.info
 	}
@@ -493,3 +474,23 @@ libstdc++_package() {
 		vinstall COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
+gcc-c++_package() {
+	depends="gcc>=${_majorver} libstdc++-devel>=${_majorver}"
+	short_desc="GCC C++ support"
+
+	pkg_install() {
+		for f in g++ c++ ${_triplet}-g++ ${_triplet}-c++; do
+			vmove usr/bin/${f}
+		done
+		vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1plus
+		vmove usr/share/man/man1/g++.1
+	}
+}
+
+gcc_package() {
+	depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}"
+	pkg_install() {
+		vmove usr
+	}
+}