diff -wurN gift-0.1.14-orig/FeatureExtraction/extract_block_features.c gift-0.1.14/FeatureExtraction/extract_block_features.c
--- gift-0.1.14-orig/FeatureExtraction/extract_block_features.c	2004-12-02 16:44:39.000000000 +0100
+++ gift-0.1.14/FeatureExtraction/extract_block_features.c	2005-11-22 13:30:10.000000000 +0100
@@ -22,7 +22,9 @@
 */
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
diff -wurN gift-0.1.14-orig/FeatureExtraction/extract_features.c gift-0.1.14/FeatureExtraction/extract_features.c
--- gift-0.1.14-orig/FeatureExtraction/extract_features.c	2004-12-02 16:44:39.000000000 +0100
+++ gift-0.1.14/FeatureExtraction/extract_features.c	2005-11-22 13:30:57.000000000 +0100
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
diff -wurN gift-0.1.14-orig/FeatureExtraction/gabor.c gift-0.1.14/FeatureExtraction/gabor.c
--- gift-0.1.14-orig/FeatureExtraction/gabor.c	2004-12-02 16:44:39.000000000 +0100
+++ gift-0.1.14/FeatureExtraction/gabor.c	2005-11-22 13:30:34.000000000 +0100
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
diff -wurN gift-0.1.14-orig/FeatureExtraction/write_feature_descs.c gift-0.1.14/FeatureExtraction/write_feature_descs.c
--- gift-0.1.14-orig/FeatureExtraction/write_feature_descs.c	2004-12-02 16:44:39.000000000 +0100
+++ gift-0.1.14/FeatureExtraction/write_feature_descs.c	2005-11-22 13:31:12.000000000 +0100
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
diff -wurN gift-0.1.14-orig/GIFTServer/CDomainSocket.cc gift-0.1.14/GIFTServer/CDomainSocket.cc
--- gift-0.1.14-orig/GIFTServer/CDomainSocket.cc	2005-03-24 10:18:16.000000000 +0100
+++ gift-0.1.14/GIFTServer/CDomainSocket.cc	2005-11-22 13:28:48.000000000 +0100
@@ -94,6 +94,8 @@
     perror("accept");
     return false;
   }
+
+#ifndef __APPLE__
   {
     struct ucred lCredentials;
     socklen_t lSize = sizeof(lCredentials);
@@ -110,6 +112,7 @@
 	   << "Group ID:   " << lCredentials.gid << endl;
     }
   }
+#endif
   cout << "connected: " << this->getPath() << endl;
 
   this->serveStream(s2);
diff -wurN gift-0.1.14-orig/libSquirePPM/new_executable.c gift-0.1.14/libSquirePPM/new_executable.c
--- gift-0.1.14-orig/libSquirePPM/new_executable.c	2004-12-02 16:44:54.000000000 +0100
+++ gift-0.1.14/libSquirePPM/new_executable.c	2005-11-22 13:24:34.000000000 +0100
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
diff -wurN gift-0.1.14-orig/libSquirePPM/ppm_comment.c gift-0.1.14/libSquirePPM/ppm_comment.c
--- gift-0.1.14-orig/libSquirePPM/ppm_comment.c	2004-12-02 16:44:54.000000000 +0100
+++ gift-0.1.14/libSquirePPM/ppm_comment.c	2005-11-22 13:24:40.000000000 +0100
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
diff -wurN gift-0.1.14-orig/libSquirePPM/ppm_error.c gift-0.1.14/libSquirePPM/ppm_error.c
--- gift-0.1.14-orig/libSquirePPM/ppm_error.c	2004-12-02 16:44:54.000000000 +0100
+++ gift-0.1.14/libSquirePPM/ppm_error.c	2005-11-22 13:24:46.000000000 +0100
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
diff -wurN gift-0.1.14-orig/libSquirePPM/ppm_io.c gift-0.1.14/libSquirePPM/ppm_io.c
--- gift-0.1.14-orig/libSquirePPM/ppm_io.c	2004-12-02 16:44:54.000000000 +0100
+++ gift-0.1.14/libSquirePPM/ppm_io.c	2005-11-22 13:24:51.000000000 +0100
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
diff -wurN gift-0.1.14-orig/libSquirePPM/ppm_memory.c gift-0.1.14/libSquirePPM/ppm_memory.c
--- gift-0.1.14-orig/libSquirePPM/ppm_memory.c	2004-12-02 16:44:54.000000000 +0100
+++ gift-0.1.14/libSquirePPM/ppm_memory.c	2005-11-22 13:24:56.000000000 +0100
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
diff -wurN gift-0.1.14-orig/libSquirePPM/ppm_normalize.c gift-0.1.14/libSquirePPM/ppm_normalize.c
--- gift-0.1.14-orig/libSquirePPM/ppm_normalize.c	2004-12-02 16:44:54.000000000 +0100
+++ gift-0.1.14/libSquirePPM/ppm_normalize.c	2005-11-22 13:26:21.000000000 +0100
@@ -1,8 +1,12 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
+#ifdef __HAVE_VALUES_H__
 #include <values.h>
+#endif
 #include <string.h>
 #include <unistd.h>
 
diff -wurN gift-0.1.14-orig/libSquirePPM/ppm_plane.c gift-0.1.14/libSquirePPM/ppm_plane.c
--- gift-0.1.14-orig/libSquirePPM/ppm_plane.c	2004-12-02 16:44:54.000000000 +0100
+++ gift-0.1.14/libSquirePPM/ppm_plane.c	2005-11-22 13:25:08.000000000 +0100
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
diff -wurN gift-0.1.14-orig/libSquirePPM/ppm_subimage.c gift-0.1.14/libSquirePPM/ppm_subimage.c
--- gift-0.1.14-orig/libSquirePPM/ppm_subimage.c	2004-12-02 16:44:54.000000000 +0100
+++ gift-0.1.14/libSquirePPM/ppm_subimage.c	2005-11-22 13:25:19.000000000 +0100
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __HAVE_MALLOC_H__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <string.h>
 #include <unistd.h>