pbf_parser 0.1.0 → 0.2.0

data/ext/pbf_parser/osmformat.pb-c.c

@@ -1,528 +1,529 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: osmformat.proto */
 
 /* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C_NO_DEPRECATED
-#define PROTOBUF_C_NO_DEPRECATED
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
 #endif
 
 #include "osmformat.pb-c.h"
-void   header_block__init
-                     (HeaderBlock         *message)
+void   osmpbf__header_block__init
+                     (OSMPBF__HeaderBlock         *message)
 {
-  static HeaderBlock init_value = HEADER_BLOCK__INIT;
+  static OSMPBF__HeaderBlock init_value = OSMPBF__HEADER_BLOCK__INIT;
   *message = init_value;
 }
-size_t header_block__get_packed_size
-                     (const HeaderBlock *message)
+size_t osmpbf__header_block__get_packed_size
+                     (const OSMPBF__HeaderBlock *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &header_block__descriptor);
+  assert(message->base.descriptor == &osmpbf__header_block__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t header_block__pack
-                     (const HeaderBlock *message,
+size_t osmpbf__header_block__pack
+                     (const OSMPBF__HeaderBlock *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &header_block__descriptor);
+  assert(message->base.descriptor == &osmpbf__header_block__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t header_block__pack_to_buffer
-                     (const HeaderBlock *message,
+size_t osmpbf__header_block__pack_to_buffer
+                     (const OSMPBF__HeaderBlock *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &header_block__descriptor);
+  assert(message->base.descriptor == &osmpbf__header_block__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-HeaderBlock *
-       header_block__unpack
+OSMPBF__HeaderBlock *
+       osmpbf__header_block__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (HeaderBlock *)
-     protobuf_c_message_unpack (&header_block__descriptor,
+  return (OSMPBF__HeaderBlock *)
+     protobuf_c_message_unpack (&osmpbf__header_block__descriptor,
                                 allocator, len, data);
 }
-void   header_block__free_unpacked
-                     (HeaderBlock *message,
+void   osmpbf__header_block__free_unpacked
+                     (OSMPBF__HeaderBlock *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &header_block__descriptor);
+  assert(message->base.descriptor == &osmpbf__header_block__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   header_bbox__init
-                     (HeaderBBox         *message)
+void   osmpbf__header_bbox__init
+                     (OSMPBF__HeaderBBox         *message)
 {
-  static HeaderBBox init_value = HEADER_BBOX__INIT;
+  static OSMPBF__HeaderBBox init_value = OSMPBF__HEADER_BBOX__INIT;
   *message = init_value;
 }
-size_t header_bbox__get_packed_size
-                     (const HeaderBBox *message)
+size_t osmpbf__header_bbox__get_packed_size
+                     (const OSMPBF__HeaderBBox *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &header_bbox__descriptor);
+  assert(message->base.descriptor == &osmpbf__header_bbox__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t header_bbox__pack
-                     (const HeaderBBox *message,
+size_t osmpbf__header_bbox__pack
+                     (const OSMPBF__HeaderBBox *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &header_bbox__descriptor);
+  assert(message->base.descriptor == &osmpbf__header_bbox__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t header_bbox__pack_to_buffer
-                     (const HeaderBBox *message,
+size_t osmpbf__header_bbox__pack_to_buffer
+                     (const OSMPBF__HeaderBBox *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &header_bbox__descriptor);
+  assert(message->base.descriptor == &osmpbf__header_bbox__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-HeaderBBox *
-       header_bbox__unpack
+OSMPBF__HeaderBBox *
+       osmpbf__header_bbox__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (HeaderBBox *)
-     protobuf_c_message_unpack (&header_bbox__descriptor,
+  return (OSMPBF__HeaderBBox *)
+     protobuf_c_message_unpack (&osmpbf__header_bbox__descriptor,
                                 allocator, len, data);
 }
-void   header_bbox__free_unpacked
-                     (HeaderBBox *message,
+void   osmpbf__header_bbox__free_unpacked
+                     (OSMPBF__HeaderBBox *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &header_bbox__descriptor);
+  assert(message->base.descriptor == &osmpbf__header_bbox__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   primitive_block__init
-                     (PrimitiveBlock         *message)
+void   osmpbf__primitive_block__init
+                     (OSMPBF__PrimitiveBlock         *message)
 {
-  static PrimitiveBlock init_value = PRIMITIVE_BLOCK__INIT;
+  static OSMPBF__PrimitiveBlock init_value = OSMPBF__PRIMITIVE_BLOCK__INIT;
   *message = init_value;
 }
-size_t primitive_block__get_packed_size
-                     (const PrimitiveBlock *message)
+size_t osmpbf__primitive_block__get_packed_size
+                     (const OSMPBF__PrimitiveBlock *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &primitive_block__descriptor);
+  assert(message->base.descriptor == &osmpbf__primitive_block__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t primitive_block__pack
-                     (const PrimitiveBlock *message,
+size_t osmpbf__primitive_block__pack
+                     (const OSMPBF__PrimitiveBlock *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &primitive_block__descriptor);
+  assert(message->base.descriptor == &osmpbf__primitive_block__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t primitive_block__pack_to_buffer
-                     (const PrimitiveBlock *message,
+size_t osmpbf__primitive_block__pack_to_buffer
+                     (const OSMPBF__PrimitiveBlock *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &primitive_block__descriptor);
+  assert(message->base.descriptor == &osmpbf__primitive_block__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-PrimitiveBlock *
-       primitive_block__unpack
+OSMPBF__PrimitiveBlock *
+       osmpbf__primitive_block__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (PrimitiveBlock *)
-     protobuf_c_message_unpack (&primitive_block__descriptor,
+  return (OSMPBF__PrimitiveBlock *)
+     protobuf_c_message_unpack (&osmpbf__primitive_block__descriptor,
                                 allocator, len, data);
 }
-void   primitive_block__free_unpacked
-                     (PrimitiveBlock *message,
+void   osmpbf__primitive_block__free_unpacked
+                     (OSMPBF__PrimitiveBlock *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &primitive_block__descriptor);
+  assert(message->base.descriptor == &osmpbf__primitive_block__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   primitive_group__init
-                     (PrimitiveGroup         *message)
+void   osmpbf__primitive_group__init
+                     (OSMPBF__PrimitiveGroup         *message)
 {
-  static PrimitiveGroup init_value = PRIMITIVE_GROUP__INIT;
+  static OSMPBF__PrimitiveGroup init_value = OSMPBF__PRIMITIVE_GROUP__INIT;
   *message = init_value;
 }
-size_t primitive_group__get_packed_size
-                     (const PrimitiveGroup *message)
+size_t osmpbf__primitive_group__get_packed_size
+                     (const OSMPBF__PrimitiveGroup *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &primitive_group__descriptor);
+  assert(message->base.descriptor == &osmpbf__primitive_group__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t primitive_group__pack
-                     (const PrimitiveGroup *message,
+size_t osmpbf__primitive_group__pack
+                     (const OSMPBF__PrimitiveGroup *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &primitive_group__descriptor);
+  assert(message->base.descriptor == &osmpbf__primitive_group__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t primitive_group__pack_to_buffer
-                     (const PrimitiveGroup *message,
+size_t osmpbf__primitive_group__pack_to_buffer
+                     (const OSMPBF__PrimitiveGroup *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &primitive_group__descriptor);
+  assert(message->base.descriptor == &osmpbf__primitive_group__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-PrimitiveGroup *
-       primitive_group__unpack
+OSMPBF__PrimitiveGroup *
+       osmpbf__primitive_group__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (PrimitiveGroup *)
-     protobuf_c_message_unpack (&primitive_group__descriptor,
+  return (OSMPBF__PrimitiveGroup *)
+     protobuf_c_message_unpack (&osmpbf__primitive_group__descriptor,
                                 allocator, len, data);
 }
-void   primitive_group__free_unpacked
-                     (PrimitiveGroup *message,
+void   osmpbf__primitive_group__free_unpacked
+                     (OSMPBF__PrimitiveGroup *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &primitive_group__descriptor);
+  assert(message->base.descriptor == &osmpbf__primitive_group__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   string_table__init
-                     (StringTable         *message)
+void   osmpbf__string_table__init
+                     (OSMPBF__StringTable         *message)
 {
-  static StringTable init_value = STRING_TABLE__INIT;
+  static OSMPBF__StringTable init_value = OSMPBF__STRING_TABLE__INIT;
   *message = init_value;
 }
-size_t string_table__get_packed_size
-                     (const StringTable *message)
+size_t osmpbf__string_table__get_packed_size
+                     (const OSMPBF__StringTable *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &string_table__descriptor);
+  assert(message->base.descriptor == &osmpbf__string_table__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t string_table__pack
-                     (const StringTable *message,
+size_t osmpbf__string_table__pack
+                     (const OSMPBF__StringTable *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &string_table__descriptor);
+  assert(message->base.descriptor == &osmpbf__string_table__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t string_table__pack_to_buffer
-                     (const StringTable *message,
+size_t osmpbf__string_table__pack_to_buffer
+                     (const OSMPBF__StringTable *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &string_table__descriptor);
+  assert(message->base.descriptor == &osmpbf__string_table__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-StringTable *
-       string_table__unpack
+OSMPBF__StringTable *
+       osmpbf__string_table__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (StringTable *)
-     protobuf_c_message_unpack (&string_table__descriptor,
+  return (OSMPBF__StringTable *)
+     protobuf_c_message_unpack (&osmpbf__string_table__descriptor,
                                 allocator, len, data);
 }
-void   string_table__free_unpacked
-                     (StringTable *message,
+void   osmpbf__string_table__free_unpacked
+                     (OSMPBF__StringTable *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &string_table__descriptor);
+  assert(message->base.descriptor == &osmpbf__string_table__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   info__init
-                     (Info         *message)
+void   osmpbf__info__init
+                     (OSMPBF__Info         *message)
 {
-  static Info init_value = INFO__INIT;
+  static OSMPBF__Info init_value = OSMPBF__INFO__INIT;
   *message = init_value;
 }
-size_t info__get_packed_size
-                     (const Info *message)
+size_t osmpbf__info__get_packed_size
+                     (const OSMPBF__Info *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &info__descriptor);
+  assert(message->base.descriptor == &osmpbf__info__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t info__pack
-                     (const Info *message,
+size_t osmpbf__info__pack
+                     (const OSMPBF__Info *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &info__descriptor);
+  assert(message->base.descriptor == &osmpbf__info__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t info__pack_to_buffer
-                     (const Info *message,
+size_t osmpbf__info__pack_to_buffer
+                     (const OSMPBF__Info *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &info__descriptor);
+  assert(message->base.descriptor == &osmpbf__info__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-Info *
-       info__unpack
+OSMPBF__Info *
+       osmpbf__info__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (Info *)
-     protobuf_c_message_unpack (&info__descriptor,
+  return (OSMPBF__Info *)
+     protobuf_c_message_unpack (&osmpbf__info__descriptor,
                                 allocator, len, data);
 }
-void   info__free_unpacked
-                     (Info *message,
+void   osmpbf__info__free_unpacked
+                     (OSMPBF__Info *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &info__descriptor);
+  assert(message->base.descriptor == &osmpbf__info__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   dense_info__init
-                     (DenseInfo         *message)
+void   osmpbf__dense_info__init
+                     (OSMPBF__DenseInfo         *message)
 {
-  static DenseInfo init_value = DENSE_INFO__INIT;
+  static OSMPBF__DenseInfo init_value = OSMPBF__DENSE_INFO__INIT;
   *message = init_value;
 }
-size_t dense_info__get_packed_size
-                     (const DenseInfo *message)
+size_t osmpbf__dense_info__get_packed_size
+                     (const OSMPBF__DenseInfo *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &dense_info__descriptor);
+  assert(message->base.descriptor == &osmpbf__dense_info__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t dense_info__pack
-                     (const DenseInfo *message,
+size_t osmpbf__dense_info__pack
+                     (const OSMPBF__DenseInfo *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &dense_info__descriptor);
+  assert(message->base.descriptor == &osmpbf__dense_info__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t dense_info__pack_to_buffer
-                     (const DenseInfo *message,
+size_t osmpbf__dense_info__pack_to_buffer
+                     (const OSMPBF__DenseInfo *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &dense_info__descriptor);
+  assert(message->base.descriptor == &osmpbf__dense_info__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-DenseInfo *
-       dense_info__unpack
+OSMPBF__DenseInfo *
+       osmpbf__dense_info__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (DenseInfo *)
-     protobuf_c_message_unpack (&dense_info__descriptor,
+  return (OSMPBF__DenseInfo *)
+     protobuf_c_message_unpack (&osmpbf__dense_info__descriptor,
                                 allocator, len, data);
 }
-void   dense_info__free_unpacked
-                     (DenseInfo *message,
+void   osmpbf__dense_info__free_unpacked
+                     (OSMPBF__DenseInfo *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &dense_info__descriptor);
+  assert(message->base.descriptor == &osmpbf__dense_info__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   change_set__init
-                     (ChangeSet         *message)
+void   osmpbf__change_set__init
+                     (OSMPBF__ChangeSet         *message)
 {
-  static ChangeSet init_value = CHANGE_SET__INIT;
+  static OSMPBF__ChangeSet init_value = OSMPBF__CHANGE_SET__INIT;
   *message = init_value;
 }
-size_t change_set__get_packed_size
-                     (const ChangeSet *message)
+size_t osmpbf__change_set__get_packed_size
+                     (const OSMPBF__ChangeSet *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &change_set__descriptor);
+  assert(message->base.descriptor == &osmpbf__change_set__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t change_set__pack
-                     (const ChangeSet *message,
+size_t osmpbf__change_set__pack
+                     (const OSMPBF__ChangeSet *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &change_set__descriptor);
+  assert(message->base.descriptor == &osmpbf__change_set__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t change_set__pack_to_buffer
-                     (const ChangeSet *message,
+size_t osmpbf__change_set__pack_to_buffer
+                     (const OSMPBF__ChangeSet *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &change_set__descriptor);
+  assert(message->base.descriptor == &osmpbf__change_set__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-ChangeSet *
-       change_set__unpack
+OSMPBF__ChangeSet *
+       osmpbf__change_set__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (ChangeSet *)
-     protobuf_c_message_unpack (&change_set__descriptor,
+  return (OSMPBF__ChangeSet *)
+     protobuf_c_message_unpack (&osmpbf__change_set__descriptor,
                                 allocator, len, data);
 }
-void   change_set__free_unpacked
-                     (ChangeSet *message,
+void   osmpbf__change_set__free_unpacked
+                     (OSMPBF__ChangeSet *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &change_set__descriptor);
+  assert(message->base.descriptor == &osmpbf__change_set__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   node__init
-                     (Node         *message)
+void   osmpbf__node__init
+                     (OSMPBF__Node         *message)
 {
-  static Node init_value = NODE__INIT;
+  static OSMPBF__Node init_value = OSMPBF__NODE__INIT;
   *message = init_value;
 }
-size_t node__get_packed_size
-                     (const Node *message)
+size_t osmpbf__node__get_packed_size
+                     (const OSMPBF__Node *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &node__descriptor);
+  assert(message->base.descriptor == &osmpbf__node__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t node__pack
-                     (const Node *message,
+size_t osmpbf__node__pack
+                     (const OSMPBF__Node *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &node__descriptor);
+  assert(message->base.descriptor == &osmpbf__node__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t node__pack_to_buffer
-                     (const Node *message,
+size_t osmpbf__node__pack_to_buffer
+                     (const OSMPBF__Node *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &node__descriptor);
+  assert(message->base.descriptor == &osmpbf__node__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-Node *
-       node__unpack
+OSMPBF__Node *
+       osmpbf__node__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (Node *)
-     protobuf_c_message_unpack (&node__descriptor,
+  return (OSMPBF__Node *)
+     protobuf_c_message_unpack (&osmpbf__node__descriptor,
                                 allocator, len, data);
 }
-void   node__free_unpacked
-                     (Node *message,
+void   osmpbf__node__free_unpacked
+                     (OSMPBF__Node *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &node__descriptor);
+  assert(message->base.descriptor == &osmpbf__node__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   dense_nodes__init
-                     (DenseNodes         *message)
+void   osmpbf__dense_nodes__init
+                     (OSMPBF__DenseNodes         *message)
 {
-  static DenseNodes init_value = DENSE_NODES__INIT;
+  static OSMPBF__DenseNodes init_value = OSMPBF__DENSE_NODES__INIT;
   *message = init_value;
 }
-size_t dense_nodes__get_packed_size
-                     (const DenseNodes *message)
+size_t osmpbf__dense_nodes__get_packed_size
+                     (const OSMPBF__DenseNodes *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &dense_nodes__descriptor);
+  assert(message->base.descriptor == &osmpbf__dense_nodes__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t dense_nodes__pack
-                     (const DenseNodes *message,
+size_t osmpbf__dense_nodes__pack
+                     (const OSMPBF__DenseNodes *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &dense_nodes__descriptor);
+  assert(message->base.descriptor == &osmpbf__dense_nodes__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t dense_nodes__pack_to_buffer
-                     (const DenseNodes *message,
+size_t osmpbf__dense_nodes__pack_to_buffer
+                     (const OSMPBF__DenseNodes *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &dense_nodes__descriptor);
+  assert(message->base.descriptor == &osmpbf__dense_nodes__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-DenseNodes *
-       dense_nodes__unpack
+OSMPBF__DenseNodes *
+       osmpbf__dense_nodes__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (DenseNodes *)
-     protobuf_c_message_unpack (&dense_nodes__descriptor,
+  return (OSMPBF__DenseNodes *)
+     protobuf_c_message_unpack (&osmpbf__dense_nodes__descriptor,
                                 allocator, len, data);
 }
-void   dense_nodes__free_unpacked
-                     (DenseNodes *message,
+void   osmpbf__dense_nodes__free_unpacked
+                     (OSMPBF__DenseNodes *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &dense_nodes__descriptor);
+  assert(message->base.descriptor == &osmpbf__dense_nodes__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   way__init
-                     (Way         *message)
+void   osmpbf__way__init
+                     (OSMPBF__Way         *message)
 {
-  static Way init_value = WAY__INIT;
+  static OSMPBF__Way init_value = OSMPBF__WAY__INIT;
   *message = init_value;
 }
-size_t way__get_packed_size
-                     (const Way *message)
+size_t osmpbf__way__get_packed_size
+                     (const OSMPBF__Way *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &way__descriptor);
+  assert(message->base.descriptor == &osmpbf__way__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t way__pack
-                     (const Way *message,
+size_t osmpbf__way__pack
+                     (const OSMPBF__Way *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &way__descriptor);
+  assert(message->base.descriptor == &osmpbf__way__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t way__pack_to_buffer
-                     (const Way *message,
+size_t osmpbf__way__pack_to_buffer
+                     (const OSMPBF__Way *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &way__descriptor);
+  assert(message->base.descriptor == &osmpbf__way__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-Way *
-       way__unpack
+OSMPBF__Way *
+       osmpbf__way__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (Way *)
-     protobuf_c_message_unpack (&way__descriptor,
+  return (OSMPBF__Way *)
+     protobuf_c_message_unpack (&osmpbf__way__descriptor,
                                 allocator, len, data);
 }
-void   way__free_unpacked
-                     (Way *message,
+void   osmpbf__way__free_unpacked
+                     (OSMPBF__Way *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &way__descriptor);
+  assert(message->base.descriptor == &osmpbf__way__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   relation__init
-                     (Relation         *message)
+void   osmpbf__relation__init
+                     (OSMPBF__Relation         *message)
 {
-  static Relation init_value = RELATION__INIT;
+  static OSMPBF__Relation init_value = OSMPBF__RELATION__INIT;
   *message = init_value;
 }
-size_t relation__get_packed_size
-                     (const Relation *message)
+size_t osmpbf__relation__get_packed_size
+                     (const OSMPBF__Relation *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &relation__descriptor);
+  assert(message->base.descriptor == &osmpbf__relation__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t relation__pack
-                     (const Relation *message,
+size_t osmpbf__relation__pack
+                     (const OSMPBF__Relation *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &relation__descriptor);
+  assert(message->base.descriptor == &osmpbf__relation__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t relation__pack_to_buffer
-                     (const Relation *message,
+size_t osmpbf__relation__pack_to_buffer
+                     (const OSMPBF__Relation *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &relation__descriptor);
+  assert(message->base.descriptor == &osmpbf__relation__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-Relation *
-       relation__unpack
+OSMPBF__Relation *
+       osmpbf__relation__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (Relation *)
-     protobuf_c_message_unpack (&relation__descriptor,
+  return (OSMPBF__Relation *)
+     protobuf_c_message_unpack (&osmpbf__relation__descriptor,
                                 allocator, len, data);
 }
-void   relation__free_unpacked
-                     (Relation *message,
+void   osmpbf__relation__free_unpacked
+                     (OSMPBF__Relation *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &relation__descriptor);
+  assert(message->base.descriptor == &osmpbf__relation__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor header_block__field_descriptors[8] =
+static const ProtobufCFieldDescriptor osmpbf__header_block__field_descriptors[8] =
 {
   {
     "bbox",
@@ -530,10 +531,10 @@ static const ProtobufCFieldDescriptor header_block__field_descriptors[8] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(HeaderBlock, bbox),
-    &header_bbox__descriptor,
+    offsetof(OSMPBF__HeaderBlock, bbox),
+    &osmpbf__header_bbox__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -541,11 +542,11 @@ static const ProtobufCFieldDescriptor header_block__field_descriptors[8] =
     4,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_STRING,
-    PROTOBUF_C_OFFSETOF(HeaderBlock, n_required_features),
-    PROTOBUF_C_OFFSETOF(HeaderBlock, required_features),
+    offsetof(OSMPBF__HeaderBlock, n_required_features),
+    offsetof(OSMPBF__HeaderBlock, required_features),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -553,11 +554,11 @@ static const ProtobufCFieldDescriptor header_block__field_descriptors[8] =
     5,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_STRING,
-    PROTOBUF_C_OFFSETOF(HeaderBlock, n_optional_features),
-    PROTOBUF_C_OFFSETOF(HeaderBlock, optional_features),
+    offsetof(OSMPBF__HeaderBlock, n_optional_features),
+    offsetof(OSMPBF__HeaderBlock, optional_features),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -566,10 +567,10 @@ static const ProtobufCFieldDescriptor header_block__field_descriptors[8] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(HeaderBlock, writingprogram),
+    offsetof(OSMPBF__HeaderBlock, writingprogram),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -578,10 +579,10 @@ static const ProtobufCFieldDescriptor header_block__field_descriptors[8] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(HeaderBlock, source),
+    offsetof(OSMPBF__HeaderBlock, source),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -589,11 +590,11 @@ static const ProtobufCFieldDescriptor header_block__field_descriptors[8] =
     32,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT64,
-    PROTOBUF_C_OFFSETOF(HeaderBlock, has_osmosis_replication_timestamp),
-    PROTOBUF_C_OFFSETOF(HeaderBlock, osmosis_replication_timestamp),
+    offsetof(OSMPBF__HeaderBlock, has_osmosis_replication_timestamp),
+    offsetof(OSMPBF__HeaderBlock, osmosis_replication_timestamp),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -601,11 +602,11 @@ static const ProtobufCFieldDescriptor header_block__field_descriptors[8] =
     33,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT64,
-    PROTOBUF_C_OFFSETOF(HeaderBlock, has_osmosis_replication_sequence_number),
-    PROTOBUF_C_OFFSETOF(HeaderBlock, osmosis_replication_sequence_number),
+    offsetof(OSMPBF__HeaderBlock, has_osmosis_replication_sequence_number),
+    offsetof(OSMPBF__HeaderBlock, osmosis_replication_sequence_number),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -614,14 +615,14 @@ static const ProtobufCFieldDescriptor header_block__field_descriptors[8] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(HeaderBlock, osmosis_replication_base_url),
+    offsetof(OSMPBF__HeaderBlock, osmosis_replication_base_url),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned header_block__field_indices_by_name[] = {
+static const unsigned osmpbf__header_block__field_indices_by_name[] = {
   0,   /* field[0] = bbox */
   2,   /* field[2] = optional_features */
   7,   /* field[7] = osmosis_replication_base_url */
