diff --git a/slre.c b/slre.c
index b28e632..c47cfb6 100644
--- a/slre.c
+++ b/slre.c
@@ -290,7 +290,11 @@ static int bar(const char *re, int re_len, const char *s, int s_len,
 
 /* Process branch points */
 static int doh(const char *s, int s_len, struct regex_info *info, int bi) {
-  const struct bracket_pair *b = &info->brackets[bi];
+  const struct
+# ifdef __cplusplus 
+  regex_info::
+# endif
+  bracket_pair *b = &info->brackets[bi];
   int i = 0, len, result;
   const char *p;
 
@@ -309,7 +313,11 @@ static int doh(const char *s, int s_len, struct regex_info *info, int bi) {
 
 static void setup_branch_points(struct regex_info *info) {
   int i, j;
-  struct branch tmp;
+  struct
+# ifdef __cplusplus 
+  regex_info::
+# endif
+  branch tmp;
 
   /* First, sort branches. Must be stable, no qsort. Use bubble algo. */
   for (i = 0; i < info->num_branches; i++) {