diff --git a/SConstruct b/SConstruct
index d11b9e16b..865f6b326 100644
--- a/SConstruct
+++ b/SConstruct
@@ -756,7 +756,7 @@ class DXXProgram(DXXCommon):
 'main/cntrlcen.cpp',
 'main/config.cpp',
 'main/console.cpp',
-'main/controls.c',
+'main/controls.cpp',
 'main/credits.c',
 'main/digiobj.c',
 'main/effects.c',
diff --git a/common/main/controls.h b/common/main/controls.h
index 56fc85679..64fc4b62d 100644
--- a/common/main/controls.h
+++ b/common/main/controls.h
@@ -21,10 +21,18 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _CONTROLS_H
 #define _CONTROLS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void read_flying_controls( object * obj );
 
 #if defined(DXX_BUILD_DESCENT_II)
 extern fix Afterburner_charge;
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/similar/main/controls.c b/similar/main/controls.cpp
similarity index 99%
rename from similar/main/controls.c
rename to similar/main/controls.cpp
index 5a808f265..225236515 100644
--- a/similar/main/controls.c
+++ b/similar/main/controls.cpp
@@ -18,6 +18,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
  */
 
 
+#include <algorithm>
 #include <stdlib.h>
 #include "key.h"
 #include "joy.h"
@@ -48,6 +49,9 @@ fix Afterburner_charge=f1_0;
 #define DROP_DELTA_TIME			(f1_0/15)	//drop 3 per second
 #endif
 
+using std::min;
+using std::max;
+
 void read_flying_controls( object * obj )
 {
 	fix	forward_thrust_time;