diff --git a/SConstruct b/SConstruct
index 7355e87ad..ffc769d07 100644
--- a/SConstruct
+++ b/SConstruct
@@ -601,7 +601,7 @@ class DXXArchive(DXXCommon):
 	target = 'dxx-common'
 	__objects_common = DXXCommon.create_lazy_object_property([os.path.join(srcdir, f) for f in [
 '2d/2dsline.cpp',
-'2d/bitblt.c',
+'2d/bitblt.cpp',
 '2d/bitmap.c',
 '2d/box.c',
 '2d/canvas.c',
diff --git a/common/2d/bitblt.c b/common/2d/bitblt.cpp
similarity index 100%
rename from common/2d/bitblt.c
rename to common/2d/bitblt.cpp
diff --git a/common/include/ogl_init.h b/common/include/ogl_init.h
index 39df14233..cd8c4f09a 100644
--- a/common/include/ogl_init.h
+++ b/common/include/ogl_init.h
@@ -34,6 +34,7 @@
 #include "gr.h"
 #include "palette.h"
 #include "pstypes.h"
+#include "3d.h"
 
 #ifndef GL_VERSION_1_1
 #ifdef GL_EXT_texture
@@ -49,6 +50,10 @@
 #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* we need to export ogl_texture for 2d/font.c */
 typedef struct _ogl_texture {
 	GLuint handle;
@@ -108,4 +113,8 @@ void ogl_toggle_depth_test(int enable);
 void ogl_set_blending();
 int pow2ize(int x);//from ogl.c
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _OGL_INIT_H_ */
diff --git a/common/include/rle.h b/common/include/rle.h
index b0dc3ad41..316da4563 100644
--- a/common/include/rle.h
+++ b/common/include/rle.h
@@ -22,6 +22,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "pstypes.h"
 #include "gr.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void gr_rle_decode( ubyte * src, ubyte * dest );
 int gr_rle_encode( int org_size, ubyte *src, ubyte *dest );
 int gr_rle_getsize( int org_size, ubyte *src );
@@ -36,4 +40,8 @@ void rle_swap_0_255(grs_bitmap *bmp);
 void rle_remap(grs_bitmap *bmp, ubyte *colormap);
 void gr_rle_expand_scanline_generic( grs_bitmap * dest, int dx, int dy, ubyte *src, int x1, int x2 );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif