diff --git a/Makefile b/Makefile
index 91b6946ac3..2b08d30ffe 100644
--- a/Makefile
+++ b/Makefile
@@ -75,10 +75,10 @@ endif
 
 # check prerequisites before starting to build
 prereq: $(target/stamp-prereq) tmp/.prereq_packages
-	@if [ ! -f "$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)" ]; then \
-		echo 'ERROR: Missing site config for target "$(REAL_GNU_TARGET_NAME)" !'; \
+	@if [ ! -f "$(INCLUDE_DIR)/site/$(ARCH)" ]; then \
+		echo 'ERROR: Missing site config for architecture "$(ARCH)" !'; \
 		echo '       The missing file will cause configure scripts to fail during compilation.'; \
-		echo '       Please provide a "$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)" file and restart the build.'; \
+		echo '       Please provide a "$(INCLUDE_DIR)/site/$(ARCH)" file and restart the build.'; \
 		exit 1; \
 	fi
 
diff --git a/include/package.mk b/include/package.mk
index b364c3b66a..435509e9dc 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -127,7 +127,7 @@ include $(INCLUDE_DIR)/package-bin.mk
 include $(INCLUDE_DIR)/autotools.mk
 
 override MAKEFLAGS=
-CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
+CONFIG_SITE:=$(INCLUDE_DIR)/site/$(ARCH)
 CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
 SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
 PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig
diff --git a/include/site/aarch64-linux b/include/site/aarch64
similarity index 94%
rename from include/site/aarch64-linux
rename to include/site/aarch64
index 41dfc01df5..c5aa9c5543 100644
--- a/include/site/aarch64-linux
+++ b/include/site/aarch64
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
 
diff --git a/include/site/aarch64-openwrt-linux-gnu b/include/site/aarch64-openwrt-linux-gnu
deleted file mode 100644
index d84dd0a17e..0000000000
--- a/include/site/aarch64-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/aarch64-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/mips64-linux b/include/site/aarch64_be
similarity index 94%
rename from include/site/mips64-linux
rename to include/site/aarch64_be
index 1541a89d15..19e75ab991 100644
--- a/include/site/mips64-linux
+++ b/include/site/aarch64_be
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
 
diff --git a/include/site/aarch64_be-openwrt-linux-gnu b/include/site/aarch64_be-openwrt-linux-gnu
deleted file mode 100644
index d84dd0a17e..0000000000
--- a/include/site/aarch64_be-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/aarch64-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/i686-linux b/include/site/arm
similarity index 94%
rename from include/site/i686-linux
rename to include/site/arm
index 80cc8db289..72a3805c64 100644
--- a/include/site/i686-linux
+++ b/include/site/arm
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
 
diff --git a/include/site/arm-openwrt-linux-gnu b/include/site/arm-openwrt-linux-gnu
deleted file mode 100644
index efb72453ae..0000000000
--- a/include/site/arm-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/arm-openwrt-linux-gnueabi b/include/site/arm-openwrt-linux-gnueabi
deleted file mode 100644
index efb72453ae..0000000000
--- a/include/site/arm-openwrt-linux-gnueabi
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/arm-openwrt-linux-musl b/include/site/arm-openwrt-linux-musl
deleted file mode 100644
index f17d96abcd..0000000000
--- a/include/site/arm-openwrt-linux-musl
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/arm-openwrt-linux-muslgnueabi b/include/site/arm-openwrt-linux-muslgnueabi
deleted file mode 100644
index f17d96abcd..0000000000
--- a/include/site/arm-openwrt-linux-muslgnueabi
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/arm-openwrt-linux-uclibc b/include/site/arm-openwrt-linux-uclibc
deleted file mode 100644
index f17d96abcd..0000000000
--- a/include/site/arm-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/arm-openwrt-linux-uclibcgnueabi b/include/site/arm-openwrt-linux-uclibcgnueabi
deleted file mode 100644
index f17d96abcd..0000000000
--- a/include/site/arm-openwrt-linux-uclibcgnueabi
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/sparc-linux b/include/site/armeb
similarity index 94%
rename from include/site/sparc-linux
rename to include/site/armeb
index c421c51ad9..a5626a722b 100644
--- a/include/site/sparc-linux
+++ b/include/site/armeb
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
 
