diff --git a/bindgen-tests/tests/expectations/tests/remove_alias.rs b/bindgen-tests/tests/expectations/tests/remove_alias.rs
index bae0fd07f3..37678ac594 100644
--- a/bindgen-tests/tests/expectations/tests/remove_alias.rs
+++ b/bindgen-tests/tests/expectations/tests/remove_alias.rs
@@ -38,14 +38,23 @@ fn bindgen_test_layout_int32_() {
     );
 }
 extern "C" {
-    pub fn foo() -> ::std::os::raw::c_longlong;
+    #[link_name = "\u{1}_Z13returns_int64v"]
+    pub fn returns_int64() -> ::std::os::raw::c_longlong;
 }
 extern "C" {
-    pub fn bar() -> ::std::os::raw::c_int;
+    #[link_name = "\u{1}_Z13returns_int32v"]
+    pub fn returns_int32() -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn baz() -> i32_;
+    #[link_name = "\u{1}_Z11returns_i32v"]
+    pub fn returns_i32() -> i32_;
 }
 extern "C" {
-    pub fn qux() -> int32_;
+    #[link_name = "\u{1}_Z14returns_int32_v"]
+    pub fn returns_int32_() -> int32_;
 }
+extern "C" {
+    #[link_name = "\u{1}_Z17returns_int32_ptrv"]
+    pub fn returns_int32_ptr() -> *mut ::std::os::raw::c_int;
+}
+pub type integer<T> = T;
diff --git a/bindgen-tests/tests/expectations/tests/remove_template_alias.rs b/bindgen-tests/tests/expectations/tests/remove_template_alias.rs
deleted file mode 100644
index e06ffadab3..0000000000
--- a/bindgen-tests/tests/expectations/tests/remove_template_alias.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![allow(
-    dead_code,
-    non_snake_case,
-    non_camel_case_types,
-    non_upper_case_globals
-)]
-
-pub type Wrapped<T> = T;
diff --git a/bindgen-tests/tests/headers/remove_alias.h b/bindgen-tests/tests/headers/remove_alias.h
deleted file mode 100644
index 1b83396c25..0000000000
--- a/bindgen-tests/tests/headers/remove_alias.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// bindgen-flags: --remove-alias "int.*"
-
-typedef long long int64;
-typedef int int32;
-typedef int32 i32;
-
-struct int32_ {
-    int32 inner;
-};
-
-int64 foo();
-int32 bar();
-i32 baz();
-struct int32_ qux();
diff --git a/bindgen-tests/tests/headers/remove_alias.hpp b/bindgen-tests/tests/headers/remove_alias.hpp
new file mode 100644
index 0000000000..58f97f3145
--- /dev/null
+++ b/bindgen-tests/tests/headers/remove_alias.hpp
@@ -0,0 +1,18 @@
+// bindgen-flags: --remove-alias "int.*"
+
+typedef long long int64;
+typedef int int32;
+typedef int32 i32;
+struct int32_ {
+    int32 inner;
+};
+typedef int32* int32_ptr;
+
+int64 returns_int64();
+int32 returns_int32();
+i32 returns_i32();
+struct int32_ returns_int32_();
+int32_ptr returns_int32_ptr();
+
+template<typename T>
+using integer = T;
diff --git a/bindgen-tests/tests/headers/remove_template_alias.hpp b/bindgen-tests/tests/headers/remove_template_alias.hpp
deleted file mode 100644
index a77021f726..0000000000
--- a/bindgen-tests/tests/headers/remove_template_alias.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// bindgen-flags: --remove-alias "Wrapped"
-
-template<typename T>
-using Wrapped = T;