--- a/ImageReader.st	Mon May 06 22:31:01 2013 +0200
+++ b/ImageReader.st	Tue May 07 10:21:15 2013 +0200
@@ -28,15 +28,16 @@
 # define _STDIO_H_INCLUDED_
 #endif
 
+#if defined(__osx__)
+#  include <stdlib.h>
+# define _MALLOC_H_INCLUDED_
+#endif
+
 #ifndef _MALLOC_H_INCLUDED_
 # if !defined(FREEBSD)
-#  if defined(__osx__)
-#   include <malloc/malloc.h>
-#  else
-#   include <malloc.h>
-#  endif
+#  include <malloc.h>
+#  define _MALLOC_H_INCLUDED_
 # endif
-# define _MALLOC_H_INCLUDED_
 #endif
 
 
@@ -2027,10 +2028,10 @@
 !ImageReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.105 2013-05-06 20:31:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.106 2013-05-07 08:21:15 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.105 2013-05-06 20:31:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.106 2013-05-07 08:21:15 cg Exp $'
 ! !