diff --git a/ChangeLog b/ChangeLog
index 9b341a857..97dbbfe1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2011-10-04 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/AppKit/NSApplication.h,
+	* Headers/AppKit/NSPasteboard.h,
+	* Headers/AppKit/NSInterfaceStyle.h,
+	* Headers/AppKit/NSGraphics.h: Bracket in 'extern "C"' for C++.
+	Patch by Julian Mayer <julian@corecode.at>.
+
 2011-10-04  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/AppKit/NSPanel.h: Bracket in 'extern "C"' for C++
-	
+
 2011-10-03 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSView.m (-initWithCoder:): Don't decode super view.
diff --git a/Headers/AppKit/NSApplication.h b/Headers/AppKit/NSApplication.h
index 120a5192d..2b3bffe8d 100644
--- a/Headers/AppKit/NSApplication.h
+++ b/Headers/AppKit/NSApplication.h
@@ -41,6 +41,10 @@
 
 #import <AppKit/NSResponder.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 @class NSArray;
 @class NSAutoreleasePool;
 @class NSDate;
@@ -685,4 +689,8 @@ NSShowSystemInfoPanel(NSDictionary *options);
  */
 APPKIT_EXPORT NSApplication	*NSApp;
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif // _GNUstep_H_NSApplication
diff --git a/Headers/AppKit/NSGraphics.h b/Headers/AppKit/NSGraphics.h
index 59389896f..974e384a4 100644
--- a/Headers/AppKit/NSGraphics.h
+++ b/Headers/AppKit/NSGraphics.h
@@ -35,6 +35,10 @@
 #import <AppKit/NSGraphicsContext.h>
 #import <AppKit/AppKitDefines.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 @class NSString;
 @class NSColor;
 @class NSGraphicsContext;
@@ -264,4 +268,8 @@ typedef enum _NSFocusRingPlacement
 void NSSetFocusRingStyle(NSFocusRingPlacement placement);
 #endif
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* __NSGraphics_h__ */
diff --git a/Headers/AppKit/NSInterfaceStyle.h b/Headers/AppKit/NSInterfaceStyle.h
index ab5f606da..d5af392ed 100644
--- a/Headers/AppKit/NSInterfaceStyle.h
+++ b/Headers/AppKit/NSInterfaceStyle.h
@@ -29,6 +29,10 @@
 #define _GNUstep_H_NSInterfaceStyle
 #import <GNUstepBase/GSVersionMacros.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 
 #import <AppKit/AppKitDefines.h>
@@ -61,6 +65,8 @@ NSInterfaceStyleForKey(NSString *key, NSResponder *responder);
 
 #endif // GS_API_MACOSX
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif // _GNUstep_H_NSInterfaceStyle
-
-
diff --git a/Headers/AppKit/NSPasteboard.h b/Headers/AppKit/NSPasteboard.h
index f714bacac..1840275fa 100644
--- a/Headers/AppKit/NSPasteboard.h
+++ b/Headers/AppKit/NSPasteboard.h
@@ -35,6 +35,10 @@
 #import <Foundation/NSObject.h>
 #import <AppKit/AppKitDefines.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 @class NSString;
 @class NSArray;
 @class NSData;
@@ -300,5 +304,8 @@ APPKIT_EXPORT NSString *NSCreateFilenamePboardType(NSString *fileType);
 APPKIT_EXPORT NSString *NSGetFileType(NSString *pboardType);
 APPKIT_EXPORT NSArray *NSGetFileTypes(NSArray *pboardTypes);
 
+#if defined(__cplusplus)
+}
+#endif
 
 #endif // _GNUstep_H_NSPasteboard