diff -Nurd -x'*~' denemo-0.7.4.orig/keymaps/Makefile.in denemo-0.7.4/keymaps/Makefile.in
--- denemo-0.7.4.orig/keymaps/Makefile.in	2005-11-02 17:40:41.000000000 -0500
+++ denemo-0.7.4/keymaps/Makefile.in	2005-12-30 11:45:40.000000000 -0500
@@ -198,7 +198,7 @@
 dist_sysconf_DATA = denemo.keymaprc
 dist_pkgdata_DATA = french.keymaprc \
  english.keymaprc  italian.keymaprc \
- speedy.keymaprc
+ speedy.keymaprc macosx.keymaprc
 
 all: all-am
 
diff -Nurd -x'*~' denemo-0.7.4.orig/keymaps/macosx.keymaprc denemo-0.7.4/keymaps/macosx.keymaprc
--- denemo-0.7.4.orig/keymaps/macosx.keymaprc	1969-12-31 19:00:00.000000000 -0500
+++ denemo-0.7.4/keymaps/macosx.keymaprc	2005-12-30 11:44:21.000000000 -0500
@@ -0,0 +1,74 @@
+CursorLeft h Left 
+CursorDown Down 
+CursorUp Up 
+CursorRight Right 
+StaffUp Up(4) 
+StaffDown Down(4) 
+MeasureLeft Left(4) 
+MeasureRight Right(4) 
+ToNearestA a 
+ToNearestB b 
+ToNearestC c 
+ToNearestD d 
+ToNearestE e 
+ToNearestF f 
+ToNearestG g 
+OctaveUp apostrophe(1) 
+OctaveDown comma 
+InsertWholeNote 1 
+InsertHalfNote 2 
+InsertQuarterNote 3 
+InsertEighthNote 4 
+InsertSixteenthNote 5 
+InsertThirtysecondNote 6 
+InsertSixtyfourthNote 7 
+ToggleRestMode Escape 
+InsertWholeRest 1(4) 
+InsertHalfRest 2(4) 
+InsertQuarterRest 3(4) 
+InsertEighthRest 4(4) 
+InsertSixteenthRest 5(4) 
+InsertThirtysecondRest 6(4) 
+InsertSixtyfourthRest 7(4) 
+InsertArbitraryTuplet t
+Insert2/3Tuplet numbersign(1) 
+Insert4/5Tuplet percent(1) 
+Insert4/6Tuplet question(1) 
+Insert4/7Or8/7Tuplet ampersand(1) 
+Insert8/9Tuplet asterisk(1) 
+AddTone Return 
+RemoveTone Return(1) 
+Sharpen/StemDown equal 
+Flatten/StemUp minus 
+ChangeToWholeNote F1 
+ChangeToHalfNote F2 
+ChangeToQuarterNote F3 
+ChangeToEighthNote F4 
+ChangeToSixteenthNote F5 
+ChangeToThirtysecondNote F6 
+ChangeToSixtyfourthNote F7 
+AddDot . 
+RemoveDot quotedbl(1) 
+ToggleTie T(1) 
+DeleteObject Delete 
+DeletePreviousObject BackSpace 
+InsertMeasure m 
+AppendMeasure M(1) 
+DeleteMeasure Delete(4) 
+DeleteStaff Delete(1) 
+ShrinkMeasures Left(4) 
+WidenMeasures Right(4) 
+ShorterStaffs Up(4) 
+TallerStaffs Down(4) 
+SetMark space 
+UnsetMark space(4) 
+ToggleBeginSlur parenleft 
+ToggleEndSlur parenright 
+ToggleAccent exclam(1) 
+ToggleFermata Mode_switch 
+ToggleStaccato period(4) 
+ToggleTenuto underscore(1) 
+ToggleTrill ccedilla
+ToggleTurn ccedilla(4)
+ToggleMordent w 
+ToggleStaccatissimo semicolon 
\ No newline at end of file
diff -Nurd -x'*~' denemo-0.7.4.orig/src/file.cpp denemo-0.7.4/src/file.cpp
--- denemo-0.7.4.orig/src/file.cpp	2005-10-27 17:18:00.000000000 -0400
+++ denemo-0.7.4/src/file.cpp	2005-12-30 11:52:14.000000000 -0500
@@ -35,7 +35,9 @@
 #include <sys/stat.h>		/* check existance and type of files */
 #include <dirent.h>		/* filter and sort filenames */
 #include <fnmatch.h>		/* find filenames matches */
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>		/* I use free() */
+#endif
 
 
 typedef enum
diff -Nurd -x'*~' denemo-0.7.4.orig/src/lyparser.cpp denemo-0.7.4/src/lyparser.cpp
--- denemo-0.7.4.orig/src/lyparser.cpp	2005-10-31 04:46:02.000000000 -0500
+++ denemo-0.7.4/src/lyparser.cpp	2005-12-30 12:17:37.000000000 -0500
@@ -487,7 +487,9 @@
 
 // needed for bison.simple's malloc () and free ()
 
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 
diff -Nurd -x'*~' denemo-0.7.4.orig/src/main.cpp denemo-0.7.4/src/main.cpp
--- denemo-0.7.4.orig/src/main.cpp	2005-10-31 03:41:57.000000000 -0500
+++ denemo-0.7.4/src/main.cpp	2005-12-30 12:00:59.000000000 -0500
@@ -22,6 +22,9 @@
 #include <wait.h>
 #endif
 #ifdef HAVE_SYS_RESOURCE_H
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #include <sys/resource.h>
 #endif