diff -up cube-4.3.4/src/cubew/cubew_cube.h.extern cube-4.3.4/src/cubew/cubew_cube.h

--- cube-4.3.4/src/cubew/cubew_cube.h.extern	2016-04-02 17:05:37.630070904 -0600

+++ cube-4.3.4/src/cubew/cubew_cube.h	2016-10-21 15:59:05.226792433 -0600

@@ -24,17 +24,13 @@

 #ifndef CUBEW_CUBE_H

 #define CUBEW_CUBE_H

-#ifdef __cplusplus

-extern "C" {

-#endif

-

 #include <stdint.h>

 #ifndef CUBE_AS_SVN_EXTERNAL

 #  include  "cube-version.h"

 #endif

-#include  "cubew_types.h"

+#include "cubew_types.h"

 #include "cubew_metric.h"

 #include "cubew_cnode.h"

 #include "cubew_region.h"

@@ -44,6 +40,10 @@ extern "C" {

 #include "cubew_metric.h"

 #include "cubew_cartesian.h"

+#ifdef __cplusplus

+extern "C" {

+#endif

+

 /** CubePL version, writen by this version of c-writer library*/

 #define CUBEPL_VERSION "1.1"

diff -up cube-4.3.4/src/cubew/cubew_meta_data_writer.h.extern cube-4.3.4/src/cubew/cubew_meta_data_writer.h

--- cube-4.3.4/src/cubew/cubew_meta_data_writer.h.extern	2016-04-02 17:05:37.630070904 -0600

+++ cube-4.3.4/src/cubew/cubew_meta_data_writer.h	2016-10-21 15:59:46.635583618 -0600

@@ -21,11 +21,12 @@

 #ifndef CUBEW_META_DATA_WRITER_H

 #define CUBEW_META_DATA_WRITER_H

+#include <stdarg.h>

+#include "cubew_types.h"

+

 #ifdef __cplusplus

 extern "C" {

 #endif

-#include <stdarg.h>

-#include "cubew_types.h"

 /**

  * A structure collecting information about a region: Start line, end line, description, url, name and so on.

diff -up cube-4.3.4/src/cubew/cubew_metric.h.extern cube-4.3.4/src/cubew/cubew_metric.h

--- cube-4.3.4/src/cubew/cubew_metric.h.extern	2016-04-02 17:05:37.634070853 -0600

+++ cube-4.3.4/src/cubew/cubew_metric.h	2016-10-21 15:54:51.916069814 -0600

@@ -21,10 +21,6 @@

 #ifndef CUBEW_METRIC_H

 #define CUBEW_METRIC_H

-#ifdef __cplusplus

-extern "C" {

-#endif

-

 #include "cubew_types.h"

 #if defined( BACKEND_CUBE_COMPRESSED ) || defined( FRONTEND_CUBE_COMPRESSED )

@@ -32,6 +28,10 @@ extern "C" {

 #endif /* BACKEND_CUBE_COMPRESSED */

+#ifdef __cplusplus

+extern "C" {

+#endif

+

 /** defines a marker at the beginning of the file */

 #define CUBE_INDEXFILE_MARKER "CUBEX.INDEX"

 #define CUBE_INDEXFILE_MARKER_SIZE 11

diff -up cube-4.3.4/src/cubew/cubew_vector.h.extern cube-4.3.4/src/cubew/cubew_vector.h

--- cube-4.3.4/src/cubew/cubew_vector.h.extern	2016-04-02 17:05:37.630070904 -0600

+++ cube-4.3.4/src/cubew/cubew_vector.h	2016-10-21 15:57:57.988131500 -0600

@@ -24,10 +24,6 @@

 #ifndef CUBEW_VECTOR_H

 #define CUBEW_VECTOR_H

-#ifdef __cplusplus

-extern "C" {

-#endif

-

 /** Macros for handling dynamic arrays */

 //#include <config.h>

@@ -36,6 +32,10 @@ extern "C" {

 #include <stdlib.h>

 #include <errno.h>

+#ifdef __cplusplus

+extern "C" {

+#endif

+

 extern int cubew_trace;

 /** allocation with optional log message and only warning if unsuccessful */