diff --git a/SConstruct b/SConstruct
index 7ae035810..c39e3ec42 100644
--- a/SConstruct
+++ b/SConstruct
@@ -837,7 +837,7 @@ class DXXProgram(DXXCommon):
 'editor/ksegsize.cpp',
 'editor/ktmap.cpp',
 'editor/kview.cpp',
-'editor/med.c',
+'editor/med.cpp',
 'editor/meddraw.c',
 'editor/medmisc.c',
 'editor/medrobot.c',
diff --git a/common/include/editor/meddraw.h b/common/include/editor/meddraw.h
index f455a5fa5..e4f2d2fb1 100644
--- a/common/include/editor/meddraw.h
+++ b/common/include/editor/meddraw.h
@@ -20,6 +20,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _MEDDRAW_H
 #define _MEDDRAW_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void meddraw_init_views( grs_canvas * canvas);
 void draw_world(grs_canvas *screen_canvas,editor_view *v,segment *mine_ptr,int depth);
 void find_segments(short x,short y,grs_canvas *screen_canvas,editor_view *v,segment *mine_ptr,int depth);
@@ -28,4 +32,8 @@ void find_segments(short x,short y,grs_canvas *screen_canvas,editor_view *v,segm
 //    automap_flag = 1 if this render is for the automap, else 0 (for editor)
 extern void draw_mine_all(segment *segp, int automap_flag);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/common/include/editor/medsel.h b/common/include/editor/medsel.h
index 0e4aaf700..5748ff5e6 100644
--- a/common/include/editor/medsel.h
+++ b/common/include/editor/medsel.h
@@ -20,6 +20,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _MEDSEL_H
 #define _MEDSEL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern void sort_seg_list(int n_segs,short *segnumlist,vms_vector *pos);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/common/include/editor/objpage.h b/common/include/editor/objpage.h
index ec801475c..0041ae5cb 100644
--- a/common/include/editor/objpage.h
+++ b/common/include/editor/objpage.h
@@ -22,6 +22,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #include "ui.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct d_event;
 
 int objpage_grab_current(int n);
@@ -33,4 +37,8 @@ int objpage_do(struct d_event *event);
 
 extern void draw_object_picture(int id, vms_angvec *orient_angles, int type);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/similar/editor/med.c b/similar/editor/med.cpp
similarity index 100%
rename from similar/editor/med.c
rename to similar/editor/med.cpp