diff --git a/ChangeLog b/ChangeLog
index 649fda2c7..c66197882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-15  Robert Larice
+ * src/frontend/plotting/graphdb.c ,
+ * src/frontend/plotting/graphdb.h ,
+ * src/frontend/postcoms.c ,
+ * src/frontend/wdisp/windisp.c ,
+ * src/include/ftedbgra.h :
+    collect NewGraph() FindGraph() CopyGraph() RemoveWindow() in "ftedbgra.h"
+
 2010-10-15  Robert Larice
  * src/frontend/com_fft.c ,
  * src/frontend/outitf.c ,
diff --git a/src/frontend/plotting/graphdb.c b/src/frontend/plotting/graphdb.c
index e4b948808..9e3ac8a74 100644
--- a/src/frontend/plotting/graphdb.c
+++ b/src/frontend/plotting/graphdb.c
@@ -12,6 +12,7 @@ $Id$
 #include <ftedebug.h>
 #include <fteext.h>
 
+#include "ftedbgra.h"
 #include "graphdb.h"
 #include "../breakp2.h"
 #include "../error.h"
diff --git a/src/frontend/plotting/graphdb.h b/src/frontend/plotting/graphdb.h
index 130e1450d..e57aec3e1 100644
--- a/src/frontend/plotting/graphdb.h
+++ b/src/frontend/plotting/graphdb.h
@@ -6,9 +6,6 @@
 #ifndef GRAPHDB_H_INCLUDED
 #define GRAPHDB_H_INCLUDED
 
-GRAPH *NewGraph(void);
-GRAPH *FindGraph(int id);
-GRAPH *CopyGraph(GRAPH *graph);
 int DestroyGraph(int id);
 void FreeGraphs(void);
 void SetGraphContext(int graphid);
diff --git a/src/frontend/postcoms.c b/src/frontend/postcoms.c
index df1dee5f6..be55184ec 100644
--- a/src/frontend/postcoms.c
+++ b/src/frontend/postcoms.c
@@ -14,7 +14,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 #include <sim.h>
 #include <plot.h>
 #include <graph.h>
-#include "plotting/graphdb.h"
+#include "ftedbgra.h"
 
 #include "completion.h"
 #include "postcoms.h"
@@ -26,13 +26,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 static void killplot(struct plot *pl);
 static void DelPlotWindows(struct plot *pl);
 
-/* External function */
-/* Either defined in windisp.c or in x11.c */
-/* Do this only if Windows or X11 is defined. */
-#if defined(HAS_WINDOWS) || !defined(X_DISPLAY_MISSING)
-extern void RemoveWindow(GRAPH*);
-#endif
-
 void
 com_unlet(wordlist *wl)
 {
diff --git a/src/frontend/wdisp/windisp.c b/src/frontend/wdisp/windisp.c
index bfd7d9cd4..3b6c8aa28 100644
--- a/src/frontend/wdisp/windisp.c
+++ b/src/frontend/wdisp/windisp.c
@@ -48,7 +48,6 @@ LRESULT CALLBACK PlotWindowProc( HWND hwnd,     /* window procedure */
 UINT uMsg, WPARAM wParam, LPARAM lParam);
 void WPRINT_PrintInit( HWND hwnd);              /* Windows printer init */
 void WaitForIdle(void);                         /* wait until no more events */
-void RemoveWindow(GRAPH *pgraph);
 static void WIN_ScreentoData(GRAPH *graph, int x, int y, double *fx, double *fy);
 static void RealClose(void);    
 /* externals */
diff --git a/src/include/ftedbgra.h b/src/include/ftedbgra.h
index 0356dd429..e2fecb74c 100644
--- a/src/include/ftedbgra.h
+++ b/src/include/ftedbgra.h
@@ -16,3 +16,5 @@ extern GRAPH *NewGraph(void);
 extern GRAPH *FindGraph(int id);
 
 extern GRAPH *CopyGraph(GRAPH *graph);
+
+extern void RemoveWindow(GRAPH*);