Does something like this look sane to you?
diff --git a/src/ppc32/ucontext_i.h b/src/ppc32/ucontext_i.h
index 0fd60d9..5a7c01d 100644
--- a/src/ppc32/ucontext_i.h
+++ b/src/ppc32/ucontext_i.h
@@ -26,6 +26,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. */
#ifndef ucontext_i_h
#define ucontext_i_h
+#include "libunwind_i.h"
#include <ucontext.h>
/* These values were derived by reading
diff --git a/src/ptrace/_UPT_reg_offset.c b/src/ptrace/_UPT_reg_offset.c
index 82a0900..cb590bd 100644
--- a/src/ptrace/_UPT_reg_offset.c
+++ b/src/ptrace/_UPT_reg_offset.c
@@ -419,8 +419,8 @@ int _UPT_reg_offset[UNW_REG_LAST + 1] =
UNW_FP_OFF(b, 31)
#define UNW_PPC32_REGS \
- [UNW_PPC##b##_FPSCR] = UNW_PPC_PT(FPSCR), \
- [UNW_PPC##b##_CCR] = UNW_PPC_PT(CCR)
+ [UNW_PPC32_FPSCR] = UNW_PPC_PT(FPSCR), \
+ [UNW_PPC32_CCR] = UNW_PPC_PT(CCR)