diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake
index 715475eea8..fced180a02 100644
--- a/StepmaniaCore.cmake
+++ b/StepmaniaCore.cmake
@@ -107,7 +107,6 @@ check_function_exists(waitpid HAVE_WAITPID)
 
 # Mostly universal symbols.
 check_cxx_symbol_exists(strtof cstdlib HAVE_STRTOF)
-check_symbol_exists(M_PI math.h HAVE_M_PI)
 check_symbol_exists(size_t stddef.h HAVE_SIZE_T_STDDEF)
 check_symbol_exists(size_t stdlib.h HAVE_SIZE_T_STDLIB)
 check_symbol_exists(size_t stdio.h HAVE_SIZE_T_STDIO)
@@ -115,24 +114,6 @@ check_symbol_exists(posix_fadvise fcntl.h HAVE_POSIX_FADVISE)
 
 # Checks to make it easier to work with 32-bit/64-bit builds if required.
 include(CheckTypeSize)
-check_type_size(int16_t SIZEOF_INT16_T)
-check_type_size(uint16_t SIZEOF_UINT16_T)
-check_type_size(u_int16_t SIZEOF_U_INT16_T)
-check_type_size(int32_t SIZEOF_INT32_T)
-check_type_size(uint32_t SIZEOF_UINT32_T)
-check_type_size(u_int32_t SIZEOF_U_INT32_T)
-check_type_size(int64_t SIZEOF_INT64_T)
-check_type_size(char SIZEOF_CHAR)
-check_type_size("unsigned char" SIZEOF_UNSIGNED_CHAR)
-check_type_size(short SIZEOF_SHORT)
-check_type_size("unsigned short" SIZEOF_UNSIGNED_SHORT)
-check_type_size(int SIZEOF_INT)
-check_type_size("unsigned int" SIZEOF_UNSIGNED_INT)
-check_type_size(long SIZEOF_LONG)
-check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG)
-check_type_size("long long" SIZEOF_LONG_LONG)
-check_type_size(float SIZEOF_FLOAT)
-check_type_size(double SIZEOF_DOUBLE)
 check_type_size(intptr_t SIZEOF_INTPTR_T)
 check_type_size(pid_t SIZEOF_PID_T)
 check_type_size(size_t SIZEOF_SIZE_T)
diff --git a/src/config.in.hpp b/src/config.in.hpp
index 87c5ed7bb6..3124bad243 100644
--- a/src/config.in.hpp
+++ b/src/config.in.hpp
@@ -60,9 +60,6 @@
 /* Defined to 1 if the underlying system provides the strtof function. */
 #cmakedefine HAVE_STRTOF 1
 
-/* Defined to 1 if the underlying system provides the M_PI constant. */
-#cmakedefine HAVE_M_PI 1
-
 /* Defined to 1 if the underlying system provides the posix_fadvise function. */
 #cmakedefine HAVE_POSIX_FADVISE 1
 
@@ -148,11 +145,6 @@ typedef std::make_signed<size_t>::type ssize_t;
 inline float strtof( const char *s, char **se ) { return (float) strtod( s, se ); }
 #endif
 
-#if !defined(HAVE_M_PI)
-/* This is only called if the math header files don't include it: stating it here is fine. */
-#define M_PI 3.1415926535897932384626433832795
-#endif
-
 /* Define standard endianness macros, if they're missing. */
 #if defined(HAVE_ENDIAN_H)
 #include <endian.h>