@@ -631,7 +632,7 @@ static const unsigned header_block__field_indices_by_name[] = {
   4,   /* field[4] = source */
   3,   /* field[3] = writingprogram */
 };
-static const ProtobufCIntRange header_block__number_ranges[4 + 1] =
+static const ProtobufCIntRange osmpbf__header_block__number_ranges[4 + 1] =
 {
   { 1, 0 },
   { 4, 1 },
@@ -639,22 +640,22 @@ static const ProtobufCIntRange header_block__number_ranges[4 + 1] =
   { 32, 5 },
   { 0, 8 }
 };
-const ProtobufCMessageDescriptor header_block__descriptor =
+const ProtobufCMessageDescriptor osmpbf__header_block__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.HeaderBlock",
   "HeaderBlock",
-  "HeaderBlock",
-  "HeaderBlock",
-  "",
-  sizeof(HeaderBlock),
+  "OSMPBF__HeaderBlock",
+  "OSMPBF",
+  sizeof(OSMPBF__HeaderBlock),
   8,
-  header_block__field_descriptors,
-  header_block__field_indices_by_name,
-  4,  header_block__number_ranges,
-  (ProtobufCMessageInit) header_block__init,
+  osmpbf__header_block__field_descriptors,
+  osmpbf__header_block__field_indices_by_name,
+  4,  osmpbf__header_block__number_ranges,
+  (ProtobufCMessageInit) osmpbf__header_block__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor header_bbox__field_descriptors[4] =
+static const ProtobufCFieldDescriptor osmpbf__header_bbox__field_descriptors[4] =
 {
   {
     "left",
@@ -662,10 +663,10 @@ static const ProtobufCFieldDescriptor header_bbox__field_descriptors[4] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_SINT64,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(HeaderBBox, left),
+    offsetof(OSMPBF__HeaderBBox, left),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -674,10 +675,10 @@ static const ProtobufCFieldDescriptor header_bbox__field_descriptors[4] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_SINT64,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(HeaderBBox, right),
+    offsetof(OSMPBF__HeaderBBox, right),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -686,10 +687,10 @@ static const ProtobufCFieldDescriptor header_bbox__field_descriptors[4] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_SINT64,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(HeaderBBox, top),
+    offsetof(OSMPBF__HeaderBBox, top),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -698,44 +699,44 @@ static const ProtobufCFieldDescriptor header_bbox__field_descriptors[4] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_SINT64,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(HeaderBBox, bottom),
+    offsetof(OSMPBF__HeaderBBox, bottom),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned header_bbox__field_indices_by_name[] = {
+static const unsigned osmpbf__header_bbox__field_indices_by_name[] = {
   3,   /* field[3] = bottom */
   0,   /* field[0] = left */
   1,   /* field[1] = right */
   2,   /* field[2] = top */
 };
-static const ProtobufCIntRange header_bbox__number_ranges[1 + 1] =
+static const ProtobufCIntRange osmpbf__header_bbox__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 4 }
 };
-const ProtobufCMessageDescriptor header_bbox__descriptor =
+const ProtobufCMessageDescriptor osmpbf__header_bbox__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "HeaderBBox",
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.HeaderBBox",
   "HeaderBBox",
-  "HeaderBBox",
-  "",
-  sizeof(HeaderBBox),
+  "OSMPBF__HeaderBBox",
+  "OSMPBF",
+  sizeof(OSMPBF__HeaderBBox),
   4,
-  header_bbox__field_descriptors,
-  header_bbox__field_indices_by_name,
-  1,  header_bbox__number_ranges,
-  (ProtobufCMessageInit) header_bbox__init,
+  osmpbf__header_bbox__field_descriptors,
+  osmpbf__header_bbox__field_indices_by_name,
+  1,  osmpbf__header_bbox__number_ranges,
+  (ProtobufCMessageInit) osmpbf__header_bbox__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const int32_t primitive_block__granularity__default_value = 100;
-static const int64_t primitive_block__lat_offset__default_value = 0;
-static const int64_t primitive_block__lon_offset__default_value = 0;
-static const int32_t primitive_block__date_granularity__default_value = 1000;
-static const ProtobufCFieldDescriptor primitive_block__field_descriptors[6] =
+static const int32_t osmpbf__primitive_block__granularity__default_value = 100;
+static const int64_t osmpbf__primitive_block__lat_offset__default_value = 0ll;
+static const int64_t osmpbf__primitive_block__lon_offset__default_value = 0ll;
+static const int32_t osmpbf__primitive_block__date_granularity__default_value = 1000;
+static const ProtobufCFieldDescriptor osmpbf__primitive_block__field_descriptors[6] =
 {
   {
     "stringtable",
@@ -743,10 +744,10 @@ static const ProtobufCFieldDescriptor primitive_block__field_descriptors[6] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, stringtable),
-    &string_table__descriptor,
+    offsetof(OSMPBF__PrimitiveBlock, stringtable),
+    &osmpbf__string_table__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -754,11 +755,11 @@ static const ProtobufCFieldDescriptor primitive_block__field_descriptors[6] =
     2,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, n_primitivegroup),
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, primitivegroup),
-    &primitive_group__descriptor,
+    offsetof(OSMPBF__PrimitiveBlock, n_primitivegroup),
+    offsetof(OSMPBF__PrimitiveBlock, primitivegroup),
+    &osmpbf__primitive_group__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -766,11 +767,11 @@ static const ProtobufCFieldDescriptor primitive_block__field_descriptors[6] =
     17,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, has_granularity),
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, granularity),
+    offsetof(OSMPBF__PrimitiveBlock, has_granularity),
+    offsetof(OSMPBF__PrimitiveBlock, granularity),
     NULL,
