diff --git a/src/lib/aqdiagram/data/accumulate.h b/src/lib/aqdiagram/data/accumulate.h
index 30817c8..f557b8c 100644
--- a/src/lib/aqdiagram/data/accumulate.h
+++ b/src/lib/aqdiagram/data/accumulate.h
@@ -13,10 +13,22 @@
 
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_GRAPH_DATAPAIR_LIST *AQDG_Data_Accumulate(const AQDG_GRAPH_DATAPAIR_LIST *dpList);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 
 #endif
 
diff --git a/src/lib/aqdiagram/data/average.h b/src/lib/aqdiagram/data/average.h
index 3f9e2a2..7fdbe74 100644
--- a/src/lib/aqdiagram/data/average.h
+++ b/src/lib/aqdiagram/data/average.h
@@ -13,10 +13,21 @@
 
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API double AQDG_Data_Average(const AQDG_GRAPH_DATAPAIR_LIST *dpList);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 
 #endif
 
diff --git a/src/lib/aqdiagram/data/date.h b/src/lib/aqdiagram/data/date.h
index dbd1a72..a747d22 100644
--- a/src/lib/aqdiagram/data/date.h
+++ b/src/lib/aqdiagram/data/date.h
@@ -13,6 +13,13 @@
 
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+
 AQDG_API AQDG_GRAPH_DATAPAIR_LIST *AQDG_Data_DaySums(const AQDG_GRAPH_DATAPAIR_LIST *dpList);
 AQDG_API AQDG_GRAPH_DATAPAIR_LIST *AQDG_Data_MonthSums(const AQDG_GRAPH_DATAPAIR_LIST *dpList);
 
