diff --git a/Headers/gnustep/gui/NSTableColumn.h b/Headers/gnustep/gui/NSTableColumn.h
index 1dbb43e3d..f5ac6d74e 100644
--- a/Headers/gnustep/gui/NSTableColumn.h
+++ b/Headers/gnustep/gui/NSTableColumn.h
@@ -1,49 +1,90 @@
+/* 
+   NSTableColumn.h
+
+   Copyright (C) 1999 Free Software Foundation, Inc.
+
+   Author: Michael Hanni  <mhanni@sprintmail.com>
+   Date: 1999
+
+   Author: Nicola Pero <n.pero@mi.flashnet.it>
+   Date: December 1999
+
+   This file is part of the GNUstep GUI Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; see the file COPYING.LIB.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/ 
+
 #ifndef _GNUstep_H_NSTableColumn
 #define _GNUstep_H_NSTableColumn
 
-#include <Foundation/Foundation.h>
-
-#include <AppKit/NSTableHeaderCell.h>
-#include <AppKit/NSTableView.h>
+@class NSCell;
+@class NSTableView;
 
 @interface NSTableColumn : NSObject
 {
-  NSTableHeaderCell *tbcol_cell;
-  NSTableView *tbcol_tableview;
-  id tbcol_datacell;
-  id tbcol_identifier;
-  float tbcol_maxWidth;
-  float tbcol_minWidth;
-  float tbcol_width;
-  BOOL tbcol_resizable;
-  BOOL tbcol_editable;
+  id _identifier;
+  NSTableView* _tableView;
+  float _width;
+  float _min_width;
+  float _max_width;
+  BOOL _is_resizable;
+  BOOL _is_editable;
+  NSCell* _headerCell;
+  NSCell* _dataCell;
 }
-
-- (id)initWithIdentifier:(id)anObject;
-- (void)setIdentifier:(id)anObject;
+/* 
+ * Initializing an NSTableColumn instance 
+ */
+- (NSTableColumn*)initWithIdentifier: (id)anObject;
+/*
+ * Managing the Identifier
+ */
+- (void)setIdentifier: (id)anObject;
 - (id)identifier;
-- (void)setTableView:(NSTableView *)aTableView;
+/*
+ * Setting the NSTableView 
+ */
+- (void)setTableView: (NSTableView*)aTableView;
 - (NSTableView *)tableView;
-
-// Sizing.
-
-- (void)setWidth:(float)newWidth;
-- (float)width;
-- (void)setMinWidth:(float)minWidth;
-- (float)minWidth;
-- (void)setMaxWidth:(float)maxWidth;
-- (float)maxWidth;
-- (void)setResizable:(BOOL)flag;
-- (BOOL)isResizable;
+/*
+ * Controlling size 
+ */
+- (void)setWidth: (float)newWidth;
+- (float)width; 
+- (void)setMinWidth: (float)minWidth;
+- (float)minWidth; 
+- (void)setMaxWidth: (float)maxWidth;
+- (float)maxWidth; 
+- (void)setResizable: (BOOL)flag;
+- (BOOL)isResizable; 
 - (void)sizeToFit;
-- (void)setEditable:(BOOL)flag;
+/*
+ * Controlling editability 
+ */
+- (void)setEditable: (BOOL)flag;
 - (BOOL)isEditable;
-- (void)setHeaderCell:(NSCell *)aCell;
-- (id)headerCell;
-- (void)setDataCell:(NSCell *)aCell;
-- (id)dataCell;
+/*
+ * Setting component cells 
+ */
+- (void)setHeaderCell: (NSCell*)aCell;
+- (NSCell*)headerCell; 
+- (void)setDataCell: (NSCell*)aCell; 
+- (NSCell*)dataCell;
 @end
 
-extern NSString *NSTableViewColumnDidResizeNotification;
-
+/* Notifications */
+extern NSString* NSTableViewColumnDidResizeNotification;
 #endif