-    &primitive_block__granularity__default_value,
-    0,            /* packed */
+    &osmpbf__primitive_block__granularity__default_value,
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -778,11 +779,11 @@ static const ProtobufCFieldDescriptor primitive_block__field_descriptors[6] =
     18,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, has_date_granularity),
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, date_granularity),
+    offsetof(OSMPBF__PrimitiveBlock, has_date_granularity),
+    offsetof(OSMPBF__PrimitiveBlock, date_granularity),
     NULL,
-    &primitive_block__date_granularity__default_value,
-    0,            /* packed */
+    &osmpbf__primitive_block__date_granularity__default_value,
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -790,11 +791,11 @@ static const ProtobufCFieldDescriptor primitive_block__field_descriptors[6] =
     19,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT64,
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, has_lat_offset),
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, lat_offset),
+    offsetof(OSMPBF__PrimitiveBlock, has_lat_offset),
+    offsetof(OSMPBF__PrimitiveBlock, lat_offset),
     NULL,
-    &primitive_block__lat_offset__default_value,
-    0,            /* packed */
+    &osmpbf__primitive_block__lat_offset__default_value,
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -802,15 +803,15 @@ static const ProtobufCFieldDescriptor primitive_block__field_descriptors[6] =
     20,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT64,
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, has_lon_offset),
-    PROTOBUF_C_OFFSETOF(PrimitiveBlock, lon_offset),
+    offsetof(OSMPBF__PrimitiveBlock, has_lon_offset),
+    offsetof(OSMPBF__PrimitiveBlock, lon_offset),
     NULL,
