diff --git a/lib/typetraits.h b/lib/typetraits.h
index fb3d970d97..fcce130b6c 100644
--- a/lib/typetraits.h
+++ b/lib/typetraits.h
@@ -43,17 +43,6 @@
 )
 
 
-#define is_same_type(a, b)                                                    \
-(                                                                             \
-	__builtin_types_compatible_p(a, b)                                    \
-)
-
-#define is_same_typeof(a, b)                                                  \
-(                                                                             \
-	is_same_type(typeof(a), typeof(b))                                    \
-)
-
-
 #define QChar_of(s)  typeof                                           \
 (                                                                     \
 	_Generic(s,                                                   \
diff --git a/src/usermod.c b/src/usermod.c
index e8c9da6687..6d9c8cafdb 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -9,9 +9,6 @@
 
 #include "config.h"
 
-#ident "$Id$"
-
-#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -325,8 +322,8 @@ getid_range(const char *str)
 		.last = type_min(id_t)
 	};
 
-	static_assert(is_same_type(id_t, uid_t), "");
-	static_assert(is_same_type(id_t, gid_t), "");
+	_Generic((id_t){}, uid_t: (void)0);
+	_Generic((id_t){}, gid_t: (void)0);
 
 	first = type_min(id_t);
 	last = type_max(id_t);