diff --git a/SConstruct b/SConstruct
index 4a2db4a2b..9551bea09 100644
--- a/SConstruct
+++ b/SConstruct
@@ -381,6 +381,7 @@ class DXXProgram(DXXCommon):
 'editor/ktmap.c',
 'editor/kview.c',
 'editor/med.c',
+'editor/meddraw.c',
 'editor/medmisc.c',
 'editor/medsel.c',
 'editor/texture.c',
@@ -628,7 +629,6 @@ class D1XProgram(DXXProgram):
 	editor_sources = [os.path.join(srcdir, f) for f in [
 'editor/centers.c',
 'editor/ehostage.c',
-'editor/meddraw.c',
 'editor/medrobot.c',
 'editor/medwall.c',
 'editor/mine.c',
@@ -763,7 +763,6 @@ class D2XProgram(DXXProgram):
 	# for editor
 	editor_sources = [os.path.join(srcdir, f) for f in [
 'editor/centers.c',
-'editor/meddraw.c',
 'editor/medrobot.c',
 'editor/medwall.c',
 'editor/mine.c',
diff --git a/d2x-rebirth/editor/meddraw.c b/similar/editor/meddraw.c
similarity index 99%
rename from d2x-rebirth/editor/meddraw.c
rename to similar/editor/meddraw.c
index 88f8be3a7..98285fe8d 100644
--- a/d2x-rebirth/editor/meddraw.c
+++ b/similar/editor/meddraw.c
@@ -674,7 +674,7 @@ void draw_special_segments(void)
 	// Highlight matcens, fuelcens, etc.
 	for (seg=0;seg<=Highest_segment_index;seg++)
 		if (Segments[seg].segnum != -1)
-			switch(Segment2s[seg].special)
+			switch(Segments[seg].special)
 			{
 			case SEGMENT_IS_FUELCEN:
 				color = BM_XRGB( 29, 27, 13 );
@@ -935,10 +935,12 @@ void find_segments(short x,short y,grs_canvas *screen_canvas,editor_view *v,segm
 
 void meddraw_init_views( grs_canvas * canvas)
 {
+#if defined(DXX_BUILD_DESCENT_II)
 	// sticking these here so the correct D2 colors are used
 	edge_colors[0] = BM_XRGB(45/2,45/2,45/2);
 	edge_colors[1] = BM_XRGB(45/3,45/3,45/3);		//BM_RGB(0,0,45),	//
 	edge_colors[2] = BM_XRGB(45/4,45/4,45/4);	//BM_RGB(0,45,0)};	//
+#endif
 
 	Views[0]->ev_canv = canvas;
 #if ORTHO_VIEWS