diff --git a/Makefile b/Makefile
index 084fec3331..bea4e27f8d 100644
--- a/Makefile
+++ b/Makefile
@@ -252,10 +252,6 @@ mostlyclean: parent-mostlyclean
 tests-clean:
 	@$(MAKE) subdir_testclean no_deps=t
 
-ifeq ($(enable-float128),yes)
-CPPFLAGS += -DWANT_FLOAT128=1
-endif
-
 ifneq (,$(CXX))
 vpath c++-types.data $(+sysdep_dirs)
 
diff --git a/math/Makefile b/math/Makefile
index 6ad3ccea20..ec7d91ca3d 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -160,10 +160,6 @@ gen-calls = s_ldexpF
 generated += $(foreach s,.c .S,$(call type-foreach, $(calls:s_%=m_%$(s))))
 routines = $(call type-foreach, $(calls))
 
-ifeq ($(enable-float128),yes)
-math-CPPFLAGS += -DWANT_FLOAT128=1
-endif
-
 ifeq ($(build-mathvec),yes)
 # We need to install libm.so and libm.a as linker scripts
 # for transparent use of vector math library.
diff --git a/sysdeps/x86/bits/floatn.h b/sysdeps/x86/bits/floatn.h
index 9dd9d8a40d..7387bbae38 100644
--- a/sysdeps/x86/bits/floatn.h
+++ b/sysdeps/x86/bits/floatn.h
@@ -33,7 +33,7 @@
 #if (defined __x86_64__							\
      ? __GNUC_PREREQ (4, 3)						\
      : (defined __GNU__ ? __GNUC_PREREQ (4, 5) : __GNUC_PREREQ (4, 4))) \
-    || (defined __clang__ && defined WANT_FLOAT128 && WANT_FLOAT128 == 1)
+    || defined __clang__
 # define __HAVE_FLOAT128 1
 #else
 # define __HAVE_FLOAT128 0