1 files changed, 5 insertions, 4 deletions
diff --git a/pb_common.h b/pb_common.h
index 01a37682..60b3d374 100644
--- a/pb_common.h
+++ b/pb_common.h
@@ -2,8 +2,8 @@
  * These functions are rarely needed by applications directly.
  */
 
-#ifndef _PB_COMMON_H_
-#define _PB_COMMON_H_
+#ifndef PB_COMMON_H_INCLUDED
+#define PB_COMMON_H_INCLUDED
 
 #include "pb.h"
 
@@ -12,14 +12,15 @@ extern "C" {
 #endif
 
 /* Iterator for pb_field_t list */
-typedef struct {
+struct pb_field_iter_s {
     const pb_field_t *start;       /* Start of the pb_field_t array */
     const pb_field_t *pos;         /* Current position of the iterator */
     unsigned required_field_index; /* Zero-based index that counts only the required fields */
     void *dest_struct;             /* Pointer to start of the structure */
     void *pData;                   /* Pointer to current field value */
     void *pSize;                   /* Pointer to count/has field */
-} pb_field_iter_t;
+};
+typedef struct pb_field_iter_s pb_field_iter_t;
 
 /* Initialize the field iterator structure to beginning.
  * Returns false if the message type is empty. */