diff --git a/macosx/tclMacOSXBundle.c b/macosx/tclMacOSXBundle.c
index 6b0b6f7..7dc2142 100644
--- a/macosx/tclMacOSXBundle.c
+++ b/macosx/tclMacOSXBundle.c
@@ -120,7 +120,7 @@ Tcl_MacOSXOpenVersionedBundleResources(
     int maxPathLen,
     char *libraryPath)
 {
-#ifdef HAVE_COREFOUNDATION
+#ifdef HAVE_COREFOUNDATION__DISABLED
     CFBundleRef bundleRef;
     CFStringRef bundleNameRef;
     CFURLRef libURL;
diff --git a/unix/configure.in b/unix/configure.in
index 0c11513..d4aaeb9 100755
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -318,7 +318,6 @@ SC_BUGGY_STRTOD
 AC_TYPE_MODE_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_TYPE_UID_T
 
 AC_CACHE_CHECK([for socklen_t], tcl_cv_type_socklen_t, [
     AC_TRY_COMPILE([
@@ -426,10 +425,10 @@ AC_CHECK_FUNC(BSDgettimeofday,
 ])
 AC_CACHE_CHECK([for gettimeofday declaration], tcl_cv_grep_gettimeofday, [
     AC_EGREP_HEADER(gettimeofday, sys/time.h,
-	tcl_cv_grep_gettimeofday=present, tcl_cv_grep_gettimeofday=missing)])
-if test $tcl_cv_grep_gettimeofday = missing ; then
-    AC_DEFINE(GETTOD_NOT_DECLARED, 1, [Is gettimeofday() actually declared in <sys/time.h>?])
-fi
+	tcl_cv_grep_gettimeofday=present, tcl_cv_grep_gettimeofday=present)])
+# if test $tcl_cv_grep_gettimeofday = missing ; then
+#    AC_DEFINE(GETTOD_NOT_DECLARED, 1, [Is gettimeofday() actually declared in <sys/time.h>?])
+# fi
 
 #--------------------------------------------------------------------
 #	The following code checks to see whether it is possible to get
@@ -519,8 +518,6 @@ if test "`uname -s`" = "Darwin" ; then
     AC_DEFINE(USE_VFORK, 1, [Should we use vfork() instead of fork()?])
     AC_DEFINE(TCL_DEFAULT_ENCODING, "utf-8",
 	[Are we to override what our default encoding is?])
-    AC_DEFINE(TCL_LOAD_FROM_MEMORY, 1,
-	[Can this platform load code from memory?])
     AC_DEFINE(TCL_WIDE_CLICKS, 1,
 	[Does this platform have wide high-resolution clicks?])
     AC_CHECK_HEADERS(AvailabilityMacros.h)
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 3e4979a..9aa1512 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -3017,6 +3017,7 @@ AC_DEFUN([SC_TCL_GETADDRINFO], [AC_CHECK_FUNC(getaddrinfo, [
 AC_DEFUN([SC_TCL_GETPWUID_R], [AC_CHECK_FUNC(getpwuid_r, [
     AC_CACHE_CHECK([for getpwuid_r with 5 args], tcl_cv_api_getpwuid_r_5, [
     AC_TRY_COMPILE([
+    #include <unistd.h>
 	#include <sys/types.h>
 	#include <pwd.h>
     ], [
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index 93d29ab..ed308dc 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -21,11 +21,13 @@
 #define MODULE_SCOPE extern
 #endif
 
+#define TCL_DYLD_USE_DLFCN 1
+#define TCL_DYLD_USE_NSMODULE 0
 #ifndef TCL_DYLD_USE_DLFCN
 /*
  * Use preferred dlfcn API on 10.4 and later
  */
-#   if !defined(NO_DLFCN_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
+#   if 1 || !defined(NO_DLFCN_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
 #	define TCL_DYLD_USE_DLFCN 1
 #   else
 #	define TCL_DYLD_USE_DLFCN 0
@@ -35,7 +37,7 @@
 /*
  * Use deprecated NSModule API only to support 10.3 and earlier:
  */
-#   if MAC_OS_X_VERSION_MIN_REQUIRED < 1040
+#   if 0 && MAC_OS_X_VERSION_MIN_REQUIRED < 1040
 #	define TCL_DYLD_USE_NSMODULE 1
 #   else
 #	define TCL_DYLD_USE_NSMODULE 0
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 4b7d20b..ea070ba 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -447,7 +447,7 @@ extern int errno;
  * Variables provided by the C library:
  */
 
-#if defined(__APPLE__) && defined(__DYNAMIC__)
+#if 0 && defined(__APPLE__) && defined(__DYNAMIC__)
 #   include <crt_externs.h>
 #   define environ (*_NSGetEnviron())
 #   define USE_PUTENV 1