point_t -> Common::Point

svn-id: r38437

19 files changed, 274 insertions, 295 deletions

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 8703686e82..7af3f878a9 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -173,7 +173,7 @@ _reset_graphics_input(state_t *s) {
 
 	s->mouse_pointer_view = s->mouse_pointer_loop = s->mouse_pointer_cel = -1; /* No mouse pointer resource */
 	s->save_mouse_pointer_view = s->save_mouse_pointer_loop = s->save_mouse_pointer_cel = -1; /* No mouse pointer resource */
-	gfxop_set_pointer_position(s->gfx_state, gfx_point(160, 150));
+	gfxop_set_pointer_position(s->gfx_state, Common::Point(160, 150));
 
 	s->mouse_pointer_view = s->mouse_pointer_loop = s->mouse_pointer_cel = -1; /* No mouse pointer resource */
 	s->save_mouse_pointer_view = s->save_mouse_pointer_loop = s->save_mouse_pointer_cel = -1; /* No mouse pointer resource */
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index abb0ce4e33..9a25b2b93e 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -67,7 +67,7 @@ kGetEvent(state_t *s, int funct_nr, int argc, reg_t *argv) {
 	PUT_SEL32V(obj, x, s->gfx_state->pointer_pos.x);
 	PUT_SEL32V(obj, y, s->gfx_state->pointer_pos.y);
 
-	/*  gfxop_set_pointer_position(s->gfx_state, gfx_point(s->gfx_state->pointer_pos.x, s->gfx_state->pointer_pos.y)); */
+	/*  gfxop_set_pointer_position(s->gfx_state, Common::Point(s->gfx_state->pointer_pos.x, s->gfx_state->pointer_pos.y)); */
 
 
 	if (e.type)
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 7f22772dea..5feec224e9 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -332,7 +332,7 @@ kSetCursor_SCI11(state_t *s, int funct_nr, int argc, reg_t *argv) {
 			s->mouse_pointer_cel = s->save_mouse_pointer_cel;
 		}
 	case 2 : {
-		point_t pt;
+		Common::Point pt;
 		pt.x = UKPV(0);
 		pt.y = UKPV(1);
 
@@ -346,7 +346,7 @@ kSetCursor_SCI11(state_t *s, int funct_nr, int argc, reg_t *argv) {
 		s->mouse_pointer_cel = UKPV(2);
 		break;
 	case 9 : {
-		point_t hotspot = gfx_point(SKPV(3), SKPV(4));
+		Common::Point hotspot = Common::Point(SKPV(3), SKPV(4));
 
 //		sciprintf("Setting hotspot at %d/%d\n", hotspot.x, hotspot.y);
 
@@ -377,7 +377,7 @@ kSetCursor(state_t *s, int funct_nr, int argc, reg_t *argv) {
 	GFX_ASSERT(gfxop_set_pointer_cursor(s->gfx_state, s->mouse_pointer_view));
 
 	if (argc > 2) {
-		point_t newpos = gfx_point(SKPV(2) + s->port->bounds.x,
+		Common::Point newpos = Common::Point(SKPV(2) + s->port->bounds.x,
 		                           SKPV(3) + s->port->bounds.y);
 
 		GFX_ASSERT(gfxop_set_pointer_position(s->gfx_state, newpos));
@@ -391,8 +391,8 @@ extern int oldx, oldy;
 
 reg_t
 kMoveCursor(state_t *s, int funct_nr, int argc, reg_t *argv) {
-	point_t newpos;
-	static point_t oldpos = {0, 0};
+	Common::Point newpos;
+	static Common::Point oldpos(0, 0);
 
 	newpos = s->gfx_state->pointer_pos;
 
@@ -439,7 +439,7 @@ kShow(state_t *s, int funct_nr, int argc, reg_t *argv) {
 		if (old_map != s->pic_visible_map) {
 
 			if (s->pic_visible_map == GFX_MASK_VISUAL) /* Full widget redraw */
-				s->visual->draw(GFXW(s->visual), gfx_point(0, 0));
+				s->visual->draw(GFXW(s->visual), Common::Point(0, 0));
 
 			gfxop_update(s->gfx_state);
 			sciprintf("Switching visible map to %x\n", s->pic_visible_map);
@@ -551,8 +551,8 @@ kGraph(state_t *s, int funct_nr, int argc, reg_t *argv) {
 		          gfxcolor.mask);
 
 		redraw_port = 1;
-		ADD_TO_CURRENT_BG_WIDGETS(GFXW(gfxw_new_line(gfx_point(SKPV(2), SKPV(1)),
-		                               gfx_point(SKPV(4), SKPV(3)),
+		ADD_TO_CURRENT_BG_WIDGETS(GFXW(gfxw_new_line(Common::Point(SKPV(2), SKPV(1)),
+		                               Common::Point(SKPV(4), SKPV(3)),
 		                               gfxcolor, GFX_LINE_MODE_CORRECT, GFX_LINE_STYLE_NORMAL)));
 
 	}
@@ -627,7 +627,7 @@ kGraph(state_t *s, int funct_nr, int argc, reg_t *argv) {
 		area.y += s->port->zone.y;
 
 		if (s->dyn_views && s->dyn_views->parent == GFXWC(s->port))
-			s->dyn_views->draw(GFXW(s->dyn_views), gfx_point(0, 0));
+			s->dyn_views->draw(GFXW(s->dyn_views), Common::Point(0, 0));
 
 		gfxop_update_box(s->gfx_state, area);
 
@@ -980,7 +980,7 @@ kCelHigh(state_t *s, int funct_nr, int argc, reg_t *argv) {
 	int loop = SKPV(1);
 	int cel = SKPV(2);
 	int height, width;
-	point_t offset;
+	Common::Point offset;
 
 	if (argc != 3) {
 		SCIkwarn(SCIkWARNING, "CelHigh called with %d parameters!\n", argc);
@@ -999,7 +999,7 @@ kCelWide(state_t *s, int funct_nr, int argc, reg_t *argv) {
 	int loop = SKPV(1);
 	int cel = SKPV(2);
 	int height, width;
-	point_t offset;
+	Common::Point offset;
 
 	if (argc != 3) {
 		SCIkwarn(SCIkWARNING, "CelHigh called with %d parameters!\n", argc);
@@ -1207,7 +1207,7 @@ set_base(state_t *s, reg_t object) {
 	if (gfxop_check_cel(s->gfx_state, view, &loop, &cel)) {
 		xsize = ysize = xmod = ymod = 0;
 	} else {
-		point_t offset = gfx_point(0, 0);
+		Common::Point offset = Common::Point(0, 0);
 
 		if (loop != oldloop) {
 			loop = 0;
@@ -1301,7 +1301,7 @@ calculate_nsrect(state_t *s, int x, int y, int view, int loop, int cel) {
 	if (gfxop_check_cel(s->gfx_state, view, &loop, &cel)) {
 		xsize = ysize = xmod = ymod = 0;
 	} else {
-		point_t offset = gfx_point(0, 0);
+		Common::Point offset = Common::Point(0, 0);
 
 		gfxop_get_cel_parameters(s->gfx_state, view, loop, cel,
 		                         &xsize, &ysize, &offset);
@@ -2024,7 +2024,7 @@ _k_make_dynview_obj(state_t *s, reg_t obj, int options, int nr, int funct_nr, in
 	int signal;
 	reg_t under_bits;
 	reg_t *under_bitsp, *signalp;
-	point_t pos;
+	Common::Point pos;
 	int z;
 	gfxw_dyn_view_t *widget;
 
@@ -2459,7 +2459,7 @@ kAddToPic(state_t *s, int funct_nr, int argc, reg_t *argv) {
 		priority = KP_SINT(argv[5]);
 		control = KP_SINT(argv[6]);
 
-		widget = GFXW(gfxw_new_dyn_view(s->gfx_state, gfx_point(x, y), 0, view, loop, cel, 0,
+		widget = GFXW(gfxw_new_dyn_view(s->gfx_state, Common::Point(x, y), 0, view, loop, cel, 0,
 		                                priority, -1 /* No priority */ , ALIGN_CENTER, ALIGN_BOTTOM, 0));
 
 		if (!widget) {
@@ -2610,7 +2610,7 @@ kDrawCel(state_t *s, int funct_nr, int argc, reg_t *argv) {
 	SCIkdebug(SCIkGRAPHICS, "DrawCel((%d,%d), (view.%d, %d, %d), p=%d)\n", x, y, view, loop,
 	          cel, priority);
 
-	new_view = gfxw_new_view(s->gfx_state, gfx_point(x, y), view, loop, cel, 0, priority, -1,
+	new_view = gfxw_new_view(s->gfx_state, Common::Point(x, y), view, loop, cel, 0, priority, -1,
 	                         ALIGN_LEFT, ALIGN_TOP, GFXW_VIEW_FLAG_DONT_MODIFY_OFFSET);
 
 #if 0
@@ -2773,7 +2773,7 @@ kNewWindow(state_t *s, int funct_nr, int argc, reg_t *argv) {
              gfx_rect(x, (((y) < 10)? 10 : (y)),      xl, (((y) < 10)? ((y) - 10) : 0) + (yl)), s->ega_colors[color]));
 
 #define GRAPH_UPDATE_BOX(s, x, y, xl, yl) GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, newscreen, \
-             gfx_rect(x, (((y) < 10)? 10 : (y)) - 10, xl, (((y) < 10)? ((y) - 10) : 0) + (yl)), gfx_point(x, ((y) < 10)? 10 : (y) )));
+             gfx_rect(x, (((y) < 10)? 10 : (y)) - 10, xl, (((y) < 10)? ((y) - 10) : 0) + (yl)), Common::Point(x, ((y) < 10)? 10 : (y) )));
 
 
 static void
@@ -2799,7 +2799,7 @@ animate_do_animation(state_t *s, int funct_nr, int argc, reg_t *argv) {
 		return;
 	}
 
-	GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, s->old_screen, gfx_rect(0, 0, 320, 190), gfx_point(0, 10)));
+	GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, s->old_screen, gfx_rect(0, 0, 320, 190), Common::Point(0, 10)));
 	gfxop_update_box(s->gfx_state, gfx_rect(0, 0, 320, 200));
 
 	/*SCIkdebug(SCIkGRAPHICS, "Animating pic opening type %x\n", s->pic_animate);*/
@@ -3130,10 +3130,10 @@ animate_do_animation(state_t *s, int funct_nr, int argc, reg_t *argv) {
 		for (i = 0; i < 319; i += granularity0) {
 			GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, newscreen,
 			                             gfx_rect(320 - i, 0, i, 190),
-			                             gfx_point(0, 10)));
+			                             Common::Point(0, 10)));
 			GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, s->old_screen,
 			                             gfx_rect(0, 0, 320 - i, 190),
-			                             gfx_point(i, 10)));
+			                             Common::Point(i, 10)));
 			gfxop_update(s->gfx_state);
 
 			gfxop_usleep(s->gfx_state, s->animation_delay >> 3);
@@ -3146,10 +3146,10 @@ animate_do_animation(state_t *s, int funct_nr, int argc, reg_t *argv) {
 		for (i = 0; i < 319; i += granularity0) {
 			GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, newscreen,
 			                             gfx_rect(0, 0, i, 190),
-			                             gfx_point(319 - i, 10)));
+			                             Common::Point(319 - i, 10)));
 			GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, s->old_screen,
 			                             gfx_rect(i, 0, 320 - i, 190),
-			                             gfx_point(0, 10)));
+			                             Common::Point(0, 10)));
 			gfxop_update(s->gfx_state);
 
 			gfxop_usleep(s->gfx_state, s->animation_delay >> 3);
@@ -3162,10 +3162,10 @@ animate_do_animation(state_t *s, int funct_nr, int argc, reg_t *argv) {
 		for (i = 0; i < 189; i += granularity0) {
 			GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, newscreen,
 			                             gfx_rect(0, 190 - i, 320, i),
-			                             gfx_point(0, 10)));
+			                             Common::Point(0, 10)));
 			GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, s->old_screen,
 			                             gfx_rect(0, 0, 320, 190 - i),
-			                             gfx_point(0, 10 + i)));
+			                             Common::Point(0, 10 + i)));
 			gfxop_update(s->gfx_state);
 
 			gfxop_usleep(s->gfx_state, s->animation_delay >> 3);
@@ -3178,10 +3178,10 @@ animate_do_animation(state_t *s, int funct_nr, int argc, reg_t *argv) {
 		for (i = 0; i < 189; i += granularity0) {
 			GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, newscreen,
 			                             gfx_rect(0, 0, 320, i),
-			                             gfx_point(0, 200 - i)));
+			                             Common::Point(0, 200 - i)));
 			GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, s->old_screen,
 			                             gfx_rect(0, i, 320, 190 - i),
-			                             gfx_point(0, 10)));
+			                             Common::Point(0, 10)));
 			gfxop_update(s->gfx_state);
 
 			gfxop_usleep(s->gfx_state, s->animation_delay >> 3);
