diff --git a/sys/arm/include/fp.h b/sys/arm/include/fp.h
index fee313e5718..b7a1b8ac16c 100644
--- a/sys/arm/include/fp.h
+++ b/sys/arm/include/fp.h
@@ -66,19 +66,10 @@ typedef struct fp_extended_precision fp_reg_t;
  * This needs to move and be hidden from userland.
  */
 
-#ifdef ARM_VFP_SUPPORT
 struct vfp_state {
 	u_int64_t reg[32];
 	u_int32_t fpscr;
 };
-#else
-struct fpe_sp_state {
-	unsigned int fp_flags;
-	unsigned int fp_sr;
-	unsigned int fp_cr;
-	fp_reg_t fp_registers[16];
-};
-#endif
 
 /*
  * Type for a saved FP context, if we want to translate the context to a
diff --git a/sys/arm/include/pcb.h b/sys/arm/include/pcb.h
index ec15c9bf178..e6f0a419477 100644
--- a/sys/arm/include/pcb.h
+++ b/sys/arm/include/pcb.h
@@ -80,12 +80,8 @@ struct pcb {
 #define PCB_NOALIGNFLT	0x00000002
 	caddr_t	pcb_onfault;			/* On fault handler */
 	struct	pcb_arm32 un_32;
-#ifdef ARM_VFP_SUPPORT
 	struct vfp_state pcb_vfpstate;          /* VP/NEON state */
 	u_int pcb_vfpcpu;                       /* VP/NEON last cpu */
-#else
-	struct	fpe_sp_state pcb_fpstate;	/* Floating Point state */
-#endif
 };
 
 /*