diff --git a/authd/provider.cc b/authd/provider.cc
index dbc771ee3..868240f7f 100644
--- a/authd/provider.cc
+++ b/authd/provider.cc
@@ -377,7 +377,7 @@ handle_cancel_connection(int parc, char *parv[])
 }
 
 static void
-provider_timeout_event(void *notused __unused)
+provider_timeout_event(void *notused)
 {
 	struct auth_client *auth;
 	rb_dictionary_iter iter;
diff --git a/authd/providers/ident.cc b/authd/providers/ident.cc
index 9e0e27b53..78bfe6197 100644
--- a/authd/providers/ident.cc
+++ b/authd/providers/ident.cc
@@ -82,7 +82,7 @@ static bool ident_enable = true;
  * problems arise. -avalon
  */
 static void
-ident_connected(rb_fde_t *F __unused, int error, void *data)
+ident_connected(rb_fde_t *F, int error, void *data)
 {
 	struct auth_client *auth = (auth_client *)data;
 	struct ident_query *query;
@@ -350,7 +350,7 @@ ident_cancel(struct auth_client *auth)
 }
 
 static void
-add_conf_ident_timeout(const char *key __unused, int parc __unused, const char **parv)
+add_conf_ident_timeout(const char *key, int parc, const char **parv)
 {
 	int timeout = atoi(parv[0]);
 
@@ -364,7 +364,7 @@ add_conf_ident_timeout(const char *key __unused, int parc __unused, const char *
 }
 
 static void
-set_ident_enabled(const char *key __unused, int parc __unused, const char **parv)
+set_ident_enabled(const char *key, int parc, const char **parv)
 {
 	ident_enable = (*parv[0] == '1');
 }
diff --git a/authd/providers/opm.cc b/authd/providers/opm.cc
index 802a5de66..6ebbf9ec0 100644
--- a/authd/providers/opm.cc
+++ b/authd/providers/opm.cc
@@ -696,7 +696,7 @@ opm_destroy(void)
 
 
 static void
-add_conf_opm_timeout(const char *key __unused, int parc __unused, const char **parv)
+add_conf_opm_timeout(const char *key, int parc, const char **parv)
 {
 	int timeout = atoi(parv[0]);
 
@@ -710,7 +710,7 @@ add_conf_opm_timeout(const char *key __unused, int parc __unused, const char **p
 }
 
 static void
-set_opm_enabled(const char *key __unused, int parc __unused, const char **parv)
+set_opm_enabled(const char *key, int parc, const char **parv)
 {
 	bool enable = (*parv[0] == '1');
 
@@ -760,7 +760,7 @@ set_opm_enabled(const char *key __unused, int parc __unused, const char **parv)
 }
 
 static void
-set_opm_listener(const char *key __unused, int parc __unused, const char **parv)
+set_opm_listener(const char *key, int parc, const char **parv)
 {
 	const char *ip = parv[0];
 	int iport = atoi(parv[1]);
@@ -775,7 +775,7 @@ set_opm_listener(const char *key __unused, int parc __unused, const char **parv)
 }
 
 static void
-create_opm_scanner(const char *key __unused, int parc __unused, const char **parv)
+create_opm_scanner(const char *key, int parc, const char **parv)
 {
 	int iport = atoi(parv[1]);
 	struct opm_proxy *proxy = (opm_proxy *)rb_malloc(sizeof(struct opm_proxy));
@@ -825,7 +825,7 @@ create_opm_scanner(const char *key __unused, int parc __unused, const char **par
 }
 
 static void
-delete_opm_scanner(const char *key __unused, int parc __unused, const char **parv)
+delete_opm_scanner(const char *key, int parc, const char **parv)
 {
 	struct auth_client *auth;
 	struct opm_proxy *proxy;
@@ -892,7 +892,7 @@ delete_opm_scanner(const char *key __unused, int parc __unused, const char **par
 }
 
 static void
-delete_opm_scanner_all(const char *key __unused, int parc __unused, const char **parv __unused)
+delete_opm_scanner_all(const char *key, int parc, const char **parv)
 {
 	struct auth_client *auth;
 	rb_dlink_node *ptr, *nptr;
@@ -916,7 +916,7 @@ delete_opm_scanner_all(const char *key __unused, int parc __unused, const char *
 }
 
 static void
-delete_opm_listener_all(const char *key __unused, int parc __unused, const char **parv __unused)
+delete_opm_listener_all(const char *key, int parc, const char **parv)
 {
 	if(listeners[LISTEN_IPV4].F != NULL)
 		rb_close(listeners[LISTEN_IPV4].F);
diff --git a/include/rb/system.h b/include/rb/system.h
index 7b60212c8..066533ac3 100644
--- a/include/rb/system.h
+++ b/include/rb/system.h
@@ -94,10 +94,6 @@ char *alloca();
 
 #if defined(__INTEL_COMPILER) || defined(__GNUC__)
 
-	#ifdef __unused
-		#undef __unused
-	#endif
-
 	#ifdef __printf
 		#undef __printf
 	#endif
@@ -106,16 +102,11 @@ char *alloca();
 		#undef __noreturn
 	#endif
 
-	#define __unused __attribute__((__unused__))
 	#define __printf(x) __attribute__((__format__ (__printf__, x, x + 1)))
 	#define __noreturn __attribute__((__noreturn__))
 
 #else
 
-	#ifndef __unused
-		#define __unused
-	#endif
-
 	#ifndef __printf
 		#define __printf
 	#endif
diff --git a/ircd/authproc.cc b/ircd/authproc.cc
index 9f9ba9e30..d7170ecdd 100644
--- a/ircd/authproc.cc
+++ b/ircd/authproc.cc
@@ -550,7 +550,7 @@ ircd::authd_reject_client(struct Client *client_p, const char *ident, const char
 }
 
 static void
-timeout_dead_authd_clients(void *notused __unused)
+timeout_dead_authd_clients(void *notused)
 {
 	rb_dictionary_iter iter;
 	struct Client *client_p;
diff --git a/modules/core/m_die.cc b/modules/core/m_die.cc
index 2e7a25030..6acc05a84 100644
--- a/modules/core/m_die.cc
+++ b/modules/core/m_die.cc
@@ -43,7 +43,7 @@ DECLARE_MODULE_AV2(die, NULL, NULL, die_clist, NULL, NULL, NULL, NULL, die_desc)
  * mo_die - DIE command handler
  */
 static void
-mo_die(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[])
+mo_die(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	if(!IsOperDie(source_p))
 	{
@@ -78,7 +78,7 @@ mo_die(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struc
 }
 
 static void
-me_die(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[])
+me_die(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	if(!find_shared_conf(source_p->username, source_p->host, source_p->servptr->name, SHARED_DIE))
 	{
diff --git a/modules/m_restart.cc b/modules/m_restart.cc
index 8c539099f..fdb9a42dd 100644
--- a/modules/m_restart.cc
+++ b/modules/m_restart.cc
@@ -79,7 +79,7 @@ mo_restart(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
 }
 
 static void
-me_restart(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[])
+me_restart(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	if(!find_shared_conf(source_p->username, source_p->host, source_p->servptr->name, SHARED_DIE))
 	{