diff --git a/include/site/armeb-openwrt-linux-gnu b/include/site/armeb-openwrt-linux-gnu
deleted file mode 100644
index 41129b071f..0000000000
--- a/include/site/armeb-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/armeb-openwrt-linux-gnueabi b/include/site/armeb-openwrt-linux-gnueabi
deleted file mode 100644
index 41129b071f..0000000000
--- a/include/site/armeb-openwrt-linux-gnueabi
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/armeb-openwrt-linux-musl b/include/site/armeb-openwrt-linux-musl
deleted file mode 100644
index dd64a9c532..0000000000
--- a/include/site/armeb-openwrt-linux-musl
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/armeb-openwrt-linux-muslgnueabi b/include/site/armeb-openwrt-linux-muslgnueabi
deleted file mode 100644
index dd64a9c532..0000000000
--- a/include/site/armeb-openwrt-linux-muslgnueabi
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/armeb-openwrt-linux-uclibc b/include/site/armeb-openwrt-linux-uclibc
deleted file mode 100644
index dd64a9c532..0000000000
--- a/include/site/armeb-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/armeb-openwrt-linux-uclibcgnueabi b/include/site/armeb-openwrt-linux-uclibcgnueabi
deleted file mode 100644
index dd64a9c532..0000000000
--- a/include/site/armeb-openwrt-linux-uclibcgnueabi
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/arm-linux b/include/site/i486
similarity index 94%
rename from include/site/arm-linux
rename to include/site/i486
index 80cc8db289..72a3805c64 100644
--- a/include/site/arm-linux
+++ b/include/site/i486
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
 
diff --git a/include/site/i486-openwrt-linux-gnu b/include/site/i486-openwrt-linux-gnu
deleted file mode 100644
index 77bbe2412a..0000000000
--- a/include/site/i486-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i486-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/i486-openwrt-linux-musl b/include/site/i486-openwrt-linux-musl
deleted file mode 100644
index 4d796d6834..0000000000
--- a/include/site/i486-openwrt-linux-musl
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i486-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/i486-openwrt-linux-uclibc b/include/site/i486-openwrt-linux-uclibc
deleted file mode 100644
index 4d796d6834..0000000000
--- a/include/site/i486-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i486-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/i686 b/include/site/i686
new file mode 100644
index 0000000000..78f1557b79
--- /dev/null
+++ b/include/site/i686
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $TOPDIR/include/site/i486
+
diff --git a/include/site/i686-openwrt-linux-gnu b/include/site/i686-openwrt-linux-gnu
deleted file mode 100644
index 6c9c929ce8..0000000000
--- a/include/site/i686-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i686-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/i686-openwrt-linux-musl b/include/site/i686-openwrt-linux-musl
deleted file mode 100644
index ef073da320..0000000000
--- a/include/site/i686-openwrt-linux-musl
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i686-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/i686-openwrt-linux-uclibc b/include/site/i686-openwrt-linux-uclibc
deleted file mode 100644
index ef073da320..0000000000
--- a/include/site/i686-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i686-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/linux-gnu b/include/site/linux-gnu
deleted file mode 100644
index be4a8d0018..0000000000
--- a/include/site/linux-gnu
+++ /dev/null
@@ -1 +0,0 @@
-. $TOPDIR/include/site/linux
diff --git a/include/site/linux-uclibc b/include/site/linux-uclibc
deleted file mode 100644
index be4a8d0018..0000000000
--- a/include/site/linux-uclibc
+++ /dev/null
@@ -1 +0,0 @@
-. $TOPDIR/include/site/linux
diff --git a/include/site/m68k-linux b/include/site/m68k
similarity index 94%
rename from include/site/m68k-linux
rename to include/site/m68k
index a2533ded62..0037600a09 100644
--- a/include/site/m68k-linux
+++ b/include/site/m68k
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
 
diff --git a/include/site/m68k-openwrt-linux-gnu b/include/site/m68k-openwrt-linux-gnu
deleted file mode 100644
index 69c51d5968..0000000000
--- a/include/site/m68k-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/m68k-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/m68k-openwrt-linux-uclibc b/include/site/m68k-openwrt-linux-uclibc
deleted file mode 100644
index 69c51d5968..0000000000
--- a/include/site/m68k-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/m68k-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/mips-linux b/include/site/mips
similarity index 94%
rename from include/site/mips-linux
rename to include/site/mips
index c421c51ad9..a5626a722b 100644
--- a/include/site/mips-linux
+++ b/include/site/mips
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
 
