2 files changed, 4 insertions, 12 deletions
diff --git a/src/diagnostic/diagnostic.c b/src/diagnostic/diagnostic.c
index 58a0292..638df52 100644
--- a/src/diagnostic/diagnostic.c
+++ b/src/diagnostic/diagnostic.c
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "diagnostic_private.h"
+
 #include <string.h>
 #include <time.h>
 #include "rin/diagnostic.h"
 #include "rin/definitions.h"
-#include "diagnostic_private.h"
 
 static struct iostate {
 	FILE *err;
diff --git a/src/diagnostic/diagnostic_private.h b/src/diagnostic/diagnostic_private.h
index 45d414d..96b1759 100644
--- a/src/diagnostic/diagnostic_private.h
+++ b/src/diagnostic/diagnostic_private.h
@@ -24,18 +24,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
-#include <unistd.h>
-
-#ifdef __GLIBC__
-#	if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 29)
-#		include <sys/types.h>
-#	else
-#		define _GNU_SOURCE
-#		include <sys/syscall.h>
-#		define gettid() (syscall(SYS_gettid))
-#	endif
-#endif
 
+#define RIN_NEED_GETTID
+#include "rin/compat.h"
 
 static void __rin_msg(FILE *stream, const char *prefix, const char *format, va_list args);
 static void __rin_pidconvadjust(void);