@@ -89,12 +89,10 @@
 		;;
 	*-*-mingw*)
 		LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition"
 		LIBS="$LIBS -lversion"
 
-		AC_SUBST(ALLOW_MULTIPLE_DEFINITION,
-			[-Wl,--allow-multiple-definition])
 		AC_SUBST(USE_SRCS_WINDOWS, '${SRCS_WINDOWS}')
 		;;
 	*-psp-*)
 		AS_IF([test x"$DEVKITPSP" = x""], [
 			AC_MSG_ERROR(
@@ -143,10 +141,13 @@
 	LIBS="$LIBS -L$DEVKITPRO/libogc/lib/wii -lfat -logc"
 	TESTS_LIBS="$TESTS_LIBS -lwiiuse -lbte"
 	enable_shared="no"
 	enable_threads="no"	# TODO
 
+	AC_DEFINE(OF_WII, 1, [Whether we are compiling for Wii])
+	AC_SUBST(DEFINES, "-DGEKKO")
+	AC_SUBST(INCLUDES, '-I$DEVKITPRO/libogc/include')
 	AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map'])
 ])
 
 AC_ARG_WITH(nds,
 	AS_HELP_STRING([--with-nds], [build for Nintendo DS]))
@@ -164,12 +165,13 @@
 	enable_shared="no"
 	enable_threads="no"	# TODO
 	enable_sockets="no"	# TODO
 	check_pedantic="no"
 
-	AC_DEFINE(OF_NINTENDO_DS, 1,
-		[Whether we are compiling for the Nintendo DS])
+	AC_DEFINE(OF_NINTENDO_DS, 1, [Whether we are compiling for Nintendo DS])
+	AC_SUBST(DEFINES, "-DARM9")
+	AC_SUBST(INCLUDES, '-I$DEVKITPRO/libnds/include')
 	AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map'])
 ])
 
 AC_ARG_WITH(3ds,
 	AS_HELP_STRING([--with-3ds], [build for Nintendo 3DS]))
@@ -188,11 +190,13 @@
 	enable_shared="no"
 	enable_threads="no"	# TODO
 	check_pedantic="no"
 
 	AC_DEFINE(OF_NINTENDO_3DS, 1,
-		[Whether we are compiling for the Nintendo 3DS])
+		[Whether we are compiling for Nintendo 3DS])
+	AC_SUBST(DEFINES, "-DARM11")
+	AC_SUBST(INCLUDES, '-I$DEVKITPRO/libctru/include')
 	AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map'])
 ])
 
 CPP="$OBJCPP"
 CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS -DOF_COMPILING_OBJFW"
@@ -591,12 +595,10 @@
 		AC_SUBST(LDFLAGS_REEXPORT, ["-Wl,-reexport-lobjfw"])
 		AS_IF([test x"$objc_runtime" = x"Apple runtime"], [
 			AC_SUBST(REEXPORT_RUNTIME, ["-Wl,-reexport-lobjc"])
 			AC_SUBST(REEXPORT_RUNTIME_FRAMEWORK,
 				["-Wl,-reexport-lobjc"])
-			AC_SUBST(WEAK_NSFOUNDATIONVERSIONNUMBER,
-				["-Wl,-U,_NSFoundationVersionNumber"])
 			LDFLAGS="$LDFLAGS -Wl,-U,_NSFoundationVersionNumber"
 		])
 
 		AS_IF([test x"$objc_runtime" = x"ObjFW runtime"], [
 			AS_IF([test x"$exception_type" = x"DWARF"], [
@@ -1770,11 +1772,10 @@
 		dnl wiiload and thus likely already set by the user to something
 		dnl that is not the path of the wiiload binary.
 		AC_CHECK_PROG(wiiload, wiiload, wiiload)
 
 		AS_IF([test x"$wiiload" != x""], [
-			AC_SUBST(RUN_TESTS, "run")
 			AC_SUBST(WRAPPER, "$wiiload")
 		])
 	])
 ], [
 	AC_SUBST(RUN_TESTS, "run")