diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h
index e36699c553d..b6279631c9e 100644
--- a/sys/arm/include/_types.h
+++ b/sys/arm/include/_types.h
@@ -105,15 +105,9 @@ typedef	__uint32_t	__vm_paddr_t;
 typedef	__uint64_t	__vm_pindex_t;
 typedef	__uint32_t	__vm_size_t;
 
-#ifdef __ARM_EABI__
 typedef	unsigned int	___wchar_t;
 #define	__WCHAR_MIN	0		/* min value for a wchar_t */
 #define	__WCHAR_MAX	__UINT_MAX	/* max value for a wchar_t */
-#else
-typedef	int		___wchar_t;
-#define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
-#define	__WCHAR_MAX	__INT_MAX	/* max value for a wchar_t */
-#endif
 
 /*
  * Unusual type definitions.
diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h
index 0c25d7bdc1a..2f64c375830 100644
--- a/sys/arm/include/asm.h
+++ b/sys/arm/include/asm.h
@@ -49,7 +49,7 @@
 # define _ALIGN_TEXT .align 2
 #endif
 
-#if defined(__ARM_EABI__) && !defined(_STANDALONE)
+#ifndef _STANDALONE
 #define	STOP_UNWINDING	.cantunwind
 #define	_FNSTART	.fnstart
 #define	_FNEND		.fnend
diff --git a/sys/arm/include/proc.h b/sys/arm/include/proc.h
index a86df3557cc..25f44806802 100644
--- a/sys/arm/include/proc.h
+++ b/sys/arm/include/proc.h
@@ -61,11 +61,7 @@ struct mdproc {
 	void	*md_sigtramp;
 };
 
-#ifdef __ARM_EABI__
 #define	KINFO_PROC_SIZE 816
-#else
-#define	KINFO_PROC_SIZE 792
-#endif
 
 #define MAXARGS	8
 /*