diff --git a/include/site/mips-linux-gnu b/include/site/mips-linux-gnu
deleted file mode 100644
index a70e9a71f7..0000000000
--- a/include/site/mips-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/mips-openwrt-linux-gnu b/include/site/mips-openwrt-linux-gnu
deleted file mode 100644
index a70e9a71f7..0000000000
--- a/include/site/mips-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/mips-openwrt-linux-musl b/include/site/mips-openwrt-linux-musl
deleted file mode 100644
index 76a1b28317..0000000000
--- a/include/site/mips-openwrt-linux-musl
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/mips-openwrt-linux-uclibc b/include/site/mips-openwrt-linux-uclibc
deleted file mode 100644
index 76a1b28317..0000000000
--- a/include/site/mips-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/aarch64_be-linux b/include/site/mips64
similarity index 94%
rename from include/site/aarch64_be-linux
rename to include/site/mips64
index 1541a89d15..19e75ab991 100644
--- a/include/site/aarch64_be-linux
+++ b/include/site/mips64
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
 
diff --git a/include/site/mips64-openwrt-linux-gnu b/include/site/mips64-openwrt-linux-gnu
deleted file mode 100644
index b7474d527a..0000000000
--- a/include/site/mips64-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/mips64-openwrt-linux-uclibc b/include/site/mips64-openwrt-linux-uclibc
deleted file mode 100644
index 1b1347ce94..0000000000
--- a/include/site/mips64-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/mips64el-linux b/include/site/mips64el
similarity index 94%
rename from include/site/mips64el-linux
rename to include/site/mips64el
index 41dfc01df5..c5aa9c5543 100644
--- a/include/site/mips64el-linux
+++ b/include/site/mips64el
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
 
diff --git a/include/site/mips64el-openwrt-linux-gnu b/include/site/mips64el-openwrt-linux-gnu
deleted file mode 100644
index b7474d527a..0000000000
--- a/include/site/mips64el-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/mips64el-openwrt-linux-uclibc b/include/site/mips64el-openwrt-linux-uclibc
deleted file mode 100644
index 1b1347ce94..0000000000
--- a/include/site/mips64el-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/i486-linux b/include/site/mipsel
similarity index 94%
rename from include/site/i486-linux
rename to include/site/mipsel
index 80cc8db289..72a3805c64 100644
--- a/include/site/i486-linux
+++ b/include/site/mipsel
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
 
diff --git a/include/site/mipsel-linux b/include/site/mipsel-linux
deleted file mode 100644
index 80cc8db289..0000000000
--- a/include/site/mipsel-linux
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
-ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
-
-ac_cv_sizeof___int64=0
-ac_cv_sizeof_char=1
-ac_cv_sizeof_int=4
-ac_cv_sizeof_int16_t=2
-ac_cv_sizeof_int32_t=4
-ac_cv_sizeof_int64_t=8
-ac_cv_sizeof_long_int=4
-ac_cv_sizeof_long_long=8
-ac_cv_sizeof_long=4
-ac_cv_sizeof_off_t=8
-ac_cv_sizeof_short_int=2
-ac_cv_sizeof_short=2
-ac_cv_sizeof_size_t=4
-ac_cv_sizeof_ssize_t=4
-ac_cv_sizeof_u_int16_t=2
-ac_cv_sizeof_u_int32_t=4
-ac_cv_sizeof_u_int64_t=8
-ac_cv_sizeof_uint16_t=2
-ac_cv_sizeof_uint32_t=4
-ac_cv_sizeof_uint64_t=8
-ac_cv_sizeof_unsigned_int=4
-ac_cv_sizeof_unsigned_long=4
-ac_cv_sizeof_unsigned_long_long=8
-ac_cv_sizeof_unsigned_short=2
-ac_cv_sizeof_void_p=4
diff --git a/include/site/mipsel-linux-gnu b/include/site/mipsel-linux-gnu
deleted file mode 100644
index fa33e56fad..0000000000
--- a/include/site/mipsel-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/mipsel-openwrt-linux-gnu b/include/site/mipsel-openwrt-linux-gnu
deleted file mode 100644
index fa33e56fad..0000000000
--- a/include/site/mipsel-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/mipsel-openwrt-linux-musl b/include/site/mipsel-openwrt-linux-musl
deleted file mode 100644
index b53d4d4844..0000000000
--- a/include/site/mipsel-openwrt-linux-musl
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/mipsel-openwrt-linux-uclibc b/include/site/mipsel-openwrt-linux-uclibc
deleted file mode 100644
index b53d4d4844..0000000000
--- a/include/site/mipsel-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/mipsel-openwrt-linux2.4-uclibc b/include/site/mipsel-openwrt-linux2.4-uclibc
deleted file mode 100644
index 3412411cb4..0000000000
--- a/include/site/mipsel-openwrt-linux2.4-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-uclibc
-ac_cv_header_sys_inotify_h=no
diff --git a/include/site/powerpc-linux b/include/site/powerpc
similarity index 94%
rename from include/site/powerpc-linux
rename to include/site/powerpc
index c421c51ad9..a5626a722b 100644
--- a/include/site/powerpc-linux
+++ b/include/site/powerpc
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
 
