diff --git a/ChangeLog b/ChangeLog
index 25dca044d..8071da9c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2004-04-13  Quentin Mathe <qmathe@club-internet.fr>
 
-       * Source/NSToolbarItem.m: 
+       * Source/NSToolbarItem.m:
+       * Source/NSToolbarItem.h: 
        * Source/NSToolbar.m:
        * Headers/AppKit/NSToolbar.h:
        * Source/GSToolbar.m:
diff --git a/Headers/AppKit/NSToolbarItem.h b/Headers/AppKit/NSToolbarItem.h
index 2dac8aae5..2913fe0b2 100644
--- a/Headers/AppKit/NSToolbarItem.h
+++ b/Headers/AppKit/NSToolbarItem.h
@@ -6,7 +6,8 @@
    Copyright (C) 2002 Free Software Foundation, Inc.
 
    Author:  Gregory John Casamento <greg_casamento@yahoo.com>,
-            Fabien Vallon <fabien.vallon@fr.alcove.com>
+            Fabien Vallon <fabien.vallon@fr.alcove.com>,
+	    Quentin Mathe <qmathe@club-internet.fr>
    Date: May 2002
    
    This file is part of the GNUstep GUI Library.
@@ -39,10 +40,10 @@
 @class NSString;
 @class NSDictionary;
 @class NSMutableDictionary;
-@class NSToolbar;
 @class NSImage;
 @class NSMenuItem;
 @class NSView;
+@class GSToolbar;
 
 /*
  * Constants
@@ -66,11 +67,11 @@ APPKIT_EXPORT NSString *NSToolbarPrintItemIdentifier;
   NSImage *_image;
 
   // toolbar
-  NSToolbar *_toolbar;
+  GSToolbar *_toolbar;
   NSString *_toolTip;
   id _view;
   NSView *_backView;
-  BOOL _updated;
+  BOOL _modified;
 
   // size
   NSSize _maxSize;
@@ -116,7 +117,7 @@ APPKIT_EXPORT NSString *NSToolbarPrintItemIdentifier;
 - (int) tag;
 - (id) target;
 - (NSString *) toolTip;
-- (NSToolbar *) toolbar;
+- (GSToolbar *) toolbar;
 - (NSView *) view;
 - (void) setAction: (SEL)action;
 - (void) setEnabled: (BOOL)enabled;