diff --git a/ChangeLog b/ChangeLog
index d03b15cbf..115bbf4a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-16  Adam Fedor  <fedor@gnu.org>
+
+	* Headers/gnustep/gui/NSWindowController.h: Add copyright notice.
+	Protect with #ifdef's.
+
 2000-09-14  Mirko Viviani  <mirko.viviani@rccr.cremona.it>
 
 	* Source/NSPanel.m ([GSAlertPanel
diff --git a/Headers/gnustep/gui/NSWindowController.h b/Headers/gnustep/gui/NSWindowController.h
index 49b45c8a1..4b6567853 100644
--- a/Headers/gnustep/gui/NSWindowController.h
+++ b/Headers/gnustep/gui/NSWindowController.h
@@ -1,50 +1,77 @@
-
+/* 
+   NSWindowController.h
+
+   The document controller class
+
+   Copyright (C) 1999 Free Software Foundation, Inc.
+
+   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_NSWindowController
+#define _GNUstep_H_NSWindowController
+
 #import <Foundation/Foundation.h>
-#import <AppKit/NSNibDeclarations.h>
-
-@class NSWindow, NSDocument, NSArray;
-
-@interface NSWindowController : NSObject <NSCoding>
-{
-  @private
-    NSWindow            *_window;
-    NSString            *_windowNibName;
-    NSString            *_windowFrameAutosaveName;
-    NSDocument          *_document;
-    NSArray             *_topLevelObjects;
-    id                  _owner;
-    struct ___wcFlags {
-        unsigned int shouldCloseDocument:1;
-        unsigned int shouldCascade:1;
-        unsigned int nibIsLoaded:1;
-        unsigned int RESERVED:29;
-    } _wcFlags;
-    void                *_reserved1;
-    void                *_reserved2;
-}
-
-- (id)initWithWindowNibName:(NSString *)windowNibName;  // self is the owner
-- (id)initWithWindowNibName:(NSString *)windowNibName owner:(id)owner;
-- (id)initWithWindow:(NSWindow *)window;
-
-- (NSString *)windowNibName;
-- (id)owner;
-- (void)setDocument:(NSDocument *)document;
-- (id)document;
-- (void)setWindowFrameAutosaveName:(NSString *)name;
-- (NSString *)windowFrameAutosaveName;
-- (void)setShouldCloseDocument:(BOOL)flag;
-- (BOOL)shouldCloseDocument;
-- (void)setShouldCascadeWindows:(BOOL)flag;
-- (BOOL)shouldCascadeWindows;
-- (void)close;
-- (NSWindow *)window;
-- (IBAction)showWindow:(id)sender;
-- (NSString *)windowTitleForDocumentDisplayName:(NSString *)displayName;
-- (BOOL)isWindowLoaded;
-- (void)windowDidLoad;
-- (void)windowWillLoad;
-- (void)loadWindow;
-
-@end
-
+#import <AppKit/NSNibDeclarations.h>
+
+@class NSWindow, NSDocument, NSArray;
+
+@interface NSWindowController : NSObject <NSCoding>
+{
+  @private
+    NSWindow            *_window;
+    NSString            *_windowNibName;
+    NSString            *_windowFrameAutosaveName;
+    NSDocument          *_document;
+    NSArray             *_topLevelObjects;
+    id                  _owner;
+    struct ___wcFlags {
+        unsigned int shouldCloseDocument:1;
+        unsigned int shouldCascade:1;
+        unsigned int nibIsLoaded:1;
+        unsigned int RESERVED:29;
+    } _wcFlags;
+    void                *_reserved1;
+    void                *_reserved2;
+}
+
+- (id)initWithWindowNibName:(NSString *)windowNibName;  // self is the owner
+- (id)initWithWindowNibName:(NSString *)windowNibName owner:(id)owner;
+- (id)initWithWindow:(NSWindow *)window;
+
+- (NSString *)windowNibName;
+- (id)owner;
+- (void)setDocument:(NSDocument *)document;
+- (id)document;
+- (void)setWindowFrameAutosaveName:(NSString *)name;
+- (NSString *)windowFrameAutosaveName;
+- (void)setShouldCloseDocument:(BOOL)flag;
+- (BOOL)shouldCloseDocument;
+- (void)setShouldCascadeWindows:(BOOL)flag;
+- (BOOL)shouldCascadeWindows;
+- (void)close;
+- (NSWindow *)window;
+- (IBAction)showWindow:(id)sender;
+- (NSString *)windowTitleForDocumentDisplayName:(NSString *)displayName;
+- (BOOL)isWindowLoaded;
+- (void)windowDidLoad;
+- (void)windowWillLoad;
+- (void)loadWindow;
+
+@end
+
+#endif