diff --git a/include/site/powerpc-openwrt-linux-gnu b/include/site/powerpc-openwrt-linux-gnu
deleted file mode 100644
index bafb5df36d..0000000000
--- a/include/site/powerpc-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/powerpc-openwrt-linux-gnuspe b/include/site/powerpc-openwrt-linux-gnuspe
deleted file mode 100644
index bafb5df36d..0000000000
--- a/include/site/powerpc-openwrt-linux-gnuspe
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/powerpc-openwrt-linux-musl b/include/site/powerpc-openwrt-linux-musl
deleted file mode 100644
index bb48ee234f..0000000000
--- a/include/site/powerpc-openwrt-linux-musl
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/powerpc-openwrt-linux-uclibc b/include/site/powerpc-openwrt-linux-uclibc
deleted file mode 100644
index bb48ee234f..0000000000
--- a/include/site/powerpc-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/powerpc-openwrt-linux-uclibcspe b/include/site/powerpc-openwrt-linux-uclibcspe
deleted file mode 100644
index bb48ee234f..0000000000
--- a/include/site/powerpc-openwrt-linux-uclibcspe
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/armeb-linux b/include/site/sparc
similarity index 94%
rename from include/site/armeb-linux
rename to include/site/sparc
index c421c51ad9..a5626a722b 100644
--- a/include/site/armeb-linux
+++ b/include/site/sparc
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
 
diff --git a/include/site/sparc-linux-gnu b/include/site/sparc-linux-gnu
deleted file mode 100644
index 2fc6bf5528..0000000000
--- a/include/site/sparc-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/sparc-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/sparc-openwrt-linux-gnu b/include/site/sparc-openwrt-linux-gnu
deleted file mode 100644
index 2fc6bf5528..0000000000
--- a/include/site/sparc-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/sparc-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/sparc-openwrt-linux-uclibc b/include/site/sparc-openwrt-linux-uclibc
deleted file mode 100644
index 7a56dbd42f..0000000000
--- a/include/site/sparc-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/sparc-linux
-. $TOPDIR/include/site/linux
-
diff --git a/include/site/x86_64-linux b/include/site/x86_64
similarity index 94%
rename from include/site/x86_64-linux
rename to include/site/x86_64
index 803213c51c..b8d581d448 100644
--- a/include/site/x86_64-linux
+++ b/include/site/x86_64
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
 
diff --git a/include/site/x86_64-openwrt-linux-gnu b/include/site/x86_64-openwrt-linux-gnu
deleted file mode 100644
index 602258408c..0000000000
--- a/include/site/x86_64-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/x86_64-linux
-. $TOPDIR/include/site/linux-gnu
-
diff --git a/include/site/x86_64-openwrt-linux-musl b/include/site/x86_64-openwrt-linux-musl
deleted file mode 100644
index cc351dfef8..0000000000
--- a/include/site/x86_64-openwrt-linux-musl
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/x86_64-linux
-. $TOPDIR/include/site/linux-uclibc
-
diff --git a/include/site/x86_64-openwrt-linux-uclibc b/include/site/x86_64-openwrt-linux-uclibc
deleted file mode 100644
index cc351dfef8..0000000000
--- a/include/site/x86_64-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/x86_64-linux
-. $TOPDIR/include/site/linux-uclibc
-