--- a/src/haptic/darwin/SDL_syshaptic.c	Thu Dec 04 21:33:59 2014 +0100
+++ b/src/haptic/darwin/SDL_syshaptic.c	Thu Dec 04 21:41:30 2014 +0100
@@ -551,7 +551,7 @@
     FFReleaseDevice(haptic->hwdata->device);
   creat_err:
     if (haptic->hwdata != NULL) {
-        free(haptic->hwdata);
+        SDL_free(haptic->hwdata);
         haptic->hwdata = NULL;
     }
     return -1;

--- a/src/haptic/linux/SDL_syshaptic.c	Thu Dec 04 21:33:59 2014 +0100
+++ b/src/haptic/linux/SDL_syshaptic.c	Thu Dec 04 21:41:30 2014 +0100
@@ -441,7 +441,7 @@
   open_err:
     close(fd);
     if (haptic->hwdata != NULL) {
-        free(haptic->hwdata);
+        SDL_free(haptic->hwdata);
         haptic->hwdata = NULL;
     }
     return -1;
@@ -959,7 +959,7 @@
     return 0;
 
   new_effect_err:
-    free(effect->hweffect);
+    SDL_free(effect->hweffect);
     effect->hweffect = NULL;
     return -1;
 }

--- a/src/video/directfb/SDL_DirectFB_video.c	Thu Dec 04 21:33:59 2014 +0100
+++ b/src/video/directfb/SDL_DirectFB_video.c	Thu Dec 04 21:41:30 2014 +0100
@@ -156,7 +156,7 @@
     return device;
   error:
     if (device)
-        free(device);
+        SDL_free(device);
     return (0);
 }