raster.h renamed to display_raster.h

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37990 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.barscale/draw_scale.c

@@ -6,7 +6,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "options.h"
 
 #define NUMSCALES	16

display/d.barscale/main.c

@@ -26,7 +26,7 @@
 
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "options.h"
 #include <grass/glocale.h>
 

display/d.colors/get_info.c

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include "colors.h"
 

display/d.colors/interact.c

@@ -1,7 +1,7 @@
 #include <unistd.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "graphics.h"
 #include "colors.h"
 

display/d.colors/main.c

@@ -20,7 +20,7 @@
 #include <grass/gis.h>
 #include <grass/glocale.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "colors.h"
 
 int main(int argc, char **argv)

display/d.colortable/main.c

@@ -24,7 +24,7 @@
 #include <math.h>
 #include <grass/display.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 int main(int argc, char **argv)

display/d.erase/main.c

@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 int main(int argc, char *argv[])

display/d.extract/extract.c

@@ -4,7 +4,7 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

display/d.extract/main.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>

display/d.font/main.c

@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 static char **fonts;

display/d.fontlist/main.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 int main(int argc, char **argv)

display/d.geodesic/main.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

display/d.geodesic/plot.c

@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/gis.h>
 #include <stdio.h>
 #include "local_proto.h"

display/d.graph/do_graph.c

@@ -2,7 +2,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/symbol.h>
 #include <grass/glocale.h>
 

display/d.graph/main.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 #include "options.h"

display/d.grid/main.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 

display/d.grid/plot.c

@@ -3,7 +3,7 @@
 
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 

display/d.his/main.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "his.h"
 

display/d.histogram/bar.c

