diff --git a/gcc/fwprop.c b/gcc/fwprop.c
index 123cc228630c..4b8a554e823f 100644
--- a/gcc/fwprop.c
+++ b/gcc/fwprop.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "df.h"
 #include "rtl-ssa.h"
 
-#include "sparseset.h"
 #include "predict.h"
 #include "cfgrtl.h"
 #include "cfgcleanup.h"
diff --git a/gcc/sparseset.h b/gcc/sparseset.h
index c72b4fe8aed5..017884e8ad0c 100644
--- a/gcc/sparseset.h
+++ b/gcc/sparseset.h
@@ -76,15 +76,14 @@ along with GCC; see the file COPYING3.  If not see
    Sparse sets storage requirements are relatively large: O(U) with a
    larger constant than sbitmaps (if the storage requirement for an
    sbitmap with universe U is S, then the storage required for a sparse
-   set for the same universe are 2*HOST_BITS_PER_WIDEST_FAST_INT * S).
+   set for the same universe are 2 * sizeof (SPARSESET_ELT_TYPE) * 8 * S).
    Accessing the sparse vector is not very cache-friendly, but iterating
    over the members in the set is cache-friendly because only the dense
    vector is used.  */
 
 /* Data Structure used for the SparseSet representation.  */
 
-#define SPARSESET_ELT_BITS ((unsigned) HOST_BITS_PER_WIDEST_FAST_INT)
-#define SPARSESET_ELT_TYPE unsigned HOST_WIDEST_FAST_INT
+#define SPARSESET_ELT_TYPE unsigned int
 
 typedef struct sparseset_def
 {