diff --git a/ChangeLog b/ChangeLog
index eba58cd3c..84421ffdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,20 @@
+2011-08-12  Robert Larice
+ * src/frontend/plotting/Makefile.am ,
+ * src/frontend/plotting/grid.c ,
+ * src/frontend/plotting/grid.h ,
+ * src/include/grid.h ,
+ * visualc/vngspice.vcproj :
+   remove second incarnation of `grid.h'
+
 2011-08-11 Holger Vogt
  * xpressn.c: correct #include path for error.h
- 
+
 2011-08-10 Holger Vogt
  * evtplot.c: initilize 'value' to 0
  * xpressn.c: improved error message
  * misccoms.c, main.c, error.c, fteext.h: flag ft_pipemode set
    in main.c, used to optimize or suppress output messages
-   
+
 2011-08-09 Holger Vogt
  * inp2dot.c: align spaces and braces
  * inp2dot.c, examples/pss/*.cir: uic for pss to end of line
@@ -25,8 +33,8 @@
  * src/frontend/fteext.h
  * src/frontend/optdefs.h
  * src/spicelib/devices/cktcrte.c
- * src/spicelib/devices/cktinit.c 
-   added "frontend statistics" to the acct command: 
+ * src/spicelib/devices/cktinit.c
+   added "frontend statistics" to the acct command:
    netlist loading and parsing time and number of
    lines. Added "devhelp" command to show available
    devices and describe device parameters. Added
diff --git a/src/frontend/plotting/Makefile.am b/src/frontend/plotting/Makefile.am
index ed7df9c91..69af54e43 100644
--- a/src/frontend/plotting/Makefile.am
+++ b/src/frontend/plotting/Makefile.am
@@ -14,7 +14,6 @@ libplotting_la_SOURCES = \
 	graphdb.c	\
 	graphdb.h	\
 	grid.c		\
-	grid.h		\
 	pvec.c		\
 	pvec.h		\
 	plot5.c		\
diff --git a/src/frontend/plotting/grid.c b/src/frontend/plotting/grid.c
index 8b8ed9faa..352a6f33b 100644
--- a/src/frontend/plotting/grid.c
+++ b/src/frontend/plotting/grid.c
@@ -20,6 +20,8 @@ $Id$
 #define RAD_TO_DEG	(180.0 / M_PI)
 #define LABEL_CHARS	20
 
+typedef enum { x_axis, y_axis } Axis;
+
 
 /* static declarations */
 static double * lingrid(GRAPH *graph, double lo, double hi, double delta, int type, Axis axis);
@@ -36,6 +38,10 @@ static void arcset(GRAPH *graph, double rad, double prevrad, double irad, double
 static double cliparc(double cx, double cy, double rad, double start, double end, int iclipx, 
 		      int iclipy, int icliprad, int flag);
 
+static void drawlingrid(GRAPH *graph, char *units, int spacing, int nsp, double dst, double lmt, 
+		 double hmt, bool onedec, int mult, double mag, int digits, Axis axis);
+static void drawloggrid(GRAPH *graph, char *units, int hmt, int lmt, int decsp, int subs, 
+		 int pp, Axis axis);
 
 /* note: scaleunits is static and never changed in this file
     ie, can get rid of it */
diff --git a/src/frontend/plotting/grid.h b/src/frontend/plotting/grid.h
deleted file mode 100644
index 44db7c411..000000000
--- a/src/frontend/plotting/grid.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*************
- * Header file for grid.c
- * 1999 E. Rouat
- ************/
-
-#ifndef GRID_H_INCLUDED
-#define GRID_H_INCLUDED
-
-typedef enum { x_axis, y_axis } Axis;
-
-void gr_fixgrid(GRAPH *graph, double xdelta, double ydelta, int xtype, int ytype);
-void gr_redrawgrid(GRAPH *graph);
-void drawlingrid(GRAPH *graph, char *units, int spacing, int nsp, double dst, double lmt, 
-		 double hmt, bool onedec, int mult, double mag, int digits, Axis axis);
-void drawloggrid(GRAPH *graph, char *units, int hmt, int lmt, int decsp, int subs, 
-		 int pp, Axis axis);
-
-#endif
diff --git a/src/include/grid.h b/src/include/grid.h
index 3de2b3a6d..fd5744ec7 100644
--- a/src/include/grid.h
+++ b/src/include/grid.h
@@ -1,6 +1,8 @@
 #ifndef _GRID_H
 #define _GRID_H
 
+#include "typedefs.h"
+
 /* Grid types. 
 
    Note: SMITHGRID is only a smith grid, SMITH transforms the data */
@@ -9,4 +11,7 @@ typedef enum {
     GRID_YLOG, GRID_POLAR, GRID_SMITH, GRID_SMITHGRID
 } GRIDTYPE;
 
+void gr_fixgrid(GRAPH *graph, double xdelta, double ydelta, int xtype, int ytype);
+void gr_redrawgrid(GRAPH *graph);
+
 #endif
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index 072a87e72..1a8c9cade 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -2017,10 +2017,6 @@
 				RelativePath="..\src\include\grid.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\plotting\grid.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\include\hash.h"
 				>