diff --git a/sys/x86/include/_stdint.h b/sys/x86/include/_stdint.h
--- a/sys/x86/include/_stdint.h
+++ b/sys/x86/include/_stdint.h
@@ -42,8 +42,6 @@
 #ifndef _MACHINE__STDINT_H_
 #define	_MACHINE__STDINT_H_
 
-#include <machine/_limits.h>
-
 #if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
 
 #define	INT8_C(c)		(c)
@@ -171,8 +169,8 @@
 #define	PTRDIFF_MAX	INT64_MAX
 
 /* Limits of sig_atomic_t. */
-#define	SIG_ATOMIC_MIN	__LONG_MIN
-#define	SIG_ATOMIC_MAX	__LONG_MAX
+#define	SIG_ATOMIC_MIN	INT64_MIN
+#define	SIG_ATOMIC_MAX	INT64_MAX
 
 /* Limit of size_t. */
 #define	SIZE_MAX	UINT64_MAX