diff --git a/uppsrc/Geom/Ctrl/pathCtrl.cpp b/uppsrc/Geom/Ctrl/pathCtrl.cpp
index 833fb7007..6b70eae4f 100644
--- a/uppsrc/Geom/Ctrl/pathCtrl.cpp
+++ b/uppsrc/Geom/Ctrl/pathCtrl.cpp
@@ -536,7 +536,7 @@ void PathEditorCtrl::Paint(Draw& draw)
 		}
 		else
 		{
-			area.Set(plotter, Nvl(trace.color, Black), INT64(0xaa55aa55aa55aa55), Null, outline, 3);
+			area.Set(plotter, Nvl(trace.color, Black), I64(0xaa55aa55aa55aa55), Null, outline, 3);
 			if(area.SetExtent(trace.GetExtent()))
 				trace.Paint(area, false, outline);
 		}
diff --git a/uppsrc/Geom/Draw/hrr.cpp b/uppsrc/Geom/Draw/hrr.cpp
index 09eb29812..28296b614 100644
--- a/uppsrc/Geom/Draw/hrr.cpp
+++ b/uppsrc/Geom/Draw/hrr.cpp
@@ -454,8 +454,8 @@ static dword CeilPack64(int64 i)
 {
 	if(i < 0x7fffffff)
 		return (dword)i;
-	if(i < INT64(0x3fffffff00))
-		return (dword)((i + INT64(0x80000000ff)) >> 8);
+	if(i < I64(0x3fffffff00))
+		return (dword)((i + I64(0x80000000ff)) >> 8);
 	return 0xffffffff;
 }
 
diff --git a/upptst/Drawing/Drawing.cpp b/upptst/Drawing/Drawing.cpp
index 6d1e1d4ad..ef2aa2198 100644
--- a/upptst/Drawing/Drawing.cpp
+++ b/upptst/Drawing/Drawing.cpp
@@ -59,7 +59,7 @@ struct App : public TopWindow {
 		p.Clear();
 		p << Point(330, 110) << Point(360, 180) << Point(310, 150) << Point(370, 120)
 		  << Point(330, 110);
-		w.DrawPolygon(p, Cyan, 5, Magenta, INT64(0xaa55aa55aa55aa55));
+		w.DrawPolygon(p, Cyan, 5, Magenta, I64(0xaa55aa55aa55aa55));
 		
 		w.DrawImage(40, 240, CtrlImg::save());
 		w.DrawImage(110, 210, 80, 80, CtrlImg::save());