@@ -24,5 +31,11 @@ AQDG_API AQDG_GRAPH_DATAPAIR_LIST *AQDG_Data_MinutesMin(const AQDG_GRAPH_DATAPAI
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 #endif
 
diff --git a/src/lib/aqdiagram/data/diff.h b/src/lib/aqdiagram/data/diff.h
index ab2e5e3..9e0bd76 100644
--- a/src/lib/aqdiagram/data/diff.h
+++ b/src/lib/aqdiagram/data/diff.h
@@ -13,10 +13,20 @@
 
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API double AQDG_Data_GetAbsMinDiffX(const AQDG_GRAPH_DATAPAIR_LIST *dpList);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
 
 
 #endif
diff --git a/src/lib/aqdiagram/data/floatingavg.h b/src/lib/aqdiagram/data/floatingavg.h
index ab61437..1b33190 100644
--- a/src/lib/aqdiagram/data/floatingavg.h
+++ b/src/lib/aqdiagram/data/floatingavg.h
@@ -13,10 +13,20 @@
 
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_GRAPH_DATAPAIR_LIST *AQDG_Data_FloatingAverage(const AQDG_GRAPH_DATAPAIR_LIST *dpList, int num);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
 
 
 #endif
diff --git a/src/lib/aqdiagram/draw/w_drawable.h b/src/lib/aqdiagram/draw/w_drawable.h
index 39c6bff..62cac5f 100644
--- a/src/lib/aqdiagram/draw/w_drawable.h
+++ b/src/lib/aqdiagram/draw/w_drawable.h
@@ -27,6 +27,13 @@ typedef int (*AQDG_WIDGET_DRAWABLE_DRAW_FN)(AQDG_OBJECT *object);
 #define AQDG_DRAWABLE_DEFAULT_VSPACING 4
 
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 /**
  * Sets virtual functions:
  * - AQDG_OBJECT_DRAWABLE_DRAW_FN (just fill background and lets children draw their content)
@@ -83,5 +90,11 @@ AQDG_API AQDG_OBJECT *AQDG_DrawableWidget_GetNextVisibleWidget(AQDG_OBJECT *o);
 AQDG_API void AQDG_DrawableWidget_UnhideAllChildren(AQDG_OBJECT *o);
 
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif
 
diff --git a/src/lib/aqdiagram/draw/w_hlayout.h b/src/lib/aqdiagram/draw/w_hlayout.h
index 8f7c1a4..3c2acb3 100644
--- a/src/lib/aqdiagram/draw/w_hlayout.h
+++ b/src/lib/aqdiagram/draw/w_hlayout.h
@@ -15,9 +15,22 @@
 #include <aqdiagram/draw/context.h>
 
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_OBJECT *AQDG_HLayoutWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_DRAW_CONTEXT *drawContext);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 #endif
 
diff --git a/src/lib/aqdiagram/draw/w_label.h b/src/lib/aqdiagram/draw/w_label.h
index 4677319..022ff67 100644
--- a/src/lib/aqdiagram/draw/w_label.h
+++ b/src/lib/aqdiagram/draw/w_label.h
@@ -15,9 +15,22 @@
 #include <aqdiagram/draw/context.h>
 
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_OBJECT *AQDG_LabelWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_DRAW_CONTEXT *drawContext, const char *text);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 #endif
 
diff --git a/src/lib/aqdiagram/draw/w_mlayout.h b/src/lib/aqdiagram/draw/w_mlayout.h
index 08d04b4..29592bc 100644
--- a/src/lib/aqdiagram/draw/w_mlayout.h
+++ b/src/lib/aqdiagram/draw/w_mlayout.h
@@ -15,6 +15,13 @@
 #include <aqdiagram/draw/context.h>
 
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_OBJECT *AQDG_MatrixLayoutWidgetByRows_new(AQDG_OBJECT *parent, uint32_t options,
                                                         AQDG_DRAW_CONTEXT *drawContext,
                                                         int columns);
@@ -25,5 +32,11 @@ AQDG_API AQDG_OBJECT *AQDG_MatrixLayoutWidgetByColumns_new(AQDG_OBJECT *parent,
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 #endif
 
diff --git a/src/lib/aqdiagram/draw/w_vlayout.h b/src/lib/aqdiagram/draw/w_vlayout.h
index eee5711..708d022 100644
--- a/src/lib/aqdiagram/draw/w_vlayout.h
+++ b/src/lib/aqdiagram/draw/w_vlayout.h
@@ -15,9 +15,22 @@
 #include <aqdiagram/draw/context.h>
 
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_OBJECT *AQDG_VLayoutWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_DRAW_CONTEXT *drawContext);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 #endif
 
diff --git a/src/lib/aqdiagram/graph/graph.h b/src/lib/aqdiagram/graph/graph.h
index 2af98ec..c7c7c94 100644
--- a/src/lib/aqdiagram/graph/graph.h
+++ b/src/lib/aqdiagram/graph/graph.h
@@ -47,6 +47,11 @@ typedef struct AQDG_GRAPH AQDG_GRAPH;
 #include "aqdiagram/draw/context.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 
 AQDG_API AQDG_GRAPH *AQDG_Graph_new(void);
 AQDG_API void AQDG_Graph_free(AQDG_GRAPH *g);
@@ -72,6 +77,11 @@ AQDG_API void AQDG_Graph_SetDrawContext(AQDG_GRAPH *g, AQDG_DRAW_CONTEXT *dc);
 AQDG_API void AQDG_Graph_CalcMinMaxValues(AQDG_GRAPH *g);
 
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 
diff --git a/src/lib/aqdiagram/graph/timegraph.h b/src/lib/aqdiagram/graph/timegraph.h
index 5a93fb4..1f26336 100644
--- a/src/lib/aqdiagram/graph/timegraph.h
+++ b/src/lib/aqdiagram/graph/timegraph.h
@@ -17,6 +17,10 @@
 #define AQDG_TIMEGRAPH_SETUPTICKS_FLAGS_MAXY 0x02
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 AQDG_API AQDG_GRAPH *AQDG_TimeGraph_new(const char *sTitle,
                                         const char *sSubTitle,
@@ -47,6 +51,10 @@ AQDG_API void AQDG_TimeGraph_ModifyDataAndAddCurve(AQDG_GRAPH *g,
                                                    AQDG_GRAPH_DATAPAIR_LIST *dpList);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 
 #endif
 
diff --git a/src/lib/aqdiagram/graph/w_axis.h b/src/lib/aqdiagram/graph/w_axis.h
index 66a9790..f06a569 100644
--- a/src/lib/aqdiagram/graph/w_axis.h
+++ b/src/lib/aqdiagram/graph/w_axis.h
@@ -12,6 +12,13 @@
 #include <aqdiagram/graph/w_graph.h>
 
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_OBJECT *AQDG_AxisWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_OBJECT *graphObject, int axisIndex);
 
 AQDG_API AQDG_OBJECT *AQDG_AxisWidget_GetGraphObject(const AQDG_OBJECT *o);
@@ -33,6 +40,11 @@ AQDG_API void AQDG_AxisWidget_UnhideAllChildren(AQDG_OBJECT *o);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 
 #endif
 
diff --git a/src/lib/aqdiagram/graph/w_graph.h b/src/lib/aqdiagram/graph/w_graph.h
index 783fa4b..71bbb0d 100644
--- a/src/lib/aqdiagram/graph/w_graph.h
+++ b/src/lib/aqdiagram/graph/w_graph.h
@@ -82,6 +82,11 @@ enum {
 
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 
 AQDG_API AQDG_OBJECT *AQDG_GraphWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_DRAW_CONTEXT *drawContext);
 AQDG_API void AQDG_GraphWidget_FinishWithGraph(AQDG_OBJECT *o, AQDG_GRAPH *graph);
@@ -117,5 +122,11 @@ AQDG_API AQDG_OBJECT *AQDG_GraphWidget_GenerateTimeGraph(const char *sTitle,
 AQDG_API void AQDG_GraphWidget_AddCurve(AQDG_OBJECT *o);
 
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif
 
diff --git a/src/lib/aqdiagram/graph/w_legend.h b/src/lib/aqdiagram/graph/w_legend.h
index ad14d87..873c7ee 100644
--- a/src/lib/aqdiagram/graph/w_legend.h
+++ b/src/lib/aqdiagram/graph/w_legend.h
@@ -13,9 +13,21 @@
 
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_OBJECT *AQDG_LegendWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_OBJECT *graphWidget);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 #endif
 
diff --git a/src/lib/aqdiagram/graph/w_viewport.h b/src/lib/aqdiagram/graph/w_viewport.h
index 53ad39e..8b87712 100644
--- a/src/lib/aqdiagram/graph/w_viewport.h
+++ b/src/lib/aqdiagram/graph/w_viewport.h
@@ -12,9 +12,22 @@
 #include <aqdiagram/graph/w_graph.h>
 
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_OBJECT *AQDG_ViewportWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_OBJECT *graphObject);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 #endif
 
diff --git a/src/lib/aqdiagram/graph/w_xaxis.h b/src/lib/aqdiagram/graph/w_xaxis.h
index 6c4fea8..7d5c361 100644
--- a/src/lib/aqdiagram/graph/w_xaxis.h
+++ b/src/lib/aqdiagram/graph/w_xaxis.h
@@ -12,9 +12,22 @@
 #include <aqdiagram/graph/w_graph.h>
 
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_OBJECT *AQDG_XAxisWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_OBJECT *graphObject, int axisIndex);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 #endif
 
diff --git a/src/lib/aqdiagram/graph/w_yaxis.h b/src/lib/aqdiagram/graph/w_yaxis.h
index 04c55a1..caa36d1 100644
--- a/src/lib/aqdiagram/graph/w_yaxis.h
+++ b/src/lib/aqdiagram/graph/w_yaxis.h
@@ -12,9 +12,22 @@
 #include <aqdiagram/graph/w_graph.h>
 
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 AQDG_API AQDG_OBJECT *AQDG_YAxisWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_OBJECT *graphObject, int axisIndex);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
+
 #endif