@@ -3341,13 +3341,13 @@ kShakeScreen(state_t *s, int funct_nr, int argc, reg_t *argv) {
 			gfxop_draw_box(s->gfx_state, gfx_rect(0, 0, 10, 200), s->ega_colors[0], s->ega_colors[0], GFX_BOX_SHADE_FLAT);
 
 		gfxop_draw_pixmap(s->gfx_state, screen, gfx_rect(0, 0, 320 - shake_right, 200 - shake_down),
-		                  gfx_point(shake_right, shake_down));
+		                  Common::Point(shake_right, shake_down));
 
 		gfxop_update(s->gfx_state);
 		gfxop_usleep(s->gfx_state, 50000);
 
 
-		gfxop_draw_pixmap(s->gfx_state, screen, gfx_rect(0, 0, 320, 200), gfx_point(0, 0));
+		gfxop_draw_pixmap(s->gfx_state, screen, gfx_rect(0, 0, 320, 200), Common::Point(0, 0));
 		gfxop_update(s->gfx_state);
 		gfxop_usleep(s->gfx_state, 50000);
 	}
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 4b66c3f467..8a476e1eb1 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -100,7 +100,7 @@ kDrawMenuBar(state_t *s, int funct_nr, int argc, reg_t *argv) {
 	else
 		sciw_set_status_bar(s, s->titlebar_port, NULL, 0, 0);
 
-	s->titlebar_port->draw(GFXW(s->titlebar_port), gfx_point(0, 0));
+	s->titlebar_port->draw(GFXW(s->titlebar_port), Common::Point(0, 0));
 	gfxop_update(s->gfx_state);
 
 	return s->r_acc;
@@ -256,7 +256,7 @@ about_freesci(state_t *s) {
 		s->visual->add(GFXWC(s->visual), GFXW(port));
 
 		port->add_dirty_abs(GFXWC(port), gfx_rect_fullscreen, 1);
-		s->visual->draw(GFXW(s->visual), gfx_point(0, 0));
+		s->visual->draw(GFXW(s->visual), Common::Point(0, 0));
 		gfxop_update(s->gfx_state);
 
 		while (cont) {
@@ -278,7 +278,7 @@ about_freesci(state_t *s) {
 
 
 		port->widfree(GFXW(port));
-		s->visual->draw(GFXW(s->visual), gfx_point(0, 0));
+		s->visual->draw(GFXW(s->visual), Common::Point(0, 0));
 		gfxop_update(s->gfx_state);
 
 	}
@@ -299,7 +299,7 @@ _menu_go_down(state_t *s, int menu_nr, int item_nr) {
 }
 
 #define FULL_REDRAW \
-  s->visual->draw(GFXW(s->visual), gfx_point(0, 0)); \
+  s->visual->draw(GFXW(s->visual), Common::Point(0, 0)); \
   gfxop_update(s->gfx_state);
 
 
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 840981d652..12687bf8a3 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -82,13 +82,13 @@ typedef struct pointf {
 } pointf_t;
 
 pointf_t
-to_pointf(point_t p) {
+to_pointf(Common::Point p) {
 	return pointf(p.x, p.y);
 }
 
 typedef struct vertex {
 	/* Location */
-	point_t v;
+	Common::Point v;
 
 	/* Index */
 	int idx;
@@ -125,7 +125,7 @@ typedef struct pf_state {
 	LIST_HEAD(polygons_head, polygon) polygons;
 
 	/* Original start and end points */
-	point_t start, end;
+	Common::Point start, end;
 
 	/* Flags for adding original points to final path */
 	char keep_start, keep_end;
@@ -160,9 +160,9 @@ polygon_is_reg_t(unsigned char *list, int size) {
 	return 1;
 }
 
-static point_t
+static Common::Point
 read_point(unsigned char *list, int is_reg_t, int offset) {
-	point_t point;
+	Common::Point point;
 
 	if (!is_reg_t) {
 		POLY_GET_POINT(list, offset, point.x, point.y);
@@ -177,7 +177,7 @@ read_point(unsigned char *list, int is_reg_t, int offset) {
 /*** Debug functions ***/
 
 static void
-draw_line(state_t *s, point_t p1, point_t p2, int type) {
+draw_line(state_t *s, Common::Point p1, Common::Point p2, int type) {
 	/* Colors for polygon debugging.
 	** Green: Total access
 	** Red : Barred access
@@ -206,7 +206,7 @@ draw_line(state_t *s, point_t p1, point_t p2, int type) {
 }
 
 static void
-draw_point(state_t *s, point_t p, int start) {
+draw_point(state_t *s, Common::Point p, int start) {
 	/* Colors for starting and end point
 	** Green: End point
 	** Blue: Starting point
@@ -234,7 +234,7 @@ draw_polygon(state_t *s, reg_t polygon) {
 	reg_t points = GET_SEL32(polygon, points);
 	int size = KP_UINT(GET_SEL32(polygon, size));
 	int type = KP_UINT(GET_SEL32(polygon, type));
-	point_t first, prev;
+	Common::Point first, prev;
 	unsigned char *list = kernel_dereference_bulk_pointer(s, points, size * POLY_POINT_SIZE);
 	int is_reg_t = polygon_is_reg_t(list, size);
 	int i;
@@ -242,7 +242,7 @@ draw_polygon(state_t *s, reg_t polygon) {
 	prev = first = read_point(list, is_reg_t, 0);
 
 	for (i = 1; i < size; i++) {
-		point_t point = read_point(list, is_reg_t, i);
+		Common::Point point = read_point(list, is_reg_t, i);
 		draw_line(s, prev, point, type);
 		prev = point;
 	}
@@ -251,7 +251,7 @@ draw_polygon(state_t *s, reg_t polygon) {
 }
 
 static void
-draw_input(state_t *s, reg_t poly_list, point_t start, point_t end, int opt) {
+draw_input(state_t *s, reg_t poly_list, Common::Point start, Common::Point end, int opt) {
 	list_t *list;
 	node_t *node;
 
@@ -284,7 +284,7 @@ print_polygon(state_t *s, reg_t polygon) {
 	int i;
 	unsigned char *point_array = kernel_dereference_bulk_pointer(s, points, size * POLY_POINT_SIZE);
 	int is_reg_t = polygon_is_reg_t(point_array, size);
-	point_t point;
+	Common::Point point;
 
 	sciprintf("%i:", type);
 
@@ -298,7 +298,7 @@ print_polygon(state_t *s, reg_t polygon) {
 }
 
 static void
-print_input(state_t *s, reg_t poly_list, point_t start, point_t end, int opt) {
+print_input(state_t *s, reg_t poly_list, Common::Point start, Common::Point end, int opt) {
 	list_t *list;
 	node_t *node;
 
@@ -329,9 +329,9 @@ print_input(state_t *s, reg_t poly_list, point_t start, point_t end, int opt) {
 /*** Basic geometry functions ***/
 
 static int
-area(point_t a, point_t b, point_t c)
+area(Common::Point a, Common::Point b, Common::Point c)
 /* Computes the area of a triangle
-** Parameters: (point_t) a, b, c: The points of the triangle
+** Parameters: (Common::Point) a, b, c: The points of the triangle
 ** Returns   : (int) The area multiplied by two
 */
 {
@@ -339,10 +339,10 @@ area(point_t a, point_t b, point_t c)
 }
 
 static int
-left(point_t a, point_t b, point_t c)
+left(Common::Point a, Common::Point b, Common::Point c)
 /* Determines whether or not a point is to the left of a directed line
-** Parameters: (point_t) a, b: The directed line (a, b)
-**             (point_t) c: The query point
+** Parameters: (Common::Point) a, b: The directed line (a, b)
+**             (Common::Point) c: The query point
 ** Returns   : (int) 1 if c is to the left of (a, b), 0 otherwise
 */
 {
@@ -350,11 +350,11 @@ left(point_t a, point_t b, point_t c)
 }
 
 static int
-left_on(point_t a, point_t b, point_t c)
+left_on(Common::Point a, Common::Point b, Common::Point c)
 /* Determines whether or not a point is to the left of or collinear with a
 ** directed line
-** Parameters: (point_t) a, b: The directed line (a, b)
-**             (point_t) c: The query point
+** Parameters: (Common::Point) a, b: The directed line (a, b)
+**             (Common::Point) c: The query point
 ** Returns   : (int) 1 if c is to the left of or collinear with (a, b), 0
 **                   otherwise
 */
@@ -363,9 +363,9 @@ left_on(point_t a, point_t b, point_t c)
 }
 
 static int
-collinear(point_t a, point_t b, point_t c)
+collinear(Common::Point a, Common::Point b, Common::Point c)
 /* Determines whether or not three points are collinear
-** Parameters: (point_t) a, b, c: The three points
+** Parameters: (Common::Point) a, b, c: The three points
 ** Returns   : (int) 1 if a, b, and c are collinear, 0 otherwise
 */
 {
@@ -373,10 +373,10 @@ collinear(point_t a, point_t b, point_t c)
 }
 
 static int
-between(point_t a, point_t b, point_t c)
+between(Common::Point a, Common::Point b, Common::Point c)
 /* Determines whether or not a point lies on a line segment
-** Parameters: (point_t) a, b: The line segment (a, b)
-**             (point_t) c: The query point
+** Parameters: (Common::Point) a, b: The line segment (a, b)
+**             (Common::Point) c: The query point
 ** Returns   : (int) 1 if c lies on (a, b), 0 otherwise
 */
 {
@@ -391,10 +391,10 @@ between(point_t a, point_t b, point_t c)
 }
 
 static int
-intersect_proper(point_t a, point_t b, point_t c, point_t d)
+intersect_proper(Common::Point a, Common::Point b, Common::Point c, Common::Point d)
 /* Determines whether or not two line segments properly intersect
-** Parameters: (point_t) a, b: The line segment (a, b)
-**             (point_t) c, d: The line segment (c, d)
+** Parameters: (Common::Point) a, b: The line segment (a, b)
+**             (Common::Point) c, d: The line segment (c, d)
 ** Returns   : (int) 1 if (a, b) properly intersects (c, d), 0 otherwise
 */
 {
@@ -407,10 +407,10 @@ intersect_proper(point_t a, point_t b, point_t c, point_t d)
 }
 
 static int
-intersect(point_t a, point_t b, point_t c, point_t d)
+intersect(Common::Point a, Common::Point b, Common::Point c, Common::Point d)
 /* Determines whether or not two line segments intersect
-** Parameters: (point_t) a, b: The line segment (a, b)
-**             (point_t) c, d: The line segment (c, d)
+** Parameters: (Common::Point) a, b: The line segment (a, b)
+**             (Common::Point) c, d: The line segment (c, d)
 ** Returns   : (int) 1 if (a, b) intersects (c, d), 0 otherwise
 */
 {
@@ -425,9 +425,9 @@ intersect(point_t a, point_t b, point_t c, point_t d)
 /*** Pathfinding ***/
 
 static vertex_t *
-vertex_new(point_t p)
+vertex_new(Common::Point p)
 /* Allocates and initialises a new vertex
-** Parameters: (point_t) p: The position of the vertex
+** Parameters: (Common::Point) p: The position of the vertex
 ** Returns   : (vertex_t *) A newly allocated vertex
 */
 {
@@ -456,9 +456,9 @@ polygon_new(int type)
 }
 
 static int
-contained(point_t p, polygon_t *polygon)
+contained(Common::Point p, polygon_t *polygon)
 /* Polygon containment test
-** Parameters: (point_t) p: The point
+** Parameters: (Common::Point) p: The point
 **             (polygon_t *) polygon: The polygon
 ** Returns   : (int) CONT_INSIDE if p is strictly contained in polygon,
 **                   CONT_ON_EDGE if p lies on an edge of polygon,
@@ -471,8 +471,8 @@ contained(point_t p, polygon_t *polygon)
 
 	/* Iterate over edges */
 	CLIST_FOREACH(vertex, &polygon->vertices, entries) {
-		point_t v1 = vertex->v;
-		point_t v2 = CLIST_NEXT(vertex, entries)->v;
+		Common::Point v1 = vertex->v;
+		Common::Point v2 = CLIST_NEXT(vertex, entries)->v;
 
 		/* Flags for ray straddling left and right */
 		int rstrad, lstrad;
@@ -595,9 +595,9 @@ vertex_compare(const void *a, const void *b)
 **                   0 if a and b are equal
 */
 {
-	point_t p0 = vertex_cur->v;
-	point_t p1 = (*(vertex_t **) a)->v;
-	point_t p2 = (*(vertex_t **) b)->v;
+	Common::Point p0 = vertex_cur->v;
+	Common::Point p1 = (*(vertex_t **) a)->v;
+	Common::Point p2 = (*(vertex_t **) b)->v;
 
 	if (POINT_EQUAL(p1, p2))
 		return 0;
@@ -642,13 +642,13 @@ vertex_compare(const void *a, const void *b)
 }
 
 static void
-clockwise(vertex_t *v, point_t *p1, point_t *p2)
+clockwise(vertex_t *v, Common::Point *p1, Common::Point *p2)
 /* Orders the points of an edge clockwise around vertex_cur. If all three
 ** points are collinear the original order is used
 ** Parameters: (vertex_t *) v: The first vertex of the edge
 ** Returns   : (void)
-**             (point_t) *p1: The first point in clockwise order
-**             (point_t) *p2: The second point in clockwise order
+**             (Common::Point) *p1: The first point in clockwise order
+**             (Common::Point) *p2: The second point in clockwise order
 */
 {
 	vertex_t *w = CLIST_NEXT(v, entries);
@@ -673,7 +673,7 @@ edge_compare(const void *a, const void *b)
 **                   0 if a and b are equal
 */
 {
-	point_t v1, v2, w1, w2;
+	Common::Point v1, v2, w1, w2;
 
 	/* We can assume that the sweeping line intersects both edges and
 	** that the edges do not properly intersect
@@ -711,10 +711,10 @@ edge_compare(const void *a, const void *b)
 }
 
 static int
-inside(point_t p, vertex_t *vertex)
+inside(Common::Point p, vertex_t *vertex)
 /* Determines whether or not a line from a point to a vertex intersects the
 ** interior of the polygon, locally at that vertex
-** Parameters: (point_t) p: The point
+** Parameters: (Common::Point) p: The point
 **             (vertex_t *) vertex: The vertex
 ** Returns   : (int) 1 if the line (p, vertex->v) intersects the interior of
 **                   the polygon, locally at the vertex. 0 otherwise
@@ -722,9 +722,9 @@ inside(point_t p, vertex_t *vertex)
 {
 	/* Check that it's not a single-vertex polygon */
 	if (VERTEX_HAS_EDGES(vertex)) {
-		point_t prev = CLIST_PREV(vertex, entries)->v;
-		point_t next = CLIST_NEXT(vertex, entries)->v;
-		point_t cur = vertex->v;
+		Common::Point prev = CLIST_PREV(vertex, entries)->v;
+		Common::Point next = CLIST_NEXT(vertex, entries)->v;
+		Common::Point cur = vertex->v;
 
 		if (left(prev, cur, next)) {
 			/* Convex vertex, line (p, cur) intersects the inside
@@ -757,8 +757,8 @@ visible(vertex_t *vertex, vertex_t *vertex_prev, int visible, aatree_t *tree)
 */
 {
 	vertex_t *edge;
-	point_t p = vertex_cur->v;
-	point_t w = vertex->v;
+	Common::Point p = vertex_cur->v;
+	Common::Point w = vertex->v;
 	aatree_t *tree_n = tree;
 
 	/* Check if sweeping line intersects the interior of the polygon
@@ -779,7 +779,7 @@ visible(vertex_t *vertex, vertex_t *vertex_prev, int visible, aatree_t *tree)
 	edge = (vertex_t*)aatree_get_data(tree);
 
 	if (edge) {
-		point_t p1, p2;
+		Common::Point p1, p2;
 
 		/* Check for intersection with sweeping line before vertex */
 		clockwise(edge, &p1, &p2);
@@ -800,7 +800,7 @@ visible_vertices(pf_state_t *s, vertex_t *vert)
 */
 {
 	aatree_t *tree = aatree_new();
-	point_t p = vert->v;
+	Common::Point p = vert->v;
 	polygon_t *polygon;
 	int i;
 	int is_visible;
@@ -819,7 +819,7 @@ visible_vertices(pf_state_t *s, vertex_t *vert)
 		/* Check that there is more than one vertex. */
 		if (VERTEX_HAS_EDGES(vertex))
 			CLIST_FOREACH(vertex, &polygon->vertices, entries) {
-			point_t high, low;
+			Common::Point high, low;
 
 			/* Add edges that intersect the initial position of the sweeping line */
 			clockwise(vertex, &high, &low);
@@ -879,7 +879,7 @@ visible_vertices(pf_state_t *s, vertex_t *vert)
 static float
 distance(pointf_t a, pointf_t b)
 /* Computes the distance between two pointfs
-** Parameters: (point_t) a, b: The two pointfs
+** Parameters: (Common::Point) a, b: The two pointfs
 ** Returns   : (int) The distance between a and b, rounded to int
 */
 {
@@ -890,9 +890,9 @@ distance(pointf_t a, pointf_t b)
 }
 
 static int
-point_on_screen_border(point_t p)
+point_on_screen_border(Common::Point p)
 /* Determines if a point lies on the screen border
-** Parameters: (point_t) p: The point
+** Parameters: (Common::Point) p: The point
 ** Returns   : (int) 1 if p lies on the screen border, 0 otherwise
 */
 {
@@ -901,9 +901,9 @@ point_on_screen_border(point_t p)
 }
 
 static int
-edge_on_screen_border(point_t p, point_t q)
+edge_on_screen_border(Common::Point p, Common::Point q)
 /* Determines if an edge lies on the screen border
-** Parameters: (point_t) p, q: The edge (p, q)
+** Parameters: (Common::Point) p, q: The edge (p, q)
 ** Returns   : (int) 1 if (p, q) lies on the screen border, 0 otherwise
 */
 {
@@ -915,18 +915,18 @@ edge_on_screen_border(point_t p, point_t q)
 }
 
 static int
-find_free_point(pointf_t f, polygon_t *polygon, point_t *ret)
+find_free_point(pointf_t f, polygon_t *polygon, Common::Point *ret)
 /* Searches for a nearby point that is not contained in a polygon
 ** Parameters: (pointf_t) f: The pointf to search nearby
 **             (polygon_t *) polygon: The polygon
 ** Returns   : (int) PF_OK on success, PF_FATAL otherwise
-**             (point_t) *ret: The non-contained point on success
+**             (Common::Point) *ret: The non-contained point on success
 */
 {
-	point_t p;
+	Common::Point p;
 
 	/* Try nearest point first */
-	p = gfx_point((int) floor(f.x + 0.5),
+	p = Common::Point((int) floor(f.x + 0.5),
 	              (int) floor(f.y + 0.5));
 
 	if (contained(p, polygon) != CONT_INSIDE) {
@@ -934,7 +934,7 @@ find_free_point(pointf_t f, polygon_t *polygon, point_t *ret)
 		return PF_OK;
 	}
 
-	p = gfx_point((int) floor(f.x),
+	p = Common::Point((int) floor(f.x),
 	              (int) floor(f.y));
 
 	/* Try (x, y), (x + 1, y), (x , y + 1) and (x + 1, y + 1) */
@@ -955,12 +955,12 @@ find_free_point(pointf_t f, polygon_t *polygon, point_t *ret)
 }
 
 static int
-near_point(point_t p, polygon_t *polygon, point_t *ret)
+near_point(Common::Point p, polygon_t *polygon, Common::Point *ret)
 /* Computes the near point of a point contained in a polygon
-** Parameters: (point_t) p: The point
+** Parameters: (Common::Point) p: The point
 **             (polygon_t *) polygon: The polygon
 ** Returns   : (int) PF_OK on success, PF_FATAL otherwise
-**             (point_t) *ret: The near point of p in polygon on success
+**             (Common::Point) *ret: The near point of p in polygon on success
 */
 {
 	vertex_t *vertex;
@@ -968,8 +968,8 @@ near_point(point_t p, polygon_t *polygon, point_t *ret)
 	float dist = HUGE_DISTANCE;
 
 	CLIST_FOREACH(vertex, &polygon->vertices, entries) {
-		point_t p1 = vertex->v;
-		point_t p2 = CLIST_NEXT(vertex, entries)->v;
+		Common::Point p1 = vertex->v;
+		Common::Point p2 = CLIST_NEXT(vertex, entries)->v;
 		float w, h, l, u;
 		pointf_t new_point;
 		float new_dist;
@@ -1006,10 +1006,10 @@ near_point(point_t p, polygon_t *polygon, point_t *ret)
 }
 
 static int
-intersection(point_t a, point_t b, vertex_t *vertex, pointf_t *ret)
+intersection(Common::Point a, Common::Point b, vertex_t *vertex, pointf_t *ret)
 /* Computes the intersection point of a line segment and an edge (not
 ** including the vertices themselves)
-** Parameters: (point_t) a, b: The line segment (a, b)
+** Parameters: (Common::Point) a, b: The line segment (a, b)
 **             (vertex_t *) vertex: The first vertex of the edge
 ** Returns   : (int) FP_OK on success, PF_ERROR otherwise
 **             (pointf_t) *ret: The intersection point
@@ -1019,8 +1019,8 @@ intersection(point_t a, point_t b, vertex_t *vertex, pointf_t *ret)
 	float s, t;
 	/* Numerator and denominator of equations */
 	float num, denom;
-	point_t c = vertex->v;
-	point_t d = CLIST_NEXT(vertex, entries)->v;
+	Common::Point c = vertex->v;
+	Common::Point d = CLIST_NEXT(vertex, entries)->v;
 
 	denom = a.x * (float)(d.y - c.y) +
 	        b.x * (float)(c.y - d.y) +
@@ -1054,16 +1054,16 @@ intersection(point_t a, point_t b, vertex_t *vertex, pointf_t *ret)
 }
 
 static int
-nearest_intersection(pf_state_t *s, point_t p, point_t q, point_t *ret)
+nearest_intersection(pf_state_t *s, Common::Point p, Common::Point q, Common::Point *ret)
 /* Computes the nearest intersection point of a line segment and the polygon
 ** set. Intersection points that are reached from the inside of a polygon
 ** are ignored as are improper intersections which do not obstruct
 ** visibility
 ** Parameters: (pf_state_t *) s: The pathfinding state
-**             (point_t) p, q: The line segment (p, q)
+**             (Common::Point) p, q: The line segment (p, q)
 ** Returns   : (int) PF_OK on success, PF_ERROR when no intersections were
 **                   found, PF_FATAL otherwise
-**             (point_t) *ret: On success, the closest intersection point
+**             (Common::Point) *ret: On success, the closest intersection point
 */
 {
 	polygon_t *polygon = 0;
@@ -1118,14 +1118,14 @@ nearest_intersection(pf_state_t *s, point_t p, point_t q, point_t *ret)
 }
 
 static int
-fix_point(pf_state_t *s, point_t p, point_t *ret, polygon_t **ret_pol)
+fix_point(pf_state_t *s, Common::Point p, Common::Point *ret, polygon_t **ret_pol)
 /* Checks a point for containment in any of the polygons in the polygon set.
 ** If the point is contained in a totally accessible polygon that polygon
 ** is removed from the set. If the point is contained in a polygon of another
 ** type the near point is returned. Otherwise the original point is returned
-** Parameters: (point_t) p: The point
+** Parameters: (Common::Point) p: The point
 ** Returns   : (int) PF_OK on success, PF_FATAL otherwise
-**             (point_t) *ret: A valid input point for pathfinding
+**             (Common::Point) *ret: A valid input point for pathfinding
 **             (polygon_t *) *ret_pol: The polygon p was contained in if p
 **                                     != *ret, NULL otherwise
 */
@@ -1140,7 +1140,7 @@ fix_point(pf_state_t *s, point_t p, point_t *ret, polygon_t **ret_pol)
 	}
 
 	if (polygon) {
-		point_t near_p;
+		Common::Point near_p;
 
 		if (polygon->type == POLY_TOTAL_ACCESS) {
 			/* Remove totally accessible polygon if it contains
@@ -1170,13 +1170,13 @@ fix_point(pf_state_t *s, point_t p, point_t *ret, polygon_t **ret_pol)
 }
 
 static vertex_t *
-merge_point(pf_state_t *s, point_t v)
+merge_point(pf_state_t *s, Common::Point v)
 /* Merges a point into the polygon set. A new vertex is allocated for this
 ** point, unless a matching vertex already exists. If the point is on an
 ** already existing edge that edge is split up into two edges connected by
 ** the new vertex
 ** Parameters: (pf_state_t *) s: The pathfinding state
-**             (point_t) v: The point to merge
+**             (Common::Point) v: The point to merge
 ** Returns   : (vertex_t *) The vertex corresponding to v
 */
 {
@@ -1304,12 +1304,12 @@ change_polygons_opt_0(pf_state_t *s)
 }
 
 static pf_state_t *
-convert_polygon_set(state_t *s, reg_t poly_list, point_t start, point_t end, int opt)
+convert_polygon_set(state_t *s, reg_t poly_list, Common::Point start, Common::Point end, int opt)
 /* Converts the SCI input data for pathfinding
 ** Parameters: (state_t *) s: The game state
 **             (reg_t) poly_list: Polygon list
-**             (point_t) start: The start point
-**             (point_t) end: The end point
+**             (Common::Point) start: The start point
+**             (Common::Point) end: The end point
 **             (int) opt: Optimization level (0, 1 or 2)
 ** Returns   : (pf_state_t *) On success a newly allocated pathfinding state,
 **                            NULL otherwise
@@ -1599,7 +1599,7 @@ output_path(pf_state_t *p, state_t *s)
 	if (s->debug_mode & (1 << SCIkAVOIDPATH_NR)) {
 		sciprintf("[avoidpath] Returning path:");
 		for (i = 0; i < path_len + p->keep_start + p->keep_end; i++) {
-			point_t pt;
+			Common::Point pt;
 			POLY_GET_POINT(oref, i, pt.x, pt.y);
 			sciprintf(" (%i, %i)", pt.x, pt.y);
 		}
@@ -1611,7 +1611,7 @@ output_path(pf_state_t *p, state_t *s)
 
 reg_t
 kAvoidPath(state_t *s, int funct_nr, int argc, reg_t *argv) {
-	point_t start = gfx_point(SKPV(0), SKPV(1));
+	Common::Point start = Common::Point(SKPV(0), SKPV(1));
 
 	if (s->debug_mode & (1 << SCIkAVOIDPATH_NR)) {
 		gfxw_port_t *port = s->picture_port;
@@ -1643,7 +1643,7 @@ kAvoidPath(state_t *s, int funct_nr, int argc, reg_t *argv) {
 	}
 	case 6 :
 	case 7 : {
-		point_t end = gfx_point(SKPV(2), SKPV(3));
+		Common::Point end = Common::Point(SKPV(2), SKPV(3));
 		reg_t poly_list = argv[4];
 		/* int poly_list_size = UKPV(5); */
 		int opt = UKPV_OR_ALT(6, 1);
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index c86082925b..4f0ee57560 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -964,7 +964,7 @@ c_viewinfo(state_t *s) {
 			for (j = 0; j < cels; j++) {
 				int width;
 				int height;
-				point_t mod;
+				Common::Point mod;
 
 				if (con_can_handle_pixmaps()) {
 					view_pixmaps = gfxr_get_view(s->gfx_state->resstate,
@@ -1760,7 +1760,7 @@ c_redraw_screen(state_t *s) {
 		return 1;
 	}
 
-	s->visual->draw(GFXW(s->visual), gfx_point(0, 0));
+	s->visual->draw(GFXW(s->visual), Common::Point(0, 0));
 	gfxop_update_box(s->gfx_state, gfx_rect(0, 0, 320, 200));
 	gfxop_update(s->gfx_state);
 	gfxop_usleep(s->gfx_state, 10);
@@ -1977,17 +1977,17 @@ c_gfx_show_map(state_t *s) {
 	switch (map) {
 	case 0:
 		s->visual->add_dirty_abs(GFXWC(s->visual), gfx_rect(0, 0, 320, 200), 0);
-		s->visual->draw(GFXW(s->visual), gfx_point(0, 0));
+		s->visual->draw(GFXW(s->visual), Common::Point(0, 0));
 		break;
 
 	case 1:
 		gfx_xlate_pixmap(s->gfx_state->pic->priority_map, s->gfx_state->driver->mode, GFX_XLATE_FILTER_NONE);
-		gfxop_draw_pixmap(s->gfx_state, s->gfx_state->pic->priority_map, gfx_rect(0, 0, 320, 200), gfx_point(0, 0));
+		gfxop_draw_pixmap(s->gfx_state, s->gfx_state->pic->priority_map, gfx_rect(0, 0, 320, 200), Common::Point(0, 0));
 		break;
 
 	case 2:
 		gfx_xlate_pixmap(s->gfx_state->control_map, s->gfx_state->driver->mode, GFX_XLATE_FILTER_NONE);
-		gfxop_draw_pixmap(s->gfx_state, s->gfx_state->control_map, gfx_rect(0, 0, 320, 200), gfx_point(0, 0));
+		gfxop_draw_pixmap(s->gfx_state, s->gfx_state->control_map, gfx_rect(0, 0, 320, 200), Common::Point(0, 0));
 		break;
 
 	default:
@@ -2012,7 +2012,7 @@ c_gfx_draw_cel(state_t *s) {
 	}
 
 	gfxop_set_clip_zone(s->gfx_state, gfx_rect_fullscreen);
-	gfxop_draw_cel(s->gfx_state, view, loop, cel, gfx_point(160, 100),
+	gfxop_draw_cel(s->gfx_state, view, loop, cel, Common::Point(160, 100),
 	               s->ega_colors[0], palette);
 	gfxop_update(s->gfx_state);
 
@@ -2206,7 +2206,7 @@ c_gfx_update_zone(state_t *s) {
 	                                             cmd_params[1].val,
 	                                             cmd_params[2].val,
 	                                             cmd_params[3].val),
-	                                    gfx_point(cmd_params[0].val,
+	                                    Common::Point(cmd_params[0].val,
 	                                              cmd_params[1].val),
 	                                    GFX_BUFFER_FRONT
 	                                   );
diff --git a/engines/sci/gfx/gfx_driver.cpp b/engines/sci/gfx/gfx_driver.cpp
index 070b4b6e07..618d61ec84 100644
--- a/engines/sci/gfx/gfx_driver.cpp
+++ b/engines/sci/gfx/gfx_driver.cpp
@@ -162,7 +162,7 @@ lineColor2(byte *dst, int16 x1, int16 y1, int16 x2, int16 y2, uint32 color) {
 }
 
 static int
-scummvm_draw_line(struct _gfx_driver *drv, point_t start, point_t end,
+scummvm_draw_line(struct _gfx_driver *drv, Common::Point start, Common::Point end,
                   gfx_color_t color,
                   gfx_line_mode_t line_mode, gfx_line_style_t line_style) {
 	uint32 scolor = color.visual.global_index;
@@ -170,7 +170,7 @@ scummvm_draw_line(struct _gfx_driver *drv, point_t start, point_t end,
 	int ysize = S->ysize;
 
 	if (color.mask & GFX_MASK_VISUAL) {
-		point_t nstart, nend;
+		Common::Point nstart, nend;
 
 		nstart.x = start.x;
 		nstart.y = start.y;
@@ -284,7 +284,7 @@ scummvm_grab_pixmap(struct _gfx_driver *drv, rect_t src, gfx_pixmap_t *pxm,
 // Buffer operations
 
 static int
-scummvm_update(struct _gfx_driver *drv, rect_t src, point_t dest, gfx_buffer_t buffer) {
+scummvm_update(struct _gfx_driver *drv, rect_t src, Common::Point dest, gfx_buffer_t buffer) {
 	//TODO
 	int data_source = (buffer == GFX_BUFFER_BACK) ? 2 : 1;
 	int data_dest = data_source - 1;
diff --git a/engines/sci/gfx/gfx_line.cpp b/engines/sci/gfx/gfx_line.cpp
index 79bb79cef2..e38e7696e5 100644
--- a/engines/sci/gfx/gfx_line.cpp
+++ b/engines/sci/gfx/gfx_line.cpp
@@ -43,7 +43,7 @@
 
 
 static inline
-void DRAWLINE_FUNC(byte *buffer, int linewidth, point_t start, point_t end, unsigned int color) {
+void DRAWLINE_FUNC(byte *buffer, int linewidth, Common::Point start, Common::Point end, unsigned int color) {
 	int dx, dy, incrE, incrNE, d, finalx, finaly;
 	int x = start.x;
 	int y = start.y;
diff --git a/engines/sci/gfx/gfx_support.cpp b/engines/sci/gfx/gfx_support.cpp
index e88428c29f..a355154a78 100644
--- a/engines/sci/gfx/gfx_support.cpp
+++ b/engines/sci/gfx/gfx_support.cpp
@@ -61,7 +61,7 @@ int gfx_crossblit_alpha_threshold = 128;
 #undef DRAWLINE_FUNC
 
 inline void
-gfx_draw_line_buffer(byte *buffer, int linewidth, int pixelwidth, point_t start, point_t end, unsigned int color) {
+gfx_draw_line_buffer(byte *buffer, int linewidth, int pixelwidth, Common::Point start, Common::Point end, unsigned int color) {
 	switch (pixelwidth) {
 
 	case 1:
@@ -91,7 +91,7 @@ gfx_draw_line_buffer(byte *buffer, int linewidth, int pixelwidth, point_t start,
 
 
 void
-gfx_draw_line_pixmap_i(gfx_pixmap_t *pxm, point_t start, point_t end, int color) {
+gfx_draw_line_pixmap_i(gfx_pixmap_t *pxm, Common::Point start, Common::Point end, int color) {
 	gfx_draw_line_buffer(pxm->index_data, pxm->index_xl, 1, start, end, color);
 }
 
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index 4050f16d2a..0419257748 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -89,7 +89,7 @@ _gfxop_scale_rect(rect_t *rect, gfx_mode_t *mode) {
 }
 
 static void
-_gfxop_scale_point(point_t *point, gfx_mode_t *mode) {
+_gfxop_scale_point(Common::Point *point, gfx_mode_t *mode) {
 	int xfact = mode->xfact;
 	int yfact = mode->yfact;
 
@@ -225,12 +225,12 @@ _gfxop_grab_pixmap(gfx_state_t *state, gfx_pixmap_t **pxmp, int x, int y,
 }
 
 static void
-_gfxop_draw_control(gfx_pixmap_t *map, gfx_pixmap_t *pxm, int color, point_t pos)
+_gfxop_draw_control(gfx_pixmap_t *map, gfx_pixmap_t *pxm, int color, Common::Point pos)
 DRAW_LOOP(1) /* Always draw */
 
 #ifdef PRECISE_PRIORITY_MAP
 static void
-_gfxop_draw_priority(gfx_pixmap_t *map, gfx_pixmap_t *pxm, int color, point_t pos)
+_gfxop_draw_priority(gfx_pixmap_t *map, gfx_pixmap_t *pxm, int color, Common::Point pos)
 DRAW_LOOP(map->index_data[offset] < color) /* Draw only lower priority */
 #endif
 
@@ -285,7 +285,7 @@ _gfxop_draw_pixmap(gfx_driver_t *driver, gfx_pixmap_t *pxm, int priority, int co
 	rect_t clipped_dest = gfx_rect(dest.x, dest.y, dest.xl, dest.yl);
 
 	if (control >= 0 || priority >= 0) {
-		point_t original_pos = gfx_point(dest.x / driver->mode->xfact,
+		Common::Point original_pos = Common::Point(dest.x / driver->mode->xfact,
 		                                 dest.y / driver->mode->yfact);
 
 		if (control >= 0)
@@ -981,7 +981,7 @@ line_clip(rect_t *line, rect_t clip, int xfact, int yfact)
 }
 
 static int
-point_clip(point_t *start, point_t *end, rect_t clip, int xfact, int yfact) {
+point_clip(Common::Point *start, Common::Point *end, rect_t clip, int xfact, int yfact) {
 	rect_t line = gfx_rect(start->x, start->y, end->x - start->x, end->y - start->y);
 	int retval = line_clip(&line, clip, xfact, yfact);
 
@@ -997,14 +997,14 @@ point_clip(point_t *start, point_t *end, rect_t clip, int xfact, int yfact) {
 
 
 static void
-draw_line_to_control_map(gfx_state_t *state, point_t start, point_t end, gfx_color_t color) {
+draw_line_to_control_map(gfx_state_t *state, Common::Point start, Common::Point end, gfx_color_t color) {
 	if (color.mask & GFX_MASK_CONTROL)
 		if (!point_clip(&start, &end, state->clip_zone_unscaled, 0, 0))
 			gfx_draw_line_pixmap_i(state->control_map, start, end, color.control);
 }
 
 static int
-simulate_stippled_line_draw(gfx_driver_t *driver, int skipone, point_t start, point_t end, gfx_color_t color, gfx_line_mode_t line_mode)
+simulate_stippled_line_draw(gfx_driver_t *driver, int skipone, Common::Point start, Common::Point end, gfx_color_t color, gfx_line_mode_t line_mode)
 /* Draws a stippled line if this isn't supported by the driver (skipone is ignored ATM) */
 {
 	int xl = end.x - start.x;
@@ -1018,12 +1018,12 @@ simulate_stippled_line_draw(gfx_driver_t *driver, int skipone, point_t start, po
 	int length_left;
 
 	if (!xl) { /* xl = 0, so we move along yl */
-		posvar = &start.y;
+		posvar = (int *) &start.y;
 		length = yl;
 		delta = (yl < 0) ? -dbl_stepwidth : dbl_stepwidth;
 	} else {
 		assert(!yl);  /* We don't do diagonals; that's not needed ATM. */
-		posvar = &start.x;
+		posvar = (int *) &start.x;
 		length = xl;
 		delta = (xl < 0) ? -dbl_stepwidth : dbl_stepwidth;
 	}
@@ -1046,12 +1046,12 @@ simulate_stippled_line_draw(gfx_driver_t *driver, int skipone, point_t start, po
 
 	while (length--) {
 		int retval;
-		point_t nextpos = gfx_point(start.x + xl, start.y + yl);
+		Common::Point nextpos = Common::Point(start.x + xl, start.y + yl);
 
 		if ((retval = driver->draw_line(driver, start, nextpos,
 		                                color, line_mode, GFX_LINE_STYLE_NORMAL))) {
 			GFXERROR("Failed to draw partial stippled line (%d,%d) -- (%d,%d)\n",
-			         GFX_PRINT_POINT(start), GFX_PRINT_POINT(nextpos));
+			         start.x, start.y, nextpos.x, nextpos.y);
 			return retval;
 		}
 		*posvar += delta;
@@ -1059,7 +1059,7 @@ simulate_stippled_line_draw(gfx_driver_t *driver, int skipone, point_t start, po
 
 	if (length_left) {
 		int retval;
-		point_t nextpos;
+		Common::Point nextpos;
 
 		if (length_left > stepwidth)
 			length_left = stepwidth;
@@ -1070,11 +1070,11 @@ simulate_stippled_line_draw(gfx_driver_t *driver, int skipone, point_t start, po
 			if (yl)
 				yl = length_left;
 
-		nextpos = gfx_point(start.x + xl, start.y + yl);
+		nextpos = Common::Point(start.x + xl, start.y + yl);
 
 		if ((retval = driver->draw_line(driver, start, nextpos, color, line_mode, GFX_LINE_STYLE_NORMAL))) {
 			GFXERROR("Failed to draw partial stippled line (%d,%d) -- (%d,%d)\n",
-			         GFX_PRINT_POINT(start), GFX_PRINT_POINT(nextpos));
+			         start.x, start.y, nextpos.x, nextpos.y);
 			return retval;
 		}
 	}
@@ -1084,7 +1084,7 @@ simulate_stippled_line_draw(gfx_driver_t *driver, int skipone, point_t start, po
 
 
 static int
-_gfxop_draw_line_clipped(gfx_state_t *state, point_t start, point_t end, gfx_color_t color, gfx_line_mode_t line_mode,
+_gfxop_draw_line_clipped(gfx_state_t *state, Common::Point start, Common::Point end, gfx_color_t color, gfx_line_mode_t line_mode,
                          gfx_line_style_t line_style) {
 	int retval;
 	int skipone = (start.x ^ end.y) & 1; /* Used for simulated line stippling */
@@ -1094,7 +1094,7 @@ _gfxop_draw_line_clipped(gfx_state_t *state, point_t start, point_t end, gfx_col
 
 	/* First, make sure that the line is normalized */
 	if (start.y > end.y) {
-		point_t swap = start;
+		Common::Point swap = start;
 		start = end;
 		end = swap;
 	}
@@ -1110,7 +1110,7 @@ _gfxop_draw_line_clipped(gfx_state_t *state, point_t start, point_t end, gfx_col
 	if (line_style == GFX_LINE_STYLE_STIPPLED) {
 		if (start.x != end.x && start.y != end.y) {
 			GFXWARN("Attempt to draw stippled line which is neither an hbar nor a vbar: (%d,%d) -- (%d,%d)\n",
-			        GFX_PRINT_POINT(start), GFX_PRINT_POINT(end));
+			        start.x, start.y, end.x, end.y);
 			return GFX_ERROR;
 		}
 		if (!(state->driver->capabilities & GFX_CAPABILITY_STIPPLED_LINES))
@@ -1123,14 +1123,14 @@ _gfxop_draw_line_clipped(gfx_state_t *state, point_t start, point_t end, gfx_col
 
 	if ((retval = state->driver->draw_line(state->driver, start, end, color, line_mode, line_style))) {
 		GFXERROR("Failed to draw line (%d,%d) -- (%d,%d)\n",
-		         GFX_PRINT_POINT(start), GFX_PRINT_POINT(end));
+		         start.x, start.y, end.x, end.y);
 		return retval;
 	}
 	return GFX_OK;
 }
 
 int
-gfxop_draw_line(gfx_state_t *state, point_t start, point_t end,
+gfxop_draw_line(gfx_state_t *state, Common::Point start, Common::Point end,
                 gfx_color_t color, gfx_line_mode_t line_mode,
                 gfx_line_style_t line_style) {
 	int xfact, yfact;
@@ -1164,8 +1164,8 @@ gfxop_draw_rectangle(gfx_state_t *state, rect_t rect, gfx_color_t color, gfx_lin
 	int xfact, yfact;
 	int xunit, yunit;
 	int x, y, xl, yl;
-	point_t upper_left_u, upper_right_u, lower_left_u, lower_right_u;
-	point_t upper_left, upper_right, lower_left, lower_right;
+	Common::Point upper_left_u, upper_right_u, lower_left_u, lower_right_u;
+	Common::Point upper_left, upper_right, lower_left, lower_right;
 
 	BASIC_CHECKS(GFX_FATAL);
 	REMOVE_POINTER;
@@ -1189,15 +1189,15 @@ gfxop_draw_rectangle(gfx_state_t *state, rect_t rect, gfx_color_t color, gfx_lin
 		y = rect.y * yfact;
 	}
 
-	upper_left_u = gfx_point(rect.x, rect.y);
-	upper_right_u = gfx_point(rect.x + rect.xl, rect.y);
-	lower_left_u = gfx_point(rect.x, rect.y + rect.yl);
-	lower_right_u = gfx_point(rect.x + rect.xl, rect.y + rect.yl);
+	upper_left_u = Common::Point(rect.x, rect.y);
+	upper_right_u = Common::Point(rect.x + rect.xl, rect.y);
+	lower_left_u = Common::Point(rect.x, rect.y + rect.yl);
+	lower_right_u = Common::Point(rect.x + rect.xl, rect.y + rect.yl);
 
-	upper_left = gfx_point(x, y);
-	upper_right = gfx_point(x + xl, y);
-	lower_left = gfx_point(x, y + yl);
-	lower_right = gfx_point(x + xl, y + yl);
+	upper_left = Common::Point(x, y);
+	upper_right = Common::Point(x + xl, y);
+	lower_left = Common::Point(x, y + yl);
+	lower_right = Common::Point(x + xl, y + yl);
 
 #define PARTIAL_LINE(pt1, pt2)	 								\
 	retval |= _gfxop_draw_line_clipped(state, pt1, pt2, color, line_mode, line_style);	\
@@ -1344,7 +1344,7 @@ _gfxop_buffer_propagate_box(gfx_state_t *state, rect_t box, gfx_buffer_t buffer)
 	if (_gfxop_clip(&box, gfx_rect(0, 0, 320 * state->driver->mode->xfact, 200 * state->driver->mode->yfact)))
 		return GFX_OK;
 
-	if ((error = state->driver->update(state->driver, box, gfx_point(box.x, box.y), buffer))) {
+	if ((error = state->driver->update(state->driver, box, Common::Point(box.x, box.y), buffer))) {
 		GFXERROR("Error occured while updating region (%d,%d,%d,%d) in buffer %d\n",
 		         box.x, box.y, box.xl, box.yl, buffer);
 		return error;
@@ -1421,7 +1421,7 @@ gfxop_update(gfx_state_t *state) {
 		/* We've been asked to re-draw the active full-screen image, essentially. */
 		rect_t rect = gfx_rect(0, 0, 320, 200);
 		gfx_xlate_pixmap(state->fullscreen_override, state->driver->mode, GFX_XLATE_FILTER_NONE);
-		gfxop_draw_pixmap(state, state->fullscreen_override, rect, gfx_point(0, 0));
+		gfxop_draw_pixmap(state, state->fullscreen_override, rect, Common::Point(0, 0));
 		retval |= _gfxop_update_box(state, rect);
 	}
 
@@ -1490,7 +1490,7 @@ _gfxop_full_pointer_refresh(gfx_state_t *state) {
 
 	if (new_x != state->old_pointer_draw_pos.x
 	        || new_y != state->old_pointer_draw_pos.y) {
-		point_t pp_new = gfx_point(new_x / state->driver->mode->xfact,
+		Common::Point pp_new = Common::Point(new_x / state->driver->mode->xfact,
 		                           new_y / state->driver->mode->yfact);
 
 		if (!_gfxop_get_pointer_bounds(state, &pointer_bounds)) {
@@ -1502,7 +1502,7 @@ _gfxop_full_pointer_refresh(gfx_state_t *state) {
 			if (_gfxop_buffer_propagate_box(state, pointer_bounds, GFX_BUFFER_FRONT)) return 1;
 			if (_gfxop_buffer_propagate_box(state, old_pointer_bounds, GFX_BUFFER_FRONT)) return 1;
 
-			state->old_pointer_draw_pos = gfx_point(new_x, new_y);
+			state->old_pointer_draw_pos = Common::Point(new_x, new_y);
 		} else
 			state->pointer_pos = pp_new;
 	}
@@ -1636,7 +1636,7 @@ gfxop_set_pointer_cursor(gfx_state_t *state, int nr) {
 
 
 int
-gfxop_set_pointer_view(gfx_state_t *state, int nr, int loop, int cel, point_t  *hotspot) {
+gfxop_set_pointer_view(gfx_state_t *state, int nr, int loop, int cel, Common::Point  *hotspot) {
 	int real_loop = loop;
 	int real_cel = cel;
 	gfx_pixmap_t *new_pointer = NULL;
@@ -1664,7 +1664,7 @@ gfxop_set_pointer_view(gfx_state_t *state, int nr, int loop, int cel, point_t  *
 }
 
 int
-gfxop_set_pointer_position(gfx_state_t *state, point_t pos) {
+gfxop_set_pointer_position(gfx_state_t *state, Common::Point pos) {
 	BASIC_CHECKS(GFX_ERROR);
 
 	state->pointer_pos = pos;
@@ -1966,7 +1966,7 @@ gfxop_overflow_cel(gfx_state_t *state, int nr, int *loop, int *cel) {
 
 int
 gfxop_get_cel_parameters(gfx_state_t *state, int nr, int loop, int cel,
-                         int *width, int *height, point_t *offset) {
+                         int *width, int *height, Common::Point *offset) {
 	gfxr_view_t *view = NULL;
 	gfx_pixmap_t *pxm = NULL;
 	BASIC_CHECKS(GFX_ERROR);
@@ -1988,7 +1988,7 @@ gfxop_get_cel_parameters(gfx_state_t *state, int nr, int loop, int cel,
 
 static int
 _gfxop_draw_cel_buffer(gfx_state_t *state, int nr, int loop, int cel,
-                       point_t pos, gfx_color_t color, int static_buf,
+                       Common::Point pos, gfx_color_t color, int static_buf,
                        int palette) {
 	int priority = (color.mask & GFX_MASK_PRIORITY) ? color.priority : -1;
 	int control = (color.mask & GFX_MASK_CONTROL) ? color.control : -1;
@@ -2024,14 +2024,14 @@ _gfxop_draw_cel_buffer(gfx_state_t *state, int nr, int loop, int cel,
 
 
 int
-gfxop_draw_cel(gfx_state_t *state, int nr, int loop, int cel, point_t pos,
+gfxop_draw_cel(gfx_state_t *state, int nr, int loop, int cel, Common::Point pos,
                gfx_color_t color, int palette) {
 	return _gfxop_draw_cel_buffer(state, nr, loop, cel, pos, color, 0, palette);
 }
 
 
 int
-gfxop_draw_cel_static(gfx_state_t *state, int nr, int loop, int cel, point_t pos,
+gfxop_draw_cel_static(gfx_state_t *state, int nr, int loop, int cel, Common::Point pos,
                       gfx_color_t color, int palette) {
 	int retval;
 	rect_t oldclip = state->clip_zone;
@@ -2049,7 +2049,7 @@ gfxop_draw_cel_static(gfx_state_t *state, int nr, int loop, int cel, point_t pos
 
 int
 gfxop_draw_cel_static_clipped(gfx_state_t *state, int nr, int loop, int cel,
-                              point_t pos, gfx_color_t color, int palette) {
+                              Common::Point pos, gfx_color_t color, int palette) {
 	return _gfxop_draw_cel_buffer(state, nr, loop, cel, pos, color, 1, palette);
 }
 
@@ -2417,7 +2417,7 @@ gfxop_grab_pixmap(gfx_state_t *state, rect_t area) {
 }
 
 int
-gfxop_draw_pixmap(gfx_state_t *state, gfx_pixmap_t *pxm, rect_t zone, point_t pos) {
+gfxop_draw_pixmap(gfx_state_t *state, gfx_pixmap_t *pxm, rect_t zone, Common::Point pos) {
 	rect_t target;
 	BASIC_CHECKS(GFX_ERROR);
 
diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp
index 6a574420da..a14f705727 100644
--- a/engines/sci/gfx/resource/sci_pic_0.cpp
+++ b/engines/sci/gfx/resource/sci_pic_0.cpp
@@ -959,8 +959,8 @@ _gfxr_draw_pattern(gfxr_pic_t *pic, int x, int y, int color, int priority, int c
 
 static inline void
 _gfxr_draw_subline(gfxr_pic_t *pic, int x, int y, int ex, int ey, int color, int priority, int drawenable) {
-	point_t start;
-	point_t end;
+	Common::Point start;
+	Common::Point end;
 
 	start.x = x;
 	start.y = y;
@@ -969,7 +969,7 @@ _gfxr_draw_subline(gfxr_pic_t *pic, int x, int y, int ex, int ey, int color, int
 
 	if (ex >= pic->visual_map->index_xl || ey >= pic->visual_map->index_yl || x < 0 || y < 0) {
 		fprintf(stderr, "While drawing pic0: INVALID LINE %d,%d,%d,%d\n",
-		        GFX_PRINT_POINT(start), GFX_PRINT_POINT(end));
+		        start.x, start.y, end.x, end.y);
 		return;
 	}
 
@@ -1010,7 +1010,7 @@ _gfxr_draw_line(gfxr_pic_t *pic, int x, int y, int ex, int ey, int color,
 	if (drawenable & GFX_MASK_CONTROL) {
 
 		p0printf(" ctl:%x", control);
-		gfx_draw_line_pixmap_i(pic->control_map, gfx_point(x, y), gfx_point(x + line.xl, y + line.yl), control);
+		gfx_draw_line_pixmap_i(pic->control_map, Common::Point(x, y), Common::Point(x + line.xl, y + line.yl), control);
 	}
 
 
diff --git a/engines/sci/gfx/sci_widgets.cpp b/engines/sci/gfx/sci_widgets.cpp
index 9e9174375f..97e2a0acd0 100644
--- a/engines/sci/gfx/sci_widgets.cpp
+++ b/engines/sci/gfx/sci_widgets.cpp
@@ -63,8 +63,8 @@ finish_titlebar_list(state_t *s, gfxw_list_t *list, gfxw_port_t *status_bar) {
 	gfx_color_t black = s->ega_colors[0];
 	gfxw_primitive_t *line;
 
-	line = gfxw_new_line(gfx_point(0, status_bar->bounds.yl - 1),
-	                     gfx_point(status_bar->bounds.xl, status_bar->bounds.yl - 1),
+	line = gfxw_new_line(Common::Point(0, status_bar->bounds.yl - 1),
+	                     Common::Point(status_bar->bounds.xl, status_bar->bounds.yl - 1),
 	                     black, GFX_LINE_MODE_CORRECT, GFX_LINE_STYLE_NORMAL);
 	list->add((gfxw_container_t *) list, (gfxw_widget_t *) line);
 
@@ -254,8 +254,8 @@ sciw_new_window(state_t *s, rect_t area, int font, gfx_color_t color, gfx_color_
 
 			if (flags & WINDOW_FLAG_TITLE)
 				decorations->add((gfxw_container_t *) decorations, (gfxw_widget_t *)
-				                 gfxw_new_line(gfx_point(1, 9),
-				                               gfx_point(frame.xl - 2, 9),
+				                 gfxw_new_line(Common::Point(1, 9),
+				                               Common::Point(frame.xl - 2, 9),
 				                               black, GFX_LINE_MODE_CORRECT, GFX_LINE_STYLE_NORMAL));
 		} else {
 			decorations->add((gfxw_container_t *) decorations, (gfxw_widget_t *)
@@ -277,7 +277,7 @@ sciw_new_window(state_t *s, rect_t area, int font, gfx_color_t color, gfx_color_
 /**** Controls ****/
 /*----------------*/
 static inline rect_t
-_move_and_extend_rect(rect_t rect, point_t point, int yplus) {
+_move_and_extend_rect(rect_t rect, Common::Point point, int yplus) {
 	return gfx_rect(rect.x + point.x, rect.y + point.y, rect.xl + 1, rect.yl + yplus);
 }
 
@@ -326,7 +326,7 @@ sciw_new_button_control(gfxw_port_t *port, reg_t ID, rect_t zone, char *text, in
 	zone.xl++;
 	zone.yl++;
 
-	list = gfxw_new_list(_move_and_extend_rect(zone, gfx_point(port->zone.x, port->zone.y), 1), 0);
+	list = gfxw_new_list(_move_and_extend_rect(zone, Common::Point(port->zone.x, port->zone.y), 1), 0);
 
 	gfxw_set_id(GFXW(list), ID.segment, ID.offset);
 
@@ -361,7 +361,7 @@ sciw_new_button_control(gfxw_port_t *port, reg_t ID, rect_t zone, char *text, in
 gfxw_list_t *
 sciw_new_text_control(gfxw_port_t *port, reg_t ID, rect_t zone, char *text, int font,
                       gfx_alignment_t align, char framed, char inverse) {
-	gfxw_list_t *list = gfxw_new_list(_move_and_extend_rect(zone, gfx_point(port->zone.x, port->zone.y), 2), 0);
+	gfxw_list_t *list = gfxw_new_list(_move_and_extend_rect(zone, Common::Point(port->zone.x, port->zone.y), 2), 0);
 
 	gfxw_set_id(GFXW(list), ID.segment, ID.offset);
 
@@ -387,7 +387,7 @@ sciw_new_edit_control(gfxw_port_t *port, reg_t ID, rect_t zone, char *text, int
 	zone.xl++;
 	zone.yl++;
 
-	list = gfxw_new_list(_move_and_extend_rect(zone, gfx_point(port->zone.x, port->zone.y), 1), 0);
+	list = gfxw_new_list(_move_and_extend_rect(zone, Common::Point(port->zone.x, port->zone.y), 1), 0);
 	gfxw_set_id(GFXW(list), ID.segment, ID.offset);
 	zone.x = 1;
 	zone.y = 1;
@@ -437,8 +437,8 @@ sciw_new_edit_control(gfxw_port_t *port, reg_t ID, rect_t zone, char *text, int
 		};
 
 		if (cursor == strlen(text))
-			list->add(GFXWC(list), GFXW(gfxw_new_line(gfx_point(zone.x, zone.y),
-			                            gfx_point(zone.x, zone.y + cursor_height - 1),
+			list->add(GFXWC(list), GFXW(gfxw_new_line(Common::Point(zone.x, zone.y),
+			                            Common::Point(zone.x, zone.y + cursor_height - 1),
 			                            port->color, GFX_LINE_MODE_FAST, GFX_LINE_STYLE_NORMAL)));
 		free(textdup);
 	}
@@ -456,7 +456,7 @@ sciw_new_edit_control(gfxw_port_t *port, reg_t ID, rect_t zone, char *text, int
 gfxw_list_t *
 sciw_new_icon_control(gfxw_port_t *port, reg_t ID, rect_t zone, int view, int loop, int cel,
                       char frame, char inverse) {
-	gfxw_list_t *list = gfxw_new_list(_move_and_extend_rect(zone, gfx_point(port->zone.x, port->zone.y), 1), 0);
+	gfxw_list_t *list = gfxw_new_list(_move_and_extend_rect(zone, Common::Point(port->zone.x, port->zone.y), 1), 0);
 	gfxw_widget_t *icon;
 	gfxw_set_id(GFXW(list), ID.segment, ID.offset);
 
@@ -468,7 +468,7 @@ sciw_new_icon_control(gfxw_port_t *port, reg_t ID, rect_t zone, int view, int lo
 	zone.x = 0;
 	zone.y = 0;
 
-	icon = GFXW(gfxw_new_view(port->visual->gfx_state, gfx_point(zone.x, zone.y), view, loop, cel, 0, -1, -1,
+	icon = GFXW(gfxw_new_view(port->visual->gfx_state, Common::Point(zone.x, zone.y), view, loop, cel, 0, -1, -1,
 	                          ALIGN_LEFT, ALIGN_TOP, GFXW_VIEW_FLAG_DONT_MODIFY_OFFSET));
 
 	if (!icon) {
@@ -500,7 +500,7 @@ sciw_new_list_control(gfxw_port_t *port, reg_t ID, rect_t zone, int font_nr, cha
 	zone.xl++;
 	zone.yl++;
 
-	list = gfxw_new_list(_move_and_extend_rect(zone, gfx_point(port->zone.x, port->zone.y), 1), 0);
+	list = gfxw_new_list(_move_and_extend_rect(zone, Common::Point(port->zone.x, port->zone.y), 1), 0);
 
 	font_height = gfxop_get_font_height(port->visual->gfx_state, font_nr);
 	columns = (zone.yl - 20);
@@ -693,8 +693,8 @@ _make_menu_hbar(int offset, int width, gfxw_port_t *port, gfx_color_t color, gfx
 	bgcolor = un_prioritize(bgcolor);
 
 	list->add(GFXWC(list), GFXW(gfxw_new_box(port->visual->gfx_state, area, bgcolor, bgcolor, GFX_BOX_SHADE_FLAT)));
-	list->add(GFXWC(list), GFXW(gfxw_new_line(gfx_point(0, 5),
-	                            gfx_point(width, 5),
+	list->add(GFXWC(list), GFXW(gfxw_new_line(Common::Point(0, 5),
+	                            Common::Point(width, 5),
 	                            color,
 	                            GFX_LINE_MODE_FAST, GFX_LINE_STYLE_STIPPLED)));
 
diff --git a/engines/sci/gfx/widgets.cpp b/engines/sci/gfx/widgets.cpp
index 41d3dc3c62..fc0a177a50 100644
--- a/engines/sci/gfx/widgets.cpp
+++ b/engines/sci/gfx/widgets.cpp
@@ -34,7 +34,7 @@
 #  define DDIRTY if (0) fprintf
 #endif
 
-point_t gfxw_point_zero = {0, 0};
+Common::Point gfxw_point_zero(0, 0);
 
 #define MAX_SERIAL_NUMBER 0x7fffffff
 static int widget_serial_number_counter = 0x10000; /* Avoid confusion with IDs */
@@ -412,25 +412,25 @@ _gfxwop_basic_superarea_of(gfxw_widget_t *widget, gfxw_widget_t *other) {
 /*-------------*/
 
 static inline rect_t
-_move_rect(rect_t rect, point_t point) {
+_move_rect(rect_t rect, Common::Point point) {
 	return gfx_rect(rect.x + point.x, rect.y + point.y, rect.xl, rect.yl);
 }
 
 static inline void
-_split_rect(rect_t rect, point_t *p1, point_t *p2) {
+_split_rect(rect_t rect, Common::Point *p1, Common::Point *p2) {
 	p1->x = rect.x;
 	p1->y = rect.y;
 	p2->x = rect.x + rect.xl;
 	p2->y = rect.y + rect.yl;
 }
 
-static inline point_t
-_move_point(rect_t rect, point_t point) {
-	return gfx_point(rect.x + point.x, rect.y + point.y);
+static inline Common::Point
+_move_point(rect_t rect, Common::Point point) {
+	return Common::Point(rect.x + point.x, rect.y + point.y);
 }
 
 static int
-_gfxwop_box_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_box_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_box_t *box = (gfxw_box_t *) widget;
 	DRAW_ASSERT(widget, GFXW_BOX);
 	GFX_ASSERT(gfxop_draw_box(box->visual->gfx_state, _move_rect(box->bounds, pos), box->color1,
@@ -568,7 +568,7 @@ _gfxwop_primitive_equals(gfxw_widget_t *widget, gfxw_widget_t *other) {
 }
 
 static int
-_gfxwop_rect_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_rect_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_primitive_t *rect = (gfxw_primitive_t *) widget;
 	DRAW_ASSERT(widget, GFXW_RECT);
 
@@ -616,10 +616,10 @@ gfxw_new_rect(rect_t rect, gfx_color_t color, gfx_line_mode_t line_mode, gfx_lin
 /*-------------*/
 
 static int
-_gfxwop_line_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_line_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_primitive_t *line = (gfxw_primitive_t *) widget;
 	rect_t linepos = widget->bounds;
-	point_t p1, p2;
+	Common::Point p1, p2;
 
 	linepos.xl--;
 	linepos.yl--;
@@ -662,7 +662,7 @@ _gfxw_set_ops_LINE(gfxw_widget_t *prim) {
 }
 
 gfxw_primitive_t *
-gfxw_new_line(point_t start, point_t end, gfx_color_t color, gfx_line_mode_t line_mode, gfx_line_style_t line_style) {
+gfxw_new_line(Common::Point start, Common::Point end, gfx_color_t color, gfx_line_mode_t line_mode, gfx_line_style_t line_style) {
 	gfxw_primitive_t *prim;
 	/* Encode into internal representation */
 	rect_t line = gfx_rect(start.x, start.y, end.x - start.x, end.y - start.y);
@@ -698,11 +698,11 @@ gfxw_new_line(point_t start, point_t end, gfx_color_t color, gfx_line_mode_t lin
 
 
 gfxw_view_t *
-_gfxw_new_simple_view(gfx_state_t *state, point_t pos, int view, int loop, int cel, int palette, int priority, int control,
+_gfxw_new_simple_view(gfx_state_t *state, Common::Point pos, int view, int loop, int cel, int palette, int priority, int control,
                       gfx_alignment_t halign, gfx_alignment_t valign, int size, gfxw_widget_type_t type) {
 	gfxw_view_t *widget;
 	int width, height;
-	point_t offset;
+	Common::Point offset;
 
 	if (!state) {
 		GFXERROR("Attempt to create view widget with NULL state!\n");
@@ -747,19 +747,19 @@ _gfxw_new_simple_view(gfx_state_t *state, point_t pos, int view, int loop, int c
 }
 
 int
-_gfxwop_view_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_view_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_view_t *view = (gfxw_view_t *) widget;
 	DRAW_ASSERT(widget, GFXW_VIEW);
 
 	GFX_ASSERT(gfxop_draw_cel(view->visual->gfx_state, view->view, view->loop,
-	                          view->cel, gfx_point(view->pos.x + pos.x, view->pos.y + pos.y),
+	                          view->cel, Common::Point(view->pos.x + pos.x, view->pos.y + pos.y),
 	                          view->color, view->palette));
 
 	return 0;
 }
 
 static int
-_gfxwop_static_view_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_static_view_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_view_t *view = (gfxw_view_t *) widget;
 	DRAW_ASSERT(widget, GFXW_VIEW);
 
@@ -805,13 +805,13 @@ _gfxw_set_ops_VIEW(gfxw_widget_t *view, char stat) {
 }
 
 gfxw_view_t *
-gfxw_new_view(gfx_state_t *state, point_t pos, int view_nr, int loop, int cel, int palette, int priority, int control,
+gfxw_new_view(gfx_state_t *state, Common::Point pos, int view_nr, int loop, int cel, int palette, int priority, int control,
               gfx_alignment_t halign, gfx_alignment_t valign, int flags) {
 	gfxw_view_t *view;
 
 	if (flags & GFXW_VIEW_FLAG_DONT_MODIFY_OFFSET) {
 		int foo;
-		point_t offset;
+		Common::Point offset;
 		gfxop_get_cel_parameters(state, view_nr, loop, cel, &foo, &foo, &offset);
 		pos.x += offset.x;
 		pos.y += offset.y;
@@ -830,7 +830,7 @@ gfxw_new_view(gfx_state_t *state, point_t pos, int view_nr, int loop, int cel, i
 /*---------------------*/
 
 static int
-_gfxwop_dyn_view_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_dyn_view_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_dyn_view_t *view = (gfxw_dyn_view_t *) widget;
 	DRAW_ASSERT(widget, GFXW_DYN_VIEW);
 
@@ -852,12 +852,12 @@ _gfxwop_dyn_view_draw(gfxw_widget_t *widget, point_t pos) {
 }
 
 static int
-_gfxwop_draw_nop(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_draw_nop(gfxw_widget_t *widget, Common::Point pos) {
 	return 0;
 }
 
 static int
-_gfxwop_pic_view_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_pic_view_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_dyn_view_t *view = (gfxw_dyn_view_t *) widget;
 	DRAW_ASSERT(widget, GFXW_PIC_VIEW);
 
@@ -980,12 +980,12 @@ _gfxw_set_ops_PICVIEW(gfxw_widget_t *widget) {
 }
 
 gfxw_dyn_view_t *
-gfxw_new_dyn_view(gfx_state_t *state, point_t pos, int z, int view, int loop, int cel, int palette, int priority, int control,
+gfxw_new_dyn_view(gfx_state_t *state, Common::Point pos, int z, int view, int loop, int cel, int palette, int priority, int control,
                   gfx_alignment_t halign, gfx_alignment_t valign, int sequence) {
 	gfxw_dyn_view_t *widget;
 	int width, height;
 	int xalignmod, yalignmod;
-	point_t offset;
+	Common::Point offset;
 
 	if (!state) {
 		GFXERROR("Attempt to create view widget with NULL state!\n");
@@ -1062,7 +1062,7 @@ _gfxwop_text_free(gfxw_widget_t *widget) {
 }
 
 static int
-_gfxwop_text_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_text_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_text_t *text = (gfxw_text_t *) widget;
 	DRAW_ASSERT(widget, GFXW_TEXT);
 
@@ -1072,7 +1072,7 @@ _gfxwop_text_draw(gfxw_widget_t *widget, point_t pos) {
 }
 
 static int
-_gfxwop_text_alloc_and_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_text_alloc_and_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_text_t *text = (gfxw_text_t *) widget;
 	DRAW_ASSERT(widget, GFXW_TEXT);
 
@@ -1220,7 +1220,7 @@ gfxw_text_info(gfx_state_t *state, gfxw_text_t *text, int *lines,
 static int
 _gfxwop_container_add_dirty_rel(gfxw_container_t *cont, rect_t rect, int propagate) {
 	DDIRTY(stderr, "->container_add_dirty_rel(%d,%d,%d,%d, %d)\n", GFX_PRINT_RECT(rect), propagate);
-	return cont->add_dirty_abs(cont, _move_rect(rect, gfx_point(cont->zone.x, cont->zone.y)), propagate);
+	return cont->add_dirty_abs(cont, _move_rect(rect, Common::Point(cont->zone.x, cont->zone.y)), propagate);
 }
 
 static inline void
@@ -1384,7 +1384,7 @@ _gfxwop_container_draw_contents(gfxw_widget_t *widget, gfxw_widget_t *contents)
 					** descend into containers.
 					** Doing this is relatively cheap, though. */
 					if (draw_noncontainers || GFXW_IS_CONTAINER(seeker))
-						seeker->draw(seeker, gfx_point(container->zone.x, container->zone.y));
+						seeker->draw(seeker, Common::Point(container->zone.x, container->zone.y));
 
 					if (!dirty->next)
 						seeker->flags &= ~GFXW_FLAG_DIRTY;
@@ -1581,7 +1581,7 @@ _gfxwop_container_add(gfxw_container_t *container, gfxw_widget_t *widget) {
 /*------------------------------*/
 
 static int
-_gfxwop_list_draw(gfxw_widget_t *list, point_t pos) {
+_gfxwop_list_draw(gfxw_widget_t *list, Common::Point pos) {
 	DRAW_ASSERT(list, GFXW_LIST);
 
 	_gfxwop_container_draw_contents(list, ((gfxw_list_t *)list)->contents);
@@ -1592,7 +1592,7 @@ _gfxwop_list_draw(gfxw_widget_t *list, point_t pos) {
 }
 
 static int
-_gfxwop_sorted_list_draw(gfxw_widget_t *list, point_t pos) {
+_gfxwop_sorted_list_draw(gfxw_widget_t *list, Common::Point pos) {
 	DRAW_ASSERT(list, GFXW_SORTED_LIST);
 
 	_gfxwop_container_draw_contents(list, ((gfxw_list_t *)list)->contents);
@@ -1788,7 +1788,7 @@ gfxw_new_list(rect_t area, int sorted) {
 /*---------------*/
 
 static int
-_gfxwop_visual_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_visual_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_visual_t *visual = (gfxw_visual_t *) widget;
 	gfx_dirty_rect_t *dirty = visual->dirty;
 	DRAW_ASSERT(widget, GFXW_VISUAL);
@@ -1936,7 +1936,7 @@ _gfxwop_add_dirty_rects(gfxw_container_t *dest, gfx_dirty_rect_t *src) {
 /*-------------*/
 
 static int
-_gfxwop_port_draw(gfxw_widget_t *widget, point_t pos) {
+_gfxwop_port_draw(gfxw_widget_t *widget, Common::Point pos) {
 	gfxw_port_t *port = (gfxw_port_t *) widget;
 	DRAW_ASSERT(widget, GFXW_PORT);
 
@@ -2098,7 +2098,7 @@ gfxw_new_port(gfxw_visual_t *visual, gfxw_port_t *predecessor, rect_t area, gfx_
 	widget->parent = NULL;
 	widget->decorations = NULL;
 	widget->title_text = NULL;
-	widget->draw_pos = gfx_point(0, 0);
+	widget->draw_pos = Common::Point(0, 0);
 	widget->gray_text = 0;
 	widget->color = fgcolor;
 	widget->bgcolor = bgcolor;
@@ -2409,7 +2409,7 @@ gfxw_widget_intersects_chrono(gfxw_list_t *tw, gfxw_widget_t *widget) {
 
 	seeker = tw->contents;
 	while (seeker) {
-		point_t origin;
+		Common::Point origin;
 		rect_t bounds = widget->bounds;
 
 		bounds = widget->bounds;
@@ -2437,7 +2437,7 @@ gfxw_widget_reparent_chrono(gfxw_visual_t *visual, gfxw_widget_t *view, gfxw_lis
 
 	intersector = gfxw_widget_intersects_chrono(tw, view);
 	if (intersector) {
-		point_t origin = gfx_point(intersector->parent->zone.x,
+		Common::Point origin = Common::Point(intersector->parent->zone.x,
 		                           intersector->parent->zone.y);
 
 		gfxw_remove_widget_from_container(GFXWC(chrono), GFXW(tw));
diff --git a/engines/sci/include/gfx_driver.h b/engines/sci/include/gfx_driver.h
index 1bb74847d4..a3ea66a9b2 100644
--- a/engines/sci/include/gfx_driver.h
+++ b/engines/sci/include/gfx_driver.h
@@ -206,13 +206,13 @@ typedef struct _gfx_driver { /* Graphics driver */
 	/*** Drawing operations ***/
 
 	int (*draw_line)(struct _gfx_driver *drv,
-	                 point_t start, point_t end,
+	                 Common::Point start, Common::Point end,
 	                 gfx_color_t color,
 	                 gfx_line_mode_t line_mode, gfx_line_style_t line_style);
 	/* Draws a single line to the back buffer.
 	** Parameters: (gfx_driver_t *) drv: The driver affected
-	**             (point_t) start: Starting point of the line to draw
-	**             (point_t) end: End point of the line to draw
+	**             (Common::Point) start: Starting point of the line to draw
+	**             (Common::Point) end: End point of the line to draw
 	**             (gfx_color_t *) color: The color to draw with
 	**             (int) line_mode: Any of the line modes
 	**             (int) line_style: Any of the line styles
@@ -297,12 +297,12 @@ typedef struct _gfx_driver { /* Graphics driver */
 
 	/*** Buffer operations ***/
 
-	int (*update)(struct _gfx_driver *drv, rect_t src, point_t dest,
+	int (*update)(struct _gfx_driver *drv, rect_t src, Common::Point dest,
 	              gfx_buffer_t buffer);
 	/* Updates the front buffer or the back buffers
 	** Parameters: (gfx_driver_t *) drv: The affected driver
 	**             (rect_t) src: Source rectangle
-	**             (point_t) dest: Destination point
+	**             (Common::Point) dest: Destination point
 	**             (int) buffer: One of GFX_BUFFER_FRONT or GFX_BUFFER_BACK
 	** Returns   : (int) GFX_OK, GFX_ERROR or GFX_FATAL
 	** This function updates either the visual front buffer, or the two back
diff --git a/engines/sci/include/gfx_operations.h b/engines/sci/include/gfx_operations.h
index db4d9fad54..a5c53a7e0e 100644
--- a/engines/sci/include/gfx_operations.h
+++ b/engines/sci/include/gfx_operations.h
@@ -95,7 +95,7 @@ typedef struct {
 
 	gfx_options_t *options;
 
-	point_t pointer_pos; /* Mouse pointer coordinates */
+	Common::Point pointer_pos; /* Mouse pointer coordinates */
 
 	rect_t clip_zone_unscaled; /* The current UNSCALED clipping zone */
 	rect_t clip_zone; /* The current SCALED clipping zone; a cached scaled version of clip_zone_unscaled */
@@ -114,7 +114,7 @@ typedef struct {
 
 
 	int mouse_pointer_visible; /* Whether the pointer is drawn right now */
-	point_t old_pointer_draw_pos; /* Mouse pointer draw coordinates */
+	Common::Point old_pointer_draw_pos; /* Mouse pointer draw coordinates */
 	rect_t pointer_bg_zone; /* old-pointer-draw-pos relative zone inside the pointer
 				** pixmap that was drawn  */
 
@@ -244,13 +244,13 @@ gfxop_have_mouse(gfx_state_t *state);
 
 int
 gfxop_draw_line(gfx_state_t *state,
-                point_t start, point_t end,
+                Common::Point start, Common::Point end,
                 gfx_color_t color, gfx_line_mode_t line_mode,
                 gfx_line_style_t line_style);
 /* Renders a clipped line to the back buffer
 ** Parameters: (gfx_state_t *) state: The state affected
-**             (point_t) start: Starting point of the line
-**	       (point_t) end: End point of the line
+**             (Common::Point) start: Starting point of the line
+**	       (Common::Point) end: End point of the line
 **             (gfx_color_t) color: The color to use for drawing
 **             (gfx_line_mode_t) line_mode: Any valid line mode to use
 **             (gfx_line_style_t) line_style: The line style to use
@@ -418,23 +418,23 @@ gfxop_set_pointer_cursor(gfx_state_t *state, int nr);
 */
 
 int
-gfxop_set_pointer_view(gfx_state_t *state, int nr, int loop, int cel, point_t *hotspot);
+gfxop_set_pointer_view(gfx_state_t *state, int nr, int loop, int cel, Common::Point *hotspot);
 /* Sets the mouse pointer to a view resource
 ** Parameters: (gfx_state_t *) state: The affected state
 **             (int) nr: Number of the view resource to use
 **             (int) loop: View loop to use
 **             (int) cel: View cel to use
-**             (point_t *) hotspot: Manually set hotspot to use, or NULL for default.
+**             (Common::Point *) hotspot: Manually set hotspot to use, or NULL for default.
 ** Returns   : (int) GFX_OK or GFX_FATAL
 ** Use gfxop_set_pointer_cursor(state, GFXOP_NO_POINTER) to disable the
 ** pointer.
 */
 
 int
-gfxop_set_pointer_position(gfx_state_t *state, point_t pos);
+gfxop_set_pointer_position(gfx_state_t *state, Common::Point pos);
 /* Teleports the mouse pointer to a specific position
 ** Parameters: (gfx_state_t *) state: The state the pointer is in
-**             (point_t) pos: The position to teleport it to
+**             (Common::Point) pos: The position to teleport it to
 ** Returns   : (int) Any error code or GFX_OK
 ** Depending on the graphics driver, this operation may be without
 ** any effect
@@ -503,7 +503,7 @@ gfxop_overflow_cel(gfx_state_t *state, int nr, int *loop, int *cel);
 
 int
 gfxop_get_cel_parameters(gfx_state_t *state, int nr, int loop, int cel,
-                         int *width, int *height, point_t *offset);
+                         int *width, int *height, Common::Point *offset);
 /* Retreives the width and height of a cel
 ** Parameters: (gfx_state_t *) state: The state to use
 **             (int) nr: Number of the view
@@ -511,20 +511,20 @@ gfxop_get_cel_parameters(gfx_state_t *state, int nr, int loop, int cel,
 **             (int) cel: The cel (inside the loop) to look up
 **             (int *) width: The variable the width will be stored in
 **             (int *) height: The variable the height will be stored in
-**             (point_t *) offset: The variable the cel's x/y offset will be stored in
+**             (Common::Point *) offset: The variable the cel's x/y offset will be stored in
 ** Returns   : (int) GFX_OK if the lookup succeeded, GFX_ERROR if the nr/loop/cel
 **             combination was invalid
 */
 
 int
-gfxop_draw_cel(gfx_state_t *state, int nr, int loop, int cel, point_t pos,
+gfxop_draw_cel(gfx_state_t *state, int nr, int loop, int cel, Common::Point pos,
                gfx_color_t color, int palette);
 /* Draws (part of) a cel to the back buffer
 ** Parameters: (gfx_state_t *) state: The state encapsulating the driver to draw with
 **             (int) nr: Number of the view to draw
 **             (int) loop: Loop of the cel to draw
 **             (int) cel: The cel number of the cel to draw
-**             (point_t) pos: The positino the cel is to be drawn to
+**             (Common::Point) pos: The positino the cel is to be drawn to
 **             (gfx_color_t color): The priority and control values to use for drawing
 **	       (int) palette: The palette to use
 ** Returns   : (int) GFX_OK or GFX_FATAL
@@ -532,14 +532,14 @@ gfxop_draw_cel(gfx_state_t *state, int nr, int loop, int cel, point_t pos,
 
 
 int
-gfxop_draw_cel_static(gfx_state_t *state, int nr, int loop, int cel, point_t pos,
+gfxop_draw_cel_static(gfx_state_t *state, int nr, int loop, int cel, Common::Point pos,
                       gfx_color_t color, int palette);
 /* Draws a cel to the static buffer; no clipping is performed
 ** Parameters: (gfx_state_t *) state: The state encapsulating the driver to draw with
 **             (int) nr: Number of the view to draw
 **             (int) loop: Loop of the cel to draw
 **             (int) cel: The cel number of the cel to draw
-**             (point_t) pos: The positino the cel is to be drawn to
+**             (Common::Point) pos: The positino the cel is to be drawn to
 **             (gfx_color_t color): The priority and control values to use for drawing
 **	       (int) palette: The palette to use
 ** Returns   : (int) GFX_OK or GFX_FATAL
@@ -548,14 +548,14 @@ gfxop_draw_cel_static(gfx_state_t *state, int nr, int loop, int cel, point_t pos
 
 
 int
-gfxop_draw_cel_static_clipped(gfx_state_t *state, int nr, int loop, int cel, point_t pos,
+gfxop_draw_cel_static_clipped(gfx_state_t *state, int nr, int loop, int cel, Common::Point pos,
                               gfx_color_t color, int palette);
 /* Draws (part of) a clipped cel to the static buffer
 ** Parameters: (gfx_state_t *) state: The state encapsulating the driver to draw with
 **             (int) nr: Number of the view to draw
 **             (int) loop: Loop of the cel to draw
 **             (int) cel: The cel number of the cel to draw
-**             (point_t) pos: The positino the cel is to be drawn to
+**             (Common::Point) pos: The positino the cel is to be drawn to
 **             (gfx_color_t color): The priority and control values to use for drawing
 **	       (int) palette: The palette to use
 ** Returns   : (int) GFX_OK or GFX_FATAL
@@ -691,12 +691,12 @@ gfxop_grab_pixmap(gfx_state_t *state, rect_t area);
 */
 
 int
-gfxop_draw_pixmap(gfx_state_t *state, gfx_pixmap_t *pxm, rect_t zone, point_t pos);
+gfxop_draw_pixmap(gfx_state_t *state, gfx_pixmap_t *pxm, rect_t zone, Common::Point pos);
 /* Draws part of a pixmap to the screen
 ** Parameters: (gfx_state_t *) state: The affected state
 **             (gfx_pixmap_t *) pxm: The pixmap to draw
 **             (rect_t) zone: The segment of the pixmap to draw
-**             (point_t) pos: The position the pixmap should be drawn to
+**             (Common::Point) pos: The position the pixmap should be drawn to
 ** Returns   : (int) GFX_OK or any error code
 */
 
diff --git a/engines/sci/include/gfx_state_internal.h b/engines/sci/include/gfx_state_internal.h
index 6b61347adf..92bb62fc79 100644
--- a/engines/sci/include/gfx_state_internal.h
+++ b/engines/sci/include/gfx_state_internal.h
@@ -80,7 +80,7 @@ struct _gfxw_widget;
 struct _gfxw_container_widget;
 struct _gfxw_visual;
 
-typedef int gfxw_point_op(struct _gfxw_widget *, point_t);
+typedef int gfxw_point_op(struct _gfxw_widget *, Common::Point);
 typedef int gfxw_visual_op(struct _gfxw_widget *, struct _gfxw_visual *);
 typedef int gfxw_op(struct _gfxw_widget *);
 typedef int gfxw_op_int(struct _gfxw_widget *, int);
@@ -133,7 +133,7 @@ typedef struct {
 
 #define VIEW_COMMON \
 	WIDGET_COMMON; \
-	point_t pos; /* Implies the value of 'bounds' in WIDGET_COMMON */ \
+	Common::Point pos; /* Implies the value of 'bounds' in WIDGET_COMMON */ \
 	gfx_color_t color; \
 	int view, loop, cel; \
 	int palette
@@ -221,7 +221,7 @@ typedef struct _gfxw_port {
 	gfx_color_t color, bgcolor;
 	int chrono_port;
 	int font_nr;
-	point_t draw_pos; /* Drawing position */
+	Common::Point draw_pos; /* Drawing position */
 	gfxw_snapshot_t *restore_snap; /* Snapshot to be restored automagically,
 					  experimental feature used in the PQ3 interpreter */
 	int port_flags; /* interpreter-dependant flags */
diff --git a/engines/sci/include/gfx_system.h b/engines/sci/include/gfx_system.h
index bf3539239d..07888b832f 100644
--- a/engines/sci/include/gfx_system.h
+++ b/engines/sci/include/gfx_system.h
@@ -27,6 +27,7 @@
 #define _SCI_GFX_SYSTEM_
 
 #include "common/scummsys.h"
+#include "common/rect.h"
 #include "sci/include/sci_memory.h"
 #include "sci/include/resource.h"
 
@@ -232,35 +233,13 @@ gfx_rect_equals(rect_t a, rect_t b) {
 /* gfx_rect_fullscreen is declared in gfx/gfx_tools.c */
 extern rect_t gfx_rect_fullscreen;
 
-/*** points ***/
-
-typedef struct {
-	int x, y;
-} point_t;
-
-#define GFX_PRINT_POINT(p) (p).x, (p).y
-
-/* Generates a point_t from index data
-** Parameters: (int x int) x,y: Indicated point
-** Returns   : (point_t) The resulting structure
-*/
-static inline point_t
-gfx_point(int x, int y) {
-	point_t point;
-
-	point.x = x;
-	point.y = y;
-
-	return point;
-}
-
 /* Translation operation for rects
 ** Parameters: (rect_t) rect: The rect to translate
-**             (point_t) offset: The offset to translate it by
+**             (Common::Point) offset: The offset to translate it by
 ** Returns   : (rect_t) The translated rect
 */
 static inline rect_t
-gfx_rect_translate(rect_t rect, point_t offset) {
+gfx_rect_translate(rect_t rect, Common::Point offset) {
 	rect.x += offset.x;
 	rect.y += offset.y;
 
diff --git a/engines/sci/include/gfx_tools.h b/engines/sci/include/gfx_tools.h
index 813117d633..8a36b4d9e9 100644
--- a/engines/sci/include/gfx_tools.h
+++ b/engines/sci/include/gfx_tools.h
@@ -147,11 +147,11 @@ gfx_free_pixmap(gfx_driver_t *driver, gfx_pixmap_t *pxm);
 */
 
 void
-gfx_draw_line_pixmap_i(gfx_pixmap_t *pxm, point_t start, point_t end, int color);
+gfx_draw_line_pixmap_i(gfx_pixmap_t *pxm, Common::Point start, Common::Point end, int color);
 /* Draws a line to a pixmap's index data buffer
 ** Parameters: (gfx_pixmap_t *) pxm: The pixmap to draw to
-**             (point_t) start: Starting point of the line to draw
-**             (point_t) end: End point of the line to draw
+**             (Common::Point) start: Starting point of the line to draw
+**             (Common::Point) end: End point of the line to draw
 **             (int) color: The byte value to write
 ** Returns   : (void)
 ** Remember, this only draws to the /index/ buffer, not to the drawable buffer.
@@ -160,13 +160,13 @@ gfx_draw_line_pixmap_i(gfx_pixmap_t *pxm, point_t start, point_t end, int color)
 
 void
 gfx_draw_line_buffer(byte *buffer, int linewidth, int pixelwidth,
-                     point_t start, point_t end, unsigned int color);
+                     Common::Point start, Common::Point end, unsigned int color);
 /* Draws a line to a linear pixel buffer
 ** Parameters: (byte *) buffer: Pointer to the start of the buffer to draw to
 **             (int) linewidth: Number of bytes per pixel line in the buffer
 **             (int) pixelwidth: Number of bytes per pixel
-**             (point_t) start: Starting point of the line to draw
-**             (point_t) end: End point of the line to draw
+**             (Common::Point) start: Starting point of the line to draw
+**             (Common::Point) end: End point of the line to draw
 **             (rect_t) Coordinates: the line should be drawn to (must be clipped already)
 **                      xl and yl describe relative offsets, as usual.
 **             (unsigned int) color: The color to draw (only the lowest 8 * pixelwidth bits are relevant)
diff --git a/engines/sci/include/gfx_widgets.h b/engines/sci/include/gfx_widgets.h
index b29562e722..1da0b91a81 100644
--- a/engines/sci/include/gfx_widgets.h
+++ b/engines/sci/include/gfx_widgets.h
@@ -79,7 +79,7 @@
 /* Typecasts a container widget to gfxw_container_widget_t *. */
 
 /* gfxw_point_zero is declared in gfx/widgets.c */
-extern point_t gfxw_point_zero;
+extern Common::Point gfxw_point_zero;
 
 /*********************/
 /* Widget operations */
@@ -90,10 +90,10 @@ extern point_t gfxw_point_zero;
 **
 **
 **
-** -- draw(gfxw_widget_t *self, point_t pos)
+** -- draw(gfxw_widget_t *self, Common::Point pos)
 ** Draws the widget.
 ** Parameters: (gfxw_widget_t *) self: self reference
-**             (point_t) pos: The position to draw to (added to the widget's
+**             (Common::Point) pos: The position to draw to (added to the widget's
 **                            internal position)
 ** Returns   : (int) 0
 ** The widget is drawn iff it is flagged as dirty. Invoking this operation on
@@ -261,9 +261,9 @@ gfxw_new_rect(rect_t rect, gfx_color_t color, gfx_line_mode_t line_mode, gfx_lin
 */
 
 gfxw_primitive_t *
-gfxw_new_line(point_t start, point_t end, gfx_color_t color, gfx_line_mode_t line_mode, gfx_line_style_t line_style);
+gfxw_new_line(Common::Point start, Common::Point end, gfx_color_t color, gfx_line_mode_t line_mode, gfx_line_style_t line_style);
 /* Creates a new line
-** Parameters: (point_t * point_t) (start, line): The line origin and end point
+** Parameters: (Common::Point * Common::Point) (start, line): The line origin and end point
 **             (gfx_color_t) color: The line's color
 **             (gfx_line_mode_t) line_mode: The line mode to use for drawing
 **             (gfx_line_style_t) line_style: The line style
@@ -278,11 +278,11 @@ gfxw_new_line(point_t start, point_t end, gfx_color_t color, gfx_line_mode_t lin
 #define GFXW_VIEW_FLAG_DONT_MODIFY_OFFSET (1 << 1)
 
 gfxw_view_t *
-gfxw_new_view(gfx_state_t *state, point_t pos, int view, int loop, int cel, int palette, int priority, int control,
+gfxw_new_view(gfx_state_t *state, Common::Point pos, int view, int loop, int cel, int palette, int priority, int control,
               gfx_alignment_t halign, gfx_alignment_t valign, int flags);
 /* Creates a new view (a cel, actually)
 ** Parameters: (gfx_state_t *) state: The graphics state
-**             (point_t) pos: The position to place the view at
+**             (Common::Point) pos: The position to place the view at
 **             (int x int x int) view, loop, cel: The global cel ID
 **             (int) priority: The priority to use for drawing, or -1 for none
 **             (int) control: The value to write to the control map, or -1 for none
@@ -293,12 +293,12 @@ gfxw_new_view(gfx_state_t *state, point_t pos, int view, int loop, int cel, int
 */
 
 gfxw_dyn_view_t *
-gfxw_new_dyn_view(gfx_state_t *state, point_t pos, int z, int view, int loop, int cel, int palette,
+gfxw_new_dyn_view(gfx_state_t *state, Common::Point pos, int z, int view, int loop, int cel, int palette,
                   int priority, int control, gfx_alignment_t halign, gfx_alignment_t valign,
                   int sequence);
 /* Creates a new dyn view
 ** Parameters: (gfx_state_t *) state: The graphics state
-**             (point_t) pos: The position to place the dynamic view at
+**             (Common::Point) pos: The position to place the dynamic view at
 **             (int) z: The z coordinate
 **             (int x int x int) view, loop, cel: The global cel ID
 **             (int) priority: The priority to use for drawing, or -1 for none