-    &primitive_block__lon_offset__default_value,
-    0,            /* packed */
+    &osmpbf__primitive_block__lon_offset__default_value,
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned primitive_block__field_indices_by_name[] = {
+static const unsigned osmpbf__primitive_block__field_indices_by_name[] = {
   3,   /* field[3] = date_granularity */
   2,   /* field[2] = granularity */
   4,   /* field[4] = lat_offset */
@@ -818,39 +819,39 @@ static const unsigned primitive_block__field_indices_by_name[] = {
   1,   /* field[1] = primitivegroup */
   0,   /* field[0] = stringtable */
 };
-static const ProtobufCIntRange primitive_block__number_ranges[2 + 1] =
+static const ProtobufCIntRange osmpbf__primitive_block__number_ranges[2 + 1] =
 {
   { 1, 0 },
   { 17, 2 },
   { 0, 6 }
 };
-const ProtobufCMessageDescriptor primitive_block__descriptor =
+const ProtobufCMessageDescriptor osmpbf__primitive_block__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "PrimitiveBlock",
-  "PrimitiveBlock",
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.PrimitiveBlock",
   "PrimitiveBlock",
-  "",
-  sizeof(PrimitiveBlock),
+  "OSMPBF__PrimitiveBlock",
+  "OSMPBF",
+  sizeof(OSMPBF__PrimitiveBlock),
   6,
-  primitive_block__field_descriptors,
-  primitive_block__field_indices_by_name,
-  2,  primitive_block__number_ranges,
-  (ProtobufCMessageInit) primitive_block__init,
+  osmpbf__primitive_block__field_descriptors,
+  osmpbf__primitive_block__field_indices_by_name,
+  2,  osmpbf__primitive_block__number_ranges,
+  (ProtobufCMessageInit) osmpbf__primitive_block__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor primitive_group__field_descriptors[5] =
+static const ProtobufCFieldDescriptor osmpbf__primitive_group__field_descriptors[5] =
 {
   {
     "nodes",
     1,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
-    PROTOBUF_C_OFFSETOF(PrimitiveGroup, n_nodes),
-    PROTOBUF_C_OFFSETOF(PrimitiveGroup, nodes),
-    &node__descriptor,
+    offsetof(OSMPBF__PrimitiveGroup, n_nodes),
+    offsetof(OSMPBF__PrimitiveGroup, nodes),
+    &osmpbf__node__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -859,10 +860,10 @@ static const ProtobufCFieldDescriptor primitive_group__field_descriptors[5] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(PrimitiveGroup, dense),
-    &dense_nodes__descriptor,
+    offsetof(OSMPBF__PrimitiveGroup, dense),
+    &osmpbf__dense_nodes__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -870,11 +871,11 @@ static const ProtobufCFieldDescriptor primitive_group__field_descriptors[5] =
     3,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
-    PROTOBUF_C_OFFSETOF(PrimitiveGroup, n_ways),
-    PROTOBUF_C_OFFSETOF(PrimitiveGroup, ways),
-    &way__descriptor,
+    offsetof(OSMPBF__PrimitiveGroup, n_ways),
+    offsetof(OSMPBF__PrimitiveGroup, ways),
+    &osmpbf__way__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -882,11 +883,11 @@ static const ProtobufCFieldDescriptor primitive_group__field_descriptors[5] =
     4,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
-    PROTOBUF_C_OFFSETOF(PrimitiveGroup, n_relations),
-    PROTOBUF_C_OFFSETOF(PrimitiveGroup, relations),
-    &relation__descriptor,
+    offsetof(OSMPBF__PrimitiveGroup, n_relations),
+    offsetof(OSMPBF__PrimitiveGroup, relations),
+    &osmpbf__relation__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -894,92 +895,92 @@ static const ProtobufCFieldDescriptor primitive_group__field_descriptors[5] =
     5,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
-    PROTOBUF_C_OFFSETOF(PrimitiveGroup, n_changesets),
-    PROTOBUF_C_OFFSETOF(PrimitiveGroup, changesets),
-    &change_set__descriptor,
+    offsetof(OSMPBF__PrimitiveGroup, n_changesets),
+    offsetof(OSMPBF__PrimitiveGroup, changesets),
+    &osmpbf__change_set__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned primitive_group__field_indices_by_name[] = {
+static const unsigned osmpbf__primitive_group__field_indices_by_name[] = {
   4,   /* field[4] = changesets */
   1,   /* field[1] = dense */
   0,   /* field[0] = nodes */
   3,   /* field[3] = relations */
   2,   /* field[2] = ways */
 };
-static const ProtobufCIntRange primitive_group__number_ranges[1 + 1] =
+static const ProtobufCIntRange osmpbf__primitive_group__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 5 }
 };
-const ProtobufCMessageDescriptor primitive_group__descriptor =
+const ProtobufCMessageDescriptor osmpbf__primitive_group__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.PrimitiveGroup",
   "PrimitiveGroup",
-  "PrimitiveGroup",
-  "PrimitiveGroup",
-  "",
-  sizeof(PrimitiveGroup),
+  "OSMPBF__PrimitiveGroup",
+  "OSMPBF",
+  sizeof(OSMPBF__PrimitiveGroup),
   5,
-  primitive_group__field_descriptors,
-  primitive_group__field_indices_by_name,
-  1,  primitive_group__number_ranges,
-  (ProtobufCMessageInit) primitive_group__init,
+  osmpbf__primitive_group__field_descriptors,
+  osmpbf__primitive_group__field_indices_by_name,
+  1,  osmpbf__primitive_group__number_ranges,
+  (ProtobufCMessageInit) osmpbf__primitive_group__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor string_table__field_descriptors[1] =
+static const ProtobufCFieldDescriptor osmpbf__string_table__field_descriptors[1] =
 {
   {
     "s",
     1,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_BYTES,
-    PROTOBUF_C_OFFSETOF(StringTable, n_s),
-    PROTOBUF_C_OFFSETOF(StringTable, s),
+    offsetof(OSMPBF__StringTable, n_s),
+    offsetof(OSMPBF__StringTable, s),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned string_table__field_indices_by_name[] = {
+static const unsigned osmpbf__string_table__field_indices_by_name[] = {
   0,   /* field[0] = s */
 };
-static const ProtobufCIntRange string_table__number_ranges[1 + 1] =
+static const ProtobufCIntRange osmpbf__string_table__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 1 }
 };
-const ProtobufCMessageDescriptor string_table__descriptor =
+const ProtobufCMessageDescriptor osmpbf__string_table__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "StringTable",
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.StringTable",
   "StringTable",
-  "StringTable",
-  "",
-  sizeof(StringTable),
+  "OSMPBF__StringTable",
+  "OSMPBF",
+  sizeof(OSMPBF__StringTable),
   1,
-  string_table__field_descriptors,
-  string_table__field_indices_by_name,
-  1,  string_table__number_ranges,
-  (ProtobufCMessageInit) string_table__init,
+  osmpbf__string_table__field_descriptors,
+  osmpbf__string_table__field_indices_by_name,
+  1,  osmpbf__string_table__number_ranges,
+  (ProtobufCMessageInit) osmpbf__string_table__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const int32_t info__version__default_value = -1;
-static const ProtobufCFieldDescriptor info__field_descriptors[6] =
+static const int32_t osmpbf__info__version__default_value = -1;
+static const ProtobufCFieldDescriptor osmpbf__info__field_descriptors[6] =
 {
   {
     "version",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(Info, has_version),
-    PROTOBUF_C_OFFSETOF(Info, version),
+    offsetof(OSMPBF__Info, has_version),
+    offsetof(OSMPBF__Info, version),
     NULL,
-    &info__version__default_value,
-    0,            /* packed */
+    &osmpbf__info__version__default_value,
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -987,11 +988,11 @@ static const ProtobufCFieldDescriptor info__field_descriptors[6] =
     2,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT64,
-    PROTOBUF_C_OFFSETOF(Info, has_timestamp),
-    PROTOBUF_C_OFFSETOF(Info, timestamp),
+    offsetof(OSMPBF__Info, has_timestamp),
+    offsetof(OSMPBF__Info, timestamp),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -999,11 +1000,11 @@ static const ProtobufCFieldDescriptor info__field_descriptors[6] =
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT64,
-    PROTOBUF_C_OFFSETOF(Info, has_changeset),
-    PROTOBUF_C_OFFSETOF(Info, changeset),
+    offsetof(OSMPBF__Info, has_changeset),
+    offsetof(OSMPBF__Info, changeset),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1011,11 +1012,11 @@ static const ProtobufCFieldDescriptor info__field_descriptors[6] =
     4,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(Info, has_uid),
-    PROTOBUF_C_OFFSETOF(Info, uid),
+    offsetof(OSMPBF__Info, has_uid),
+    offsetof(OSMPBF__Info, uid),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1023,11 +1024,11 @@ static const ProtobufCFieldDescriptor info__field_descriptors[6] =
     5,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    PROTOBUF_C_OFFSETOF(Info, has_user_sid),
-    PROTOBUF_C_OFFSETOF(Info, user_sid),
+    offsetof(OSMPBF__Info, has_user_sid),
+    offsetof(OSMPBF__Info, user_sid),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1035,15 +1036,15 @@ static const ProtobufCFieldDescriptor info__field_descriptors[6] =
     6,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
-    PROTOBUF_C_OFFSETOF(Info, has_visible),
-    PROTOBUF_C_OFFSETOF(Info, visible),
+    offsetof(OSMPBF__Info, has_visible),
+    offsetof(OSMPBF__Info, visible),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned info__field_indices_by_name[] = {
+static const unsigned osmpbf__info__field_indices_by_name[] = {
   2,   /* field[2] = changeset */
   1,   /* field[1] = timestamp */
   3,   /* field[3] = uid */
@@ -1051,38 +1052,38 @@ static const unsigned info__field_indices_by_name[] = {
   0,   /* field[0] = version */
   5,   /* field[5] = visible */
 };
-static const ProtobufCIntRange info__number_ranges[1 + 1] =
+static const ProtobufCIntRange osmpbf__info__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 6 }
 };
-const ProtobufCMessageDescriptor info__descriptor =
+const ProtobufCMessageDescriptor osmpbf__info__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "Info",
-  "Info",
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.Info",
   "Info",
-  "",
-  sizeof(Info),
+  "OSMPBF__Info",
+  "OSMPBF",
+  sizeof(OSMPBF__Info),
   6,
-  info__field_descriptors,
-  info__field_indices_by_name,
-  1,  info__number_ranges,
-  (ProtobufCMessageInit) info__init,
+  osmpbf__info__field_descriptors,
+  osmpbf__info__field_indices_by_name,
+  1,  osmpbf__info__number_ranges,
+  (ProtobufCMessageInit) osmpbf__info__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor dense_info__field_descriptors[6] =
+static const ProtobufCFieldDescriptor osmpbf__dense_info__field_descriptors[6] =
 {
   {
     "version",
     1,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(DenseInfo, n_version),
-    PROTOBUF_C_OFFSETOF(DenseInfo, version),
+    offsetof(OSMPBF__DenseInfo, n_version),
+    offsetof(OSMPBF__DenseInfo, version),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1090,11 +1091,11 @@ static const ProtobufCFieldDescriptor dense_info__field_descriptors[6] =
     2,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_SINT64,
-    PROTOBUF_C_OFFSETOF(DenseInfo, n_timestamp),
-    PROTOBUF_C_OFFSETOF(DenseInfo, timestamp),
+    offsetof(OSMPBF__DenseInfo, n_timestamp),
+    offsetof(OSMPBF__DenseInfo, timestamp),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1102,11 +1103,11 @@ static const ProtobufCFieldDescriptor dense_info__field_descriptors[6] =
     3,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_SINT64,
-    PROTOBUF_C_OFFSETOF(DenseInfo, n_changeset),
-    PROTOBUF_C_OFFSETOF(DenseInfo, changeset),
+    offsetof(OSMPBF__DenseInfo, n_changeset),
+    offsetof(OSMPBF__DenseInfo, changeset),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1114,11 +1115,11 @@ static const ProtobufCFieldDescriptor dense_info__field_descriptors[6] =
     4,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_SINT32,
-    PROTOBUF_C_OFFSETOF(DenseInfo, n_uid),
-    PROTOBUF_C_OFFSETOF(DenseInfo, uid),
+    offsetof(OSMPBF__DenseInfo, n_uid),
+    offsetof(OSMPBF__DenseInfo, uid),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1126,11 +1127,11 @@ static const ProtobufCFieldDescriptor dense_info__field_descriptors[6] =
     5,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_SINT32,
-    PROTOBUF_C_OFFSETOF(DenseInfo, n_user_sid),
-    PROTOBUF_C_OFFSETOF(DenseInfo, user_sid),
+    offsetof(OSMPBF__DenseInfo, n_user_sid),
+    offsetof(OSMPBF__DenseInfo, user_sid),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1138,15 +1139,15 @@ static const ProtobufCFieldDescriptor dense_info__field_descriptors[6] =
     6,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_BOOL,
-    PROTOBUF_C_OFFSETOF(DenseInfo, n_visible),
-    PROTOBUF_C_OFFSETOF(DenseInfo, visible),
+    offsetof(OSMPBF__DenseInfo, n_visible),
+    offsetof(OSMPBF__DenseInfo, visible),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned dense_info__field_indices_by_name[] = {
+static const unsigned osmpbf__dense_info__field_indices_by_name[] = {
   2,   /* field[2] = changeset */
   1,   /* field[1] = timestamp */
   3,   /* field[3] = uid */
@@ -1154,27 +1155,27 @@ static const unsigned dense_info__field_indices_by_name[] = {
   0,   /* field[0] = version */
   5,   /* field[5] = visible */
 };
-static const ProtobufCIntRange dense_info__number_ranges[1 + 1] =
+static const ProtobufCIntRange osmpbf__dense_info__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 6 }
 };
-const ProtobufCMessageDescriptor dense_info__descriptor =
+const ProtobufCMessageDescriptor osmpbf__dense_info__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.DenseInfo",
   "DenseInfo",
-  "DenseInfo",
-  "DenseInfo",
-  "",
-  sizeof(DenseInfo),
+  "OSMPBF__DenseInfo",
+  "OSMPBF",
+  sizeof(OSMPBF__DenseInfo),
   6,
-  dense_info__field_descriptors,
-  dense_info__field_indices_by_name,
-  1,  dense_info__number_ranges,
-  (ProtobufCMessageInit) dense_info__init,
+  osmpbf__dense_info__field_descriptors,
+  osmpbf__dense_info__field_indices_by_name,
+  1,  osmpbf__dense_info__number_ranges,
+  (ProtobufCMessageInit) osmpbf__dense_info__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor change_set__field_descriptors[1] =
+static const ProtobufCFieldDescriptor osmpbf__change_set__field_descriptors[1] =
 {
   {
     "id",
@@ -1182,37 +1183,37 @@ static const ProtobufCFieldDescriptor change_set__field_descriptors[1] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT64,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ChangeSet, id),
+    offsetof(OSMPBF__ChangeSet, id),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned change_set__field_indices_by_name[] = {
+static const unsigned osmpbf__change_set__field_indices_by_name[] = {
   0,   /* field[0] = id */
 };
-static const ProtobufCIntRange change_set__number_ranges[1 + 1] =
+static const ProtobufCIntRange osmpbf__change_set__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 1 }
 };
-const ProtobufCMessageDescriptor change_set__descriptor =
+const ProtobufCMessageDescriptor osmpbf__change_set__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "ChangeSet",
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.ChangeSet",
   "ChangeSet",
-  "ChangeSet",
-  "",
-  sizeof(ChangeSet),
+  "OSMPBF__ChangeSet",
+  "OSMPBF",
+  sizeof(OSMPBF__ChangeSet),
   1,
-  change_set__field_descriptors,
-  change_set__field_indices_by_name,
-  1,  change_set__number_ranges,
-  (ProtobufCMessageInit) change_set__init,
+  osmpbf__change_set__field_descriptors,
+  osmpbf__change_set__field_indices_by_name,
+  1,  osmpbf__change_set__number_ranges,
+  (ProtobufCMessageInit) osmpbf__change_set__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor node__field_descriptors[6] =
+static const ProtobufCFieldDescriptor osmpbf__node__field_descriptors[6] =
 {
   {
     "id",
@@ -1220,10 +1221,10 @@ static const ProtobufCFieldDescriptor node__field_descriptors[6] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_SINT64,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(Node, id),
+    offsetof(OSMPBF__Node, id),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1231,11 +1232,11 @@ static const ProtobufCFieldDescriptor node__field_descriptors[6] =
     2,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_UINT32,
-    PROTOBUF_C_OFFSETOF(Node, n_keys),
-    PROTOBUF_C_OFFSETOF(Node, keys),
+    offsetof(OSMPBF__Node, n_keys),
+    offsetof(OSMPBF__Node, keys),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1243,11 +1244,11 @@ static const ProtobufCFieldDescriptor node__field_descriptors[6] =
     3,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_UINT32,
-    PROTOBUF_C_OFFSETOF(Node, n_vals),
-    PROTOBUF_C_OFFSETOF(Node, vals),
+    offsetof(OSMPBF__Node, n_vals),
+    offsetof(OSMPBF__Node, vals),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1256,10 +1257,10 @@ static const ProtobufCFieldDescriptor node__field_descriptors[6] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(Node, info),
-    &info__descriptor,
+    offsetof(OSMPBF__Node, info),
+    &osmpbf__info__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1268,10 +1269,10 @@ static const ProtobufCFieldDescriptor node__field_descriptors[6] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_SINT64,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(Node, lat),
+    offsetof(OSMPBF__Node, lat),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1280,14 +1281,14 @@ static const ProtobufCFieldDescriptor node__field_descriptors[6] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_SINT64,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(Node, lon),
+    offsetof(OSMPBF__Node, lon),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned node__field_indices_by_name[] = {
+static const unsigned osmpbf__node__field_indices_by_name[] = {
   0,   /* field[0] = id */
   3,   /* field[3] = info */
   1,   /* field[1] = keys */
@@ -1295,39 +1296,39 @@ static const unsigned node__field_indices_by_name[] = {
   5,   /* field[5] = lon */
   2,   /* field[2] = vals */
 };
-static const ProtobufCIntRange node__number_ranges[2 + 1] =
+static const ProtobufCIntRange osmpbf__node__number_ranges[2 + 1] =
 {
   { 1, 0 },
   { 8, 4 },
   { 0, 6 }
 };
-const ProtobufCMessageDescriptor node__descriptor =
+const ProtobufCMessageDescriptor osmpbf__node__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "Node",
-  "Node",
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.Node",
   "Node",
-  "",
-  sizeof(Node),
+  "OSMPBF__Node",
+  "OSMPBF",
+  sizeof(OSMPBF__Node),
   6,
-  node__field_descriptors,
-  node__field_indices_by_name,
-  2,  node__number_ranges,
-  (ProtobufCMessageInit) node__init,
+  osmpbf__node__field_descriptors,
+  osmpbf__node__field_indices_by_name,
+  2,  osmpbf__node__number_ranges,
+  (ProtobufCMessageInit) osmpbf__node__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor dense_nodes__field_descriptors[5] =
+static const ProtobufCFieldDescriptor osmpbf__dense_nodes__field_descriptors[5] =
 {
   {
     "id",
     1,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_SINT64,
-    PROTOBUF_C_OFFSETOF(DenseNodes, n_id),
-    PROTOBUF_C_OFFSETOF(DenseNodes, id),
+    offsetof(OSMPBF__DenseNodes, n_id),
+    offsetof(OSMPBF__DenseNodes, id),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1336,10 +1337,10 @@ static const ProtobufCFieldDescriptor dense_nodes__field_descriptors[5] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(DenseNodes, denseinfo),
-    &dense_info__descriptor,
+    offsetof(OSMPBF__DenseNodes, denseinfo),
+    &osmpbf__dense_info__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1347,11 +1348,11 @@ static const ProtobufCFieldDescriptor dense_nodes__field_descriptors[5] =
     8,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_SINT64,
-    PROTOBUF_C_OFFSETOF(DenseNodes, n_lat),
-    PROTOBUF_C_OFFSETOF(DenseNodes, lat),
+    offsetof(OSMPBF__DenseNodes, n_lat),
+    offsetof(OSMPBF__DenseNodes, lat),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1359,11 +1360,11 @@ static const ProtobufCFieldDescriptor dense_nodes__field_descriptors[5] =
     9,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_SINT64,
-    PROTOBUF_C_OFFSETOF(DenseNodes, n_lon),
-    PROTOBUF_C_OFFSETOF(DenseNodes, lon),
+    offsetof(OSMPBF__DenseNodes, n_lon),
+    offsetof(OSMPBF__DenseNodes, lon),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1371,44 +1372,44 @@ static const ProtobufCFieldDescriptor dense_nodes__field_descriptors[5] =
     10,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(DenseNodes, n_keys_vals),
-    PROTOBUF_C_OFFSETOF(DenseNodes, keys_vals),
+    offsetof(OSMPBF__DenseNodes, n_keys_vals),
+    offsetof(OSMPBF__DenseNodes, keys_vals),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned dense_nodes__field_indices_by_name[] = {
+static const unsigned osmpbf__dense_nodes__field_indices_by_name[] = {
   1,   /* field[1] = denseinfo */
   0,   /* field[0] = id */
   4,   /* field[4] = keys_vals */
   2,   /* field[2] = lat */
   3,   /* field[3] = lon */
 };
-static const ProtobufCIntRange dense_nodes__number_ranges[3 + 1] =
+static const ProtobufCIntRange osmpbf__dense_nodes__number_ranges[3 + 1] =
 {
   { 1, 0 },
   { 5, 1 },
   { 8, 2 },
   { 0, 5 }
 };
-const ProtobufCMessageDescriptor dense_nodes__descriptor =
+const ProtobufCMessageDescriptor osmpbf__dense_nodes__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.DenseNodes",
   "DenseNodes",
-  "DenseNodes",
-  "DenseNodes",
-  "",
-  sizeof(DenseNodes),
+  "OSMPBF__DenseNodes",
+  "OSMPBF",
+  sizeof(OSMPBF__DenseNodes),
   5,
-  dense_nodes__field_descriptors,
-  dense_nodes__field_indices_by_name,
-  3,  dense_nodes__number_ranges,
-  (ProtobufCMessageInit) dense_nodes__init,
+  osmpbf__dense_nodes__field_descriptors,
+  osmpbf__dense_nodes__field_indices_by_name,
+  3,  osmpbf__dense_nodes__number_ranges,
+  (ProtobufCMessageInit) osmpbf__dense_nodes__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor way__field_descriptors[5] =
+static const ProtobufCFieldDescriptor osmpbf__way__field_descriptors[5] =
 {
   {
     "id",
@@ -1416,10 +1417,10 @@ static const ProtobufCFieldDescriptor way__field_descriptors[5] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT64,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(Way, id),
+    offsetof(OSMPBF__Way, id),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1427,11 +1428,11 @@ static const ProtobufCFieldDescriptor way__field_descriptors[5] =
     2,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_UINT32,
-    PROTOBUF_C_OFFSETOF(Way, n_keys),
-    PROTOBUF_C_OFFSETOF(Way, keys),
+    offsetof(OSMPBF__Way, n_keys),
+    offsetof(OSMPBF__Way, keys),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1439,11 +1440,11 @@ static const ProtobufCFieldDescriptor way__field_descriptors[5] =
     3,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_UINT32,
-    PROTOBUF_C_OFFSETOF(Way, n_vals),
-    PROTOBUF_C_OFFSETOF(Way, vals),
+    offsetof(OSMPBF__Way, n_vals),
+    offsetof(OSMPBF__Way, vals),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1452,10 +1453,10 @@ static const ProtobufCFieldDescriptor way__field_descriptors[5] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(Way, info),
-    &info__descriptor,
+    offsetof(OSMPBF__Way, info),
+    &osmpbf__info__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1463,73 +1464,73 @@ static const ProtobufCFieldDescriptor way__field_descriptors[5] =
     8,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_SINT64,
-    PROTOBUF_C_OFFSETOF(Way, n_refs),
-    PROTOBUF_C_OFFSETOF(Way, refs),
+    offsetof(OSMPBF__Way, n_refs),
+    offsetof(OSMPBF__Way, refs),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned way__field_indices_by_name[] = {
+static const unsigned osmpbf__way__field_indices_by_name[] = {
   0,   /* field[0] = id */
   3,   /* field[3] = info */
   1,   /* field[1] = keys */
   4,   /* field[4] = refs */
   2,   /* field[2] = vals */
 };
-static const ProtobufCIntRange way__number_ranges[2 + 1] =
+static const ProtobufCIntRange osmpbf__way__number_ranges[2 + 1] =
 {
   { 1, 0 },
   { 8, 4 },
   { 0, 5 }
 };
-const ProtobufCMessageDescriptor way__descriptor =
+const ProtobufCMessageDescriptor osmpbf__way__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "Way",
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.Way",
   "Way",
-  "Way",
-  "",
-  sizeof(Way),
+  "OSMPBF__Way",
+  "OSMPBF",
+  sizeof(OSMPBF__Way),
   5,
-  way__field_descriptors,
-  way__field_indices_by_name,
-  2,  way__number_ranges,
-  (ProtobufCMessageInit) way__init,
+  osmpbf__way__field_descriptors,
+  osmpbf__way__field_indices_by_name,
+  2,  osmpbf__way__number_ranges,
+  (ProtobufCMessageInit) osmpbf__way__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-const ProtobufCEnumValue relation__member_type__enum_values_by_number[3] =
+const ProtobufCEnumValue osmpbf__relation__member_type__enum_values_by_number[3] =
 {
-  { "NODE", "RELATION__MEMBER_TYPE__NODE", 0 },
-  { "WAY", "RELATION__MEMBER_TYPE__WAY", 1 },
-  { "RELATION", "RELATION__MEMBER_TYPE__RELATION", 2 },
+  { "NODE", "OSMPBF__RELATION__MEMBER_TYPE__NODE", 0 },
+  { "WAY", "OSMPBF__RELATION__MEMBER_TYPE__WAY", 1 },
+  { "RELATION", "OSMPBF__RELATION__MEMBER_TYPE__RELATION", 2 },
 };
-static const ProtobufCIntRange relation__member_type__value_ranges[] = {
+static const ProtobufCIntRange osmpbf__relation__member_type__value_ranges[] = {
 {0, 0},{0, 3}
 };
-const ProtobufCEnumValueIndex relation__member_type__enum_values_by_name[3] =
+const ProtobufCEnumValueIndex osmpbf__relation__member_type__enum_values_by_name[3] =
 {
   { "NODE", 0 },
   { "RELATION", 2 },
   { "WAY", 1 },
 };
-const ProtobufCEnumDescriptor relation__member_type__descriptor =
+const ProtobufCEnumDescriptor osmpbf__relation__member_type__descriptor =
 {
-  PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC,
-  "Relation.MemberType",
+  PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC,
+  "OSMPBF.Relation.MemberType",
   "MemberType",
-  "Relation__MemberType",
-  "",
+  "OSMPBF__Relation__MemberType",
+  "OSMPBF",
   3,
-  relation__member_type__enum_values_by_number,
+  osmpbf__relation__member_type__enum_values_by_number,
   3,
-  relation__member_type__enum_values_by_name,
+  osmpbf__relation__member_type__enum_values_by_name,
   1,
-  relation__member_type__value_ranges,
+  osmpbf__relation__member_type__value_ranges,
   NULL,NULL,NULL,NULL   /* reserved[1234] */
 };
-static const ProtobufCFieldDescriptor relation__field_descriptors[7] =
+static const ProtobufCFieldDescriptor osmpbf__relation__field_descriptors[7] =
 {
   {
     "id",
@@ -1537,10 +1538,10 @@ static const ProtobufCFieldDescriptor relation__field_descriptors[7] =
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT64,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(Relation, id),
+    offsetof(OSMPBF__Relation, id),
     NULL,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1548,11 +1549,11 @@ static const ProtobufCFieldDescriptor relation__field_descriptors[7] =
     2,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_UINT32,
-    PROTOBUF_C_OFFSETOF(Relation, n_keys),
-    PROTOBUF_C_OFFSETOF(Relation, keys),
+    offsetof(OSMPBF__Relation, n_keys),
+    offsetof(OSMPBF__Relation, keys),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1560,11 +1561,11 @@ static const ProtobufCFieldDescriptor relation__field_descriptors[7] =
     3,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_UINT32,
-    PROTOBUF_C_OFFSETOF(Relation, n_vals),
-    PROTOBUF_C_OFFSETOF(Relation, vals),
+    offsetof(OSMPBF__Relation, n_vals),
+    offsetof(OSMPBF__Relation, vals),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1573,10 +1574,10 @@ static const ProtobufCFieldDescriptor relation__field_descriptors[7] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(Relation, info),
-    &info__descriptor,
+    offsetof(OSMPBF__Relation, info),
+    &osmpbf__info__descriptor,
     NULL,
-    0,            /* packed */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1584,11 +1585,11 @@ static const ProtobufCFieldDescriptor relation__field_descriptors[7] =
     8,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(Relation, n_roles_sid),
-    PROTOBUF_C_OFFSETOF(Relation, roles_sid),
+    offsetof(OSMPBF__Relation, n_roles_sid),
+    offsetof(OSMPBF__Relation, roles_sid),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1596,11 +1597,11 @@ static const ProtobufCFieldDescriptor relation__field_descriptors[7] =
     9,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_SINT64,
-    PROTOBUF_C_OFFSETOF(Relation, n_memids),
-    PROTOBUF_C_OFFSETOF(Relation, memids),
+    offsetof(OSMPBF__Relation, n_memids),
+    offsetof(OSMPBF__Relation, memids),
     NULL,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
@@ -1608,15 +1609,15 @@ static const ProtobufCFieldDescriptor relation__field_descriptors[7] =
     10,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_ENUM,
-    PROTOBUF_C_OFFSETOF(Relation, n_types),
-    PROTOBUF_C_OFFSETOF(Relation, types),
-    &relation__member_type__descriptor,
+    offsetof(OSMPBF__Relation, n_types),
+    offsetof(OSMPBF__Relation, types),
+    &osmpbf__relation__member_type__descriptor,
     NULL,
-    1,            /* packed */
+    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned relation__field_indices_by_name[] = {
+static const unsigned osmpbf__relation__field_indices_by_name[] = {
   0,   /* field[0] = id */
   3,   /* field[3] = info */
   1,   /* field[1] = keys */
@@ -1625,24 +1626,24 @@ static const unsigned relation__field_indices_by_name[] = {
   6,   /* field[6] = types */
   2,   /* field[2] = vals */
 };
-static const ProtobufCIntRange relation__number_ranges[2 + 1] =
+static const ProtobufCIntRange osmpbf__relation__number_ranges[2 + 1] =
 {
   { 1, 0 },
   { 8, 4 },
   { 0, 7 }
 };
-const ProtobufCMessageDescriptor relation__descriptor =
+const ProtobufCMessageDescriptor osmpbf__relation__descriptor =
 {
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "Relation",
-  "Relation",
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "OSMPBF.Relation",
   "Relation",
-  "",
-  sizeof(Relation),
+  "OSMPBF__Relation",
+  "OSMPBF",
+  sizeof(OSMPBF__Relation),
   7,
-  relation__field_descriptors,
-  relation__field_indices_by_name,
-  2,  relation__number_ranges,
-  (ProtobufCMessageInit) relation__init,
+  osmpbf__relation__field_descriptors,
+  osmpbf__relation__field_indices_by_name,
+  2,  osmpbf__relation__number_ranges,
+  (ProtobufCMessageInit) osmpbf__relation__init,
   NULL,NULL,NULL    /* reserved[123] */
 };