diff --git a/gmid.c b/gmid.c
index fca2ef6..ab19646 100644
--- a/gmid.c
+++ b/gmid.c
@@ -71,7 +71,8 @@ safe_setenv(const char *name, const char *val)
 }
 
 __attribute__ ((format (printf, 1, 2)))
-static inline void __dead
+__attribute__ ((__noreturn__))
+static inline void
 fatal(const char *fmt, ...)
 {
 	va_list ap;
@@ -992,4 +993,6 @@ main(int argc, char **argv)
 	close(sock6);
 	tls_free(ctx);
 	tls_config_free(conf);
+
+	return 0;
 }
diff --git a/gmid.h b/gmid.h
index 25a5262..e145d1a 100644
--- a/gmid.h
+++ b/gmid.h
@@ -37,10 +37,6 @@
 # define INFTIM -1
 #endif
 
-#ifndef __dead
-# define __dead
-#endif
-
 #define GEMINI_URL_LEN (1024+3)	/* URL max len + \r\n + \0 */
 
 /* large enough to hold a copy of a gemini URL and still have extra room */