@@ -28,7 +28,7 @@
 
 #include <string.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "bar.h"
 
 int bar(struct stat_list *dist_stats,	/* list of distribution statistics */

display/d.histogram/draw_slice.c

@@ -1,5 +1,5 @@
 #include <math.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/gis.h>
 

display/d.histogram/main.c

@@ -35,7 +35,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 #include "options.h"

display/d.histogram/pie.c

@@ -30,7 +30,7 @@
 
 #include <string.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "pie.h"
 
 /*#define DEBUG */

display/d.info/main.c

@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 

display/d.labels/do_labels.c

@@ -4,7 +4,7 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

display/d.labels/main.c

@@ -20,7 +20,7 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

display/d.legend/main.c

@@ -29,7 +29,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 #include "local_proto.h"

display/d.linegraph/main.c

@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>
 #include <grass/glocale.h>

display/d.measure/draw_line.c

@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 int

display/d.measure/main.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

display/d.measure/msurements.c

@@ -1,6 +1,6 @@
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 

display/d.nviz/main.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local.h"
 #include <grass/glocale.h>
 

display/d.path/main.c

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>
 #include <grass/Vect.h>

display/d.path/select.c

@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>
 #include <grass/colors.h>

display/d.profile/main.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 

display/d.rast.arrow/main.c

@@ -38,7 +38,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>
 #include <grass/glocale.h>

display/d.rast.num/main.c

@@ -38,7 +38,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>
 #include <grass/glocale.h>

display/d.rast/display.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include "mask.h"
 #include "local_proto.h"

display/d.rast/main.c

@@ -20,7 +20,7 @@
  *****************************************************************************/
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 
 #include "mask.h"
 #include "local_proto.h"

display/d.rgb/main.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 struct band

display/d.rhumbline/main.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

display/d.rhumbline/plot.c

@@ -2,7 +2,7 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 void plot(double lon1, double lat1, double lon2, double lat2,

display/d.text/main.c

@@ -58,7 +58,7 @@
 #include <unistd.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include <grass/glocale.h>
 

display/d.thematic.area/area.c

@@ -6,7 +6,7 @@
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

display/d.thematic.area/main.c

@@ -19,7 +19,7 @@
 #include <dirent.h>
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>
 #include <grass/colors.h>

display/d.thematic.area/plot1.c

@@ -4,7 +4,7 @@
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "plot.h"
 #include "local_proto.h"
 #include <grass/symbol.h>

display/d.title/main.c

@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/gis.h>
 #include <grass/glocale.h>
 

display/d.vect.chart/bar.c

@@ -2,7 +2,7 @@
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/symbol.h>
 #include "global.h"
 

display/d.vect.chart/main.c

@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>
 #include <grass/colors.h>

display/d.vect.chart/pie.c

@@ -3,7 +3,7 @@
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/symbol.h>
 #include "global.h"
 

display/d.vect.chart/plot.c

@@ -2,7 +2,7 @@
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/symbol.h>
 #include <grass/glocale.h>
 

display/d.vect/area.c

@@ -6,7 +6,7 @@
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/colors.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

display/d.vect/attr.c

@@ -2,7 +2,7 @@
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>
 #include "local_proto.h"

display/d.vect/dir.c

@@ -1,7 +1,7 @@
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "plot.h"
 

display/d.vect/label.c

@@ -1,7 +1,7 @@
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 #include "plot.h"

display/d.vect/main.c

@@ -18,7 +18,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>
 #include <grass/colors.h>

display/d.vect/plot1.c

@@ -4,7 +4,7 @@
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "plot.h"
 #include "local_proto.h"
 #include <grass/symbol.h>

display/d.vect/topo.c

@@ -1,7 +1,7 @@
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 #include "plot.h"

display/d.vect/utils.c

@@ -1,7 +1,7 @@
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 #include "plot.h"

display/d.vect/zcoor.c

@@ -3,7 +3,7 @@
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 #include "plot.h"
 

display/d.what.rast/main.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include "what.h"
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

display/d.what.rast/what.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 #include "what.h"

display/d.what.vect/main.c

@@ -30,7 +30,7 @@
 #include <grass/gis.h>
 #include <grass/display.h>
 #include <grass/Vect.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "what.h"
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

display/d.what.vect/what.c

@@ -2,7 +2,7 @@
 #include <unistd.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>
 #include <grass/Vect.h>

display/d.where/main.c

@@ -23,7 +23,7 @@
 #include <grass/gis.h>
 #include <grass/gprojects.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

display/d.zoom/box.c

@@ -3,7 +3,7 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 int make_window_box(struct Cell_head *window, double magnify, int full,

display/d.zoom/center.c

@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include "local_proto.h"
 

display/d.zoom/main.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/Vect.h>
 
 #include "local_proto.h"

display/d.zoom/pan.c

@@ -2,7 +2,7 @@
 
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

display/d.zoom/print.c

@@ -1,7 +1,7 @@
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 static int max(int a, int b)

display/d.zoom/quit.c

@@ -3,7 +3,7 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

display/d.zoom/redraw.c

@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 #include "local_proto.h"

display/d.zoom/set.c

@@ -3,7 +3,7 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 static double round_to(double in, int sd)

display/d.zoom/zoom.c

@@ -1,6 +1,6 @@
 #include <grass/gis.h>
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

imagery/i.class/add_point.c

@@ -6,7 +6,7 @@ returns: TRUE (1) point added ok, FALSE (0) could not add, list full
 *************************************************************/
 
 #include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 

imagery/i.class/del_point.c

@@ -1,6 +1,6 @@
 
 #include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 
 
 

imagery/i.class/draw_cell.c

@@ -2,7 +2,7 @@
 #include <grass/gis.h>
 #include "globals.h"
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 int draw_cell(View * view, int overlay)

imagery/i.class/draw_reg.c

@@ -1,4 +1,4 @@
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "globals.h"
 #include "local_proto.h"

imagery/i.class/graphics.c

@@ -1,6 +1,6 @@
 #include "globals.h"
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 static View *makeview(double bottom, double top, double left, double right)

imagery/i.class/histograms.c

@@ -1,6 +1,6 @@
 #include <math.h>
 #include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 #define MU	'l'		/* these are the characters that are printed as  */

imagery/i.class/input.c

@@ -1,5 +1,5 @@
 #include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 static int active = 0;

imagery/i.class/main.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "globals.h"
 #include "local_proto.h"

imagery/i.class/mouse.c

@@ -1,5 +1,5 @@
 #include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 
 static int first = 1;
 static int curx, cury;

imagery/i.class/redisplay.c

@@ -1,5 +1,5 @@
 #include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

imagery/i.class/title.c

@@ -1,4 +1,4 @@
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "globals.h"
 #include "local_proto.h"
 

imagery/i.class/view.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "globals.h"
 #include "local_proto.h"
 

imagery/i.class/zoom_box.c

@@ -1,4 +1,4 @@
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 #include "globals.h"
 #include "local_proto.h"

imagery/i.points/analyze.c

@@ -3,7 +3,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "globals.h"
 #include "local_proto.h"
 

imagery/i.points/ask.c

@@ -1,7 +1,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "globals.h"
 #include "local_proto.h"
 #define NLINES 18

imagery/i.points/ask_mag.c

@@ -1,6 +1,6 @@
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 
 struct box
 {

imagery/i.points/call.c

@@ -8,7 +8,7 @@
 #endif
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 /*
  * call a subroutine, but as a child process
  * allowing interrupts for the child

imagery/i.points/debug.c

@@ -1,7 +1,7 @@
 
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 int debug(char *msg)
 {
     R_stabilize();

imagery/i.points/dot.c

@@ -1,5 +1,5 @@
 #include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 int dot(int x, int y)
 {
     double vx[5], vy[5];

imagery/i.points/drawcell.c

@@ -2,7 +2,7 @@
 #include <grass/gis.h>
 #include "globals.h"
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include "local_proto.h"
 
 int drawcell(View * view)

imagery/i.points/graphics.c

@@ -1,7 +1,7 @@
 #include "globals.h"
 #include "local_proto.h"
 #include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 
 static View *makeview(double bottom, double top, double left, double right)
 {

imagery/i.points/input.c

@@ -1,6 +1,6 @@
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 
 static int active = 0;
 static int replot;

imagery/i.points/main.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <signal.h>
 #include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 #include <grass/glocale.h>
 
 #include "globals.h"

imagery/i.points/mark.c

@@ -1,6 +1,6 @@
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 
 static int get_point2(double *, double *);
 static int keyboard(void);

imagery/i.points/mouse.c

@@ -1,5 +1,5 @@
 #include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 
 static int first = 1;
 static int curx, cury;

imagery/i.points/points.c

@@ -1,6 +1,6 @@
 #include "globals.h"
 #include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
 
 int display_points(int in_color)
 {