2 files changed, 13 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d32a3db297a..7dfc52674a0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2000-06-12  Jason Rumney  <jasonr@gnu.org>
+
+        * w32bdf.h (EMACS_W32BDF_H): Renamed from __W32BDF_H__
+
+        * w32.h (EMACS_W32_H): Renamed from _NT_H_
+
+        * w32gui.h (EMACS_W32GUI_H): Renamed from __W32GUI_H__
+
+        * w32inevt.h (EMACS_W32INEVT_H): Renamed from __NTINEVT_H__
+
 2000-06-12  Gerd Moellmann  <gerd@gnu.org>
 
         * xfaces.c (Fdump_colors) [DEBUG_X_COLORS]: New function.
diff --git a/src/w32inevt.h b/src/w32inevt.h
index df94f910371..6ac5ea303e5 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -18,8 +18,8 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#ifndef __NTINEVT_H__
-#define __NTINEVT_H__
+#ifndef EMACS_W32INEVT_H
+#define EMACS_W32INEVT_H
 
 extern int w32_console_read_socket (int sd, struct input_event *bufp, 
                                     int numchars, int expected);
@@ -29,4 +29,4 @@ extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
                                         Lisp_Object *x, Lisp_Object *y, 
                                         unsigned long *time);
 
-#endif
+#endif /* EMACS_W32INEVT_H */