diff --git a/ChangeLog b/ChangeLog
index db2c66659..748a57806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-26 Riccardo Mottola <rm@gnu.org>
+
+	* Source/NSMethodSignature.m
+	* Source/cifframe.m
+	Minor include fixes to avoid malloc.h warnings on OpenBSD.
+
 2015-06-22  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Headers/GNUstepBase/Additions.h:
diff --git a/Source/NSMethodSignature.m b/Source/NSMethodSignature.m
index fd37c980f..bb54f649b 100644
--- a/Source/NSMethodSignature.m
+++ b/Source/NSMethodSignature.m
@@ -1,5 +1,5 @@
 /** Implementation of NSMethodSignature for GNUStep
-   Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1994-2015 Free Software Foundation, Inc.
 
    Written by:  Andrew Kachites McCallum <mccallum@gnu.ai.mit.edu>
    Date: August 1994
@@ -42,8 +42,11 @@
 #import "GSInvocation.h"
 
 #ifdef HAVE_MALLOC_H
+#if !defined(__OpenBSD__)
 #include <malloc.h>
 #endif
+#endif
+
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
diff --git a/Source/cifframe.m b/Source/cifframe.m
index 5dcc8950d..7d74b6545 100644
--- a/Source/cifframe.m
+++ b/Source/cifframe.m
@@ -1,6 +1,6 @@
 /** cifframe.m - Wrapper/Objective-C interface for ffi function interface
 
-   Copyright (C) 1999, Free Software Foundation, Inc.
+   Copyright (C) 1999-2015 Free Software Foundation, Inc.
 
    Written by:  Adam Fedor <fedor@gnu.org>
    Date: Dec 1999, rewritten Apr 2002
@@ -30,8 +30,11 @@
 #endif
 
 #ifdef HAVE_MALLOC_H
+#if !defined(__OpenBSD__)
 #include <malloc.h>
 #endif
+#endif
+
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif