diff -u -r1.34 mac.c
--- src/mac.c	24 Apr 2005 06:05:39 -0000	1.34
+++ src/mac.c	28 Apr 2005 01:55:44 -0000
@@ -28,8 +28,8 @@
 
 #include "lisp.h"
 #include "process.h"
-#include "sysselect.h"
 #include "systime.h"
+#include "sysselect.h"
 #include "blockinput.h"
 
 #include "macterm.h"
diff -u -r1.17 macgui.h
--- src/macgui.h	19 Apr 2005 12:03:38 -0000	1.17
+++ src/macgui.h	28 Apr 2005 01:55:44 -0000
@@ -43,8 +43,6 @@
 #undef min
 #undef init_process
 #include <Carbon/Carbon.h>
-#undef mktime
-#define mktime emacs_mktime
 #undef free
 #define free unexec_free
 #undef malloc