diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index e3d7a8ae17a..45b2bf5ea35 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -32,7 +32,7 @@ set (app_utils_SOURCES
   gnc-quotes.cpp
   gnc-state.c
   gnc-ui-util.cpp
-  gnc-ui-balances.c
+  gnc-ui-balances.cpp
   )
 
 set_source_files_properties (${app_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
diff --git a/libgnucash/app-utils/gnc-ui-balances.c b/libgnucash/app-utils/gnc-ui-balances.cpp
similarity index 99%
rename from libgnucash/app-utils/gnc-ui-balances.c
rename to libgnucash/app-utils/gnc-ui-balances.cpp
index a93c5d557aa..45b33633502 100644
--- a/libgnucash/app-utils/gnc-ui-balances.c
+++ b/libgnucash/app-utils/gnc-ui-balances.cpp
@@ -212,7 +212,7 @@ account_get_balance_as_of_date (Account *account,
             gnc_commodity *child_currency;
             gnc_numeric child_balance;
 
-            child = node->data;
+            child = static_cast<Account*>(node->data);
             child_currency = xaccAccountGetCommodity (child);
             child_balance = fn (child, date);
             child_balance =
diff --git a/libgnucash/app-utils/gnc-ui-balances.h b/libgnucash/app-utils/gnc-ui-balances.h
index b80c6262754..376ce8817f2 100644
--- a/libgnucash/app-utils/gnc-ui-balances.h
+++ b/libgnucash/app-utils/gnc-ui-balances.h
@@ -34,6 +34,10 @@
 #include "gncOwner.h"
 #include "qof.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /********************************************************************
  * Balance calculations related to accounts
  ********************************************************************/
@@ -197,4 +201,8 @@ gchar * gnc_ui_account_get_balance_limit_icon_name (const Account *account);
  */
 gchar * gnc_ui_account_get_balance_limit_explanation (const Account *account);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GNC_UI_BALANCES_H_ */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0f1930a5936..94fbc6f70a8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -543,7 +543,7 @@ libgnucash/app-utils/gnc-prefs-utils.c
 libgnucash/app-utils/gnc-quotes.cpp
 libgnucash/app-utils/gnc-state.c
 libgnucash/app-utils/gnc-sx-instance-model.c
-libgnucash/app-utils/gnc-ui-balances.c
+libgnucash/app-utils/gnc-ui-balances.cpp
 libgnucash/app-utils/gnc-ui-util.cpp
 libgnucash/app-utils/QuickFill.c
 libgnucash/backend/dbi/gnc-backend-dbi.cpp