remove the ; after DBUS_(BEGIN|END)_DECLS (bug #974)

36 files changed, 72 insertions, 72 deletions

diff --git a/dbus/dbus-auth-script.h b/dbus/dbus-auth-script.h
index 7d1d34ae..1c7c5c70 100644
--- a/dbus/dbus-auth-script.h
+++ b/dbus/dbus-auth-script.h
@@ -30,10 +30,10 @@
 #include <dbus/dbus-types.h>
 #include <dbus/dbus-string.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 dbus_bool_t _dbus_auth_script_run (const DBusString *filename);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_AUTH_SCRIPT_H */
diff --git a/dbus/dbus-auth.h b/dbus/dbus-auth.h
index 1951df07..715f6d17 100644
--- a/dbus/dbus-auth.h
+++ b/dbus/dbus-auth.h
@@ -28,7 +28,7 @@
 #include <dbus/dbus-string.h>
 #include <dbus/dbus-sysdeps.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusAuth DBusAuth;
 
@@ -76,6 +76,6 @@ dbus_bool_t   _dbus_auth_set_context         (DBusAuth               *auth,
                                               const DBusString       *context);
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_AUTH_H */
diff --git a/dbus/dbus-bus.h b/dbus/dbus-bus.h
index 5f40b7e2..a17d724f 100644
--- a/dbus/dbus-bus.h
+++ b/dbus/dbus-bus.h
@@ -29,7 +29,7 @@
 
 #include <dbus/dbus-connection.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 DBusConnection *dbus_bus_get              (DBusBusType     type,
 					   DBusError      *error);
@@ -62,6 +62,6 @@ void            dbus_bus_remove_match     (DBusConnection *connection,
                                            const char     *rule,
                                            DBusError      *error);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_BUS_H */
diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h
index b8b8fc6d..38e54a94 100644
--- a/dbus/dbus-connection-internal.h
+++ b/dbus/dbus-connection-internal.h
@@ -32,7 +32,7 @@
 #include <dbus/dbus-timeout.h>
 #include <dbus/dbus-dataslot.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef enum
 {
@@ -123,6 +123,6 @@ struct DBusPendingCall
 /** @} End of DBusPendingCallInternals */
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_CONNECTION_INTERNAL_H */
diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h
index 090f0ad8..79606ecf 100644
--- a/dbus/dbus-connection.h
+++ b/dbus/dbus-connection.h
@@ -32,7 +32,7 @@
 #include <dbus/dbus-message.h>
 #include <dbus/dbus-shared.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusWatch DBusWatch;
 typedef struct DBusTimeout DBusTimeout;
@@ -245,6 +245,6 @@ dbus_bool_t dbus_connection_list_registered        (DBusConnection
 dbus_bool_t dbus_connection_get_unix_fd            (DBusConnection              *connection,
                                                     int                         *fd);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_CONNECTION_H */
diff --git a/dbus/dbus-dataslot.h b/dbus/dbus-dataslot.h
index f90f5b31..034a6191 100644
--- a/dbus/dbus-dataslot.h
+++ b/dbus/dbus-dataslot.h
@@ -25,7 +25,7 @@
 
 #include <dbus/dbus-internals.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusDataSlotAllocator DBusDataSlotAllocator;
 typedef struct DBusDataSlotList DBusDataSlotList;
@@ -90,6 +90,6 @@ void*       _dbus_data_slot_list_get        (DBusDataSlotAllocator  *allocator,
 void        _dbus_data_slot_list_free       (DBusDataSlotList       *list);
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_DATASLOT_H */
diff --git a/dbus/dbus-errors.h b/dbus/dbus-errors.h
index cc9600ad..2438cb26 100644
--- a/dbus/dbus-errors.h
+++ b/dbus/dbus-errors.h
@@ -31,7 +31,7 @@
 #include <dbus/dbus-macros.h>
 #include <dbus/dbus-types.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusError DBusError;
 
@@ -67,6 +67,6 @@ dbus_bool_t dbus_error_has_name  (const DBusError *error,
                                   const char      *name);
 dbus_bool_t dbus_error_is_set    (const DBusError *error);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_ERROR_H */
diff --git a/dbus/dbus-hash.h b/dbus/dbus-hash.h
index 28d275a0..7db06f0c 100644
--- a/dbus/dbus-hash.h
+++ b/dbus/dbus-hash.h
@@ -27,7 +27,7 @@
 #include <dbus/dbus-memory.h>
 #include <dbus/dbus-types.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 /** Hash iterator object. The iterator is on the stack, but its real
  * fields are hidden privately.
@@ -127,6 +127,6 @@ void                  _dbus_hash_table_insert_string_preallocated (DBusHashTable
                                                                    void                 *value);
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_HASH_H */
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 512954d6..258c6462 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -35,7 +35,7 @@
 #include <dbus/dbus-sysdeps.h>
 #include <dbus/dbus-threads.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 void _dbus_warn               (const char *format,
                                ...) _DBUS_GNUC_PRINTF (1, 2);
@@ -269,6 +269,6 @@ _DBUS_DECLARE_GLOBAL_LOCK (system_users);
 
 dbus_bool_t _dbus_threads_init_debug (void);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_INTERNALS_H */
diff --git a/dbus/dbus-keyring.h b/dbus/dbus-keyring.h
index d353bf49..5df0f793 100644
--- a/dbus/dbus-keyring.h
+++ b/dbus/dbus-keyring.h
@@ -27,7 +27,7 @@
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-string.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusKeyring DBusKeyring;
 
@@ -45,6 +45,6 @@ dbus_bool_t  _dbus_keyring_get_hex_key      (DBusKeyring       *keyring,
                                              int                key_id,
                                              DBusString        *hex_key);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_KEYRING_H */
diff --git a/dbus/dbus-list.h b/dbus/dbus-list.h
index 50bd9e28..c1c43a65 100644
--- a/dbus/dbus-list.h
+++ b/dbus/dbus-list.h
@@ -28,7 +28,7 @@
 #include <dbus/dbus-memory.h>
 #include <dbus/dbus-types.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusList DBusList;
 
@@ -94,6 +94,6 @@ void _dbus_list_foreach (DBusList            **list,
 #define _dbus_list_get_next_link(list, link) ((link)->next == *(list) ? NULL : (link)->next)
 #define _dbus_list_get_prev_link(list, link) ((link) == *(list) ? NULL : (link)->prev)
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_LIST_H */
diff --git a/dbus/dbus-md5.h b/dbus/dbus-md5.h
index 6038705b..7d9b58d7 100644
--- a/dbus/dbus-md5.h
+++ b/dbus/dbus-md5.h
@@ -27,7 +27,7 @@
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-string.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusMD5Context DBusMD5Context;
 
@@ -49,6 +49,6 @@ dbus_bool_t _dbus_md5_final   (DBusMD5Context   *context,
 dbus_bool_t _dbus_md5_compute (const DBusString *data,
                                DBusString       *ascii_output);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_MD5_H */
diff --git a/dbus/dbus-memory.h b/dbus/dbus-memory.h
index 628ff9d8..9982d2f1 100644
--- a/dbus/dbus-memory.h
+++ b/dbus/dbus-memory.h
@@ -30,7 +30,7 @@
 #include <dbus/dbus-macros.h>
 #include <stddef.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 void* dbus_malloc        (size_t bytes);
 void* dbus_malloc0       (size_t bytes);
@@ -47,6 +47,6 @@ typedef void (* DBusFreeFunction) (void *memory);
 
 void dbus_shutdown (void);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_MEMORY_H */
diff --git a/dbus/dbus-mempool.h b/dbus/dbus-mempool.h
index 8bda2b13..2ff55fd2 100644
--- a/dbus/dbus-mempool.h
+++ b/dbus/dbus-mempool.h
@@ -28,7 +28,7 @@
 #include <dbus/dbus-memory.h>
 #include <dbus/dbus-types.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusMemPool DBusMemPool;
 
@@ -39,6 +39,6 @@ void*        _dbus_mem_pool_alloc   (DBusMemPool *pool);
 dbus_bool_t  _dbus_mem_pool_dealloc (DBusMemPool *pool,
                                      void        *element);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_MEMPOOL_H */
diff --git a/dbus/dbus-message-builder.h b/dbus/dbus-message-builder.h
index 67ff0aa3..cb2c594a 100644
--- a/dbus/dbus-message-builder.h
+++ b/dbus/dbus-message-builder.h
@@ -30,11 +30,11 @@
 #include <dbus/dbus-types.h>
 #include <dbus/dbus-string.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 dbus_bool_t _dbus_message_data_load (DBusString       *dest,
                                      const DBusString *filename);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_MESSAGE_BUILDER_H */
diff --git a/dbus/dbus-message-internal.h b/dbus/dbus-message-internal.h
index e045fb26..cd8f82ad 100644
--- a/dbus/dbus-message-internal.h
+++ b/dbus/dbus-message-internal.h
@@ -27,7 +27,7 @@
 #include <dbus/dbus-resources.h>
 #include <dbus/dbus-list.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusMessageLoader DBusMessageLoader;
 
@@ -69,6 +69,6 @@ void               _dbus_message_loader_set_max_message_size  (DBusMessageLoader
                                                                long                size);
 long               _dbus_message_loader_get_max_message_size  (DBusMessageLoader  *loader);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_MESSAGE_H */
diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h
index 4cd702d8..50ec22c1 100644
--- a/dbus/dbus-message.h
+++ b/dbus/dbus-message.h
@@ -34,7 +34,7 @@
 #include <dbus/dbus-errors.h>
 #include <stdarg.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusMessage DBusMessage;
 typedef struct DBusMessageIter DBusMessageIter;
@@ -296,6 +296,6 @@ void*       dbus_message_get_data           (DBusMessage      *message,
 
 int dbus_message_type_from_string (const char *type_str);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_MESSAGE_H */
diff --git a/dbus/dbus-object-tree.h b/dbus/dbus-object-tree.h
index 70c3ef9b..52d5bca1 100644
--- a/dbus/dbus-object-tree.h
+++ b/dbus/dbus-object-tree.h
@@ -25,7 +25,7 @@
 
 #include <dbus/dbus-connection.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusObjectTree DBusObjectTree;
 
@@ -47,6 +47,6 @@ void              _dbus_object_tree_free_all_unlocked     (DBusObjectTree
 dbus_bool_t _dbus_object_tree_list_registered_and_unlock (DBusObjectTree *tree,
                                                           const char    **parent_path,
                                                           char         ***child_entries);
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_OBJECT_TREE_H */
diff --git a/dbus/dbus-pending-call.h b/dbus/dbus-pending-call.h
index 075a1cf5..25ce8bad 100644
--- a/dbus/dbus-pending-call.h
+++ b/dbus/dbus-pending-call.h
@@ -31,7 +31,7 @@
 #include <dbus/dbus-types.h>
 #include <dbus/dbus-connection.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 DBusPendingCall* dbus_pending_call_ref       (DBusPendingCall               *pending);
 void         dbus_pending_call_unref         (DBusPendingCall               *pending);
@@ -53,6 +53,6 @@ dbus_bool_t dbus_pending_call_set_data           (DBusPendingCall  *pending,
 void*       dbus_pending_call_get_data           (DBusPendingCall  *pending,
                                                   dbus_int32_t      slot);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_PENDING_CALL_H */
diff --git a/dbus/dbus-resources.h b/dbus/dbus-resources.h
index 94c75b90..4f6652d8 100644
--- a/dbus/dbus-resources.h
+++ b/dbus/dbus-resources.h
@@ -27,7 +27,7 @@
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-connection.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusCounter DBusCounter;
 
@@ -47,6 +47,6 @@ void _dbus_counter_set_notify (DBusCounter               *counter,
                                void                      *user_data);
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_RESOURCES_H */
diff --git a/dbus/dbus-server-debug-pipe.h b/dbus/dbus-server-debug-pipe.h
index 564b7e47..6590fbd1 100644
--- a/dbus/dbus-server-debug-pipe.h
+++ b/dbus/dbus-server-debug-pipe.h
@@ -28,13 +28,13 @@
 #include <dbus/dbus-server-protected.h>
 #include <dbus/dbus-transport.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 DBusServer*    _dbus_server_debug_pipe_new    (const char *server_name,
                                                DBusError  *error);
 DBusTransport* _dbus_transport_debug_pipe_new (const char *server_name,
                                                DBusError  *error);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_SERVER_DEBUG_PIPE_H */
diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h
index fcfb194b..bce29ca8 100644
--- a/dbus/dbus-server-protected.h
+++ b/dbus/dbus-server-protected.h
@@ -30,7 +30,7 @@
 #include <dbus/dbus-resources.h>
 #include <dbus/dbus-dataslot.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusServerVTable DBusServerVTable;
 
@@ -97,6 +97,6 @@ void        _dbus_server_toggle_timeout (DBusServer             *server,
 
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_SERVER_PROTECTED_H */
diff --git a/dbus/dbus-server-unix.h b/dbus/dbus-server-unix.h
index 5aeed50e..275b5f49 100644
--- a/dbus/dbus-server-unix.h
+++ b/dbus/dbus-server-unix.h
@@ -26,7 +26,7 @@
 #include <dbus/dbus-internals.h>
 #include <dbus/dbus-server-protected.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 DBusServer* _dbus_server_new_for_fd            (int               fd,
                                                 const DBusString *address);
@@ -38,6 +38,6 @@ DBusServer* _dbus_server_new_for_tcp_socket    (const char       *host,
                                                 DBusError        *error);
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_SERVER_UNIX_H */
diff --git a/dbus/dbus-server.h b/dbus/dbus-server.h
index 2305af8b..b5efb364 100644
--- a/dbus/dbus-server.h
+++ b/dbus/dbus-server.h
@@ -32,7 +32,7 @@
 #include <dbus/dbus-connection.h>
 #include <dbus/dbus-protocol.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusServer DBusServer;
 
@@ -75,6 +75,6 @@ dbus_bool_t dbus_server_set_data           (DBusServer       *server,
 void*       dbus_server_get_data           (DBusServer       *server,
                                             int               slot);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_SERVER_H */
diff --git a/dbus/dbus-sha.h b/dbus/dbus-sha.h
index cb6fba23..fc80c06d 100644
--- a/dbus/dbus-sha.h
+++ b/dbus/dbus-sha.h
@@ -27,7 +27,7 @@
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-string.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusSHAContext DBusSHAContext;
 
@@ -50,6 +50,6 @@ dbus_bool_t _dbus_sha_final   (DBusSHAContext   *context,
 dbus_bool_t _dbus_sha_compute (const DBusString *data,
                                DBusString       *ascii_output);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_SHA_H */
diff --git a/dbus/dbus-spawn.h b/dbus/dbus-spawn.h
index 0f50d6c2..750dbb34 100644
--- a/dbus/dbus-spawn.h
+++ b/dbus/dbus-spawn.h
@@ -29,7 +29,7 @@
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-watch.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef void (* DBusSpawnChildSetupFunc) (void *user_data);
 
@@ -53,6 +53,6 @@ dbus_bool_t _dbus_babysitter_set_watch_functions  (DBusBabysitter            *si
                                                    void                      *data,
                                                    DBusFreeFunction           free_data_function);
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_SPAWN_H */
diff --git a/dbus/dbus-string-private.h b/dbus/dbus-string-private.h
index 90605057..a2fcd03b 100644
--- a/dbus/dbus-string-private.h
+++ b/dbus/dbus-string-private.h
@@ -33,7 +33,7 @@
 #error "Don't go including dbus-string-private.h for no good reason"
 #endif
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 /**
  * @brief Internals of DBusString.
@@ -53,6 +53,6 @@ typedef struct
   unsigned int   align_offset : 3; /**< str - align_offset is the actual malloc block */
 } DBusRealString;
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_STRING_PRIVATE_H */
diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h
index ec209544..2dda2b0f 100644
--- a/dbus/dbus-string.h
+++ b/dbus/dbus-string.h
@@ -32,7 +32,7 @@
 
 #include <stdarg.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 /**
  * DBusString object
@@ -243,6 +243,6 @@ dbus_bool_t   _dbus_string_validate_service      (const DBusString  *str,
 void          _dbus_string_zero                  (DBusString        *str);
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_STRING_H */
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 8ac131a7..7e89d61b 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -37,7 +37,7 @@
 /* and it would just be annoying to abstract this */
 #include <errno.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 /* The idea of this file is to encapsulate everywhere that we're
  * relying on external libc features, for ease of security
@@ -329,6 +329,6 @@ dbus_bool_t _dbus_user_at_console (const char *username,
 #endif /* !DBUS_VA_COPY */
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_SYSDEPS_H */
diff --git a/dbus/dbus-threads.h b/dbus/dbus-threads.h
index eb13b251..4391ff1d 100644
--- a/dbus/dbus-threads.h
+++ b/dbus/dbus-threads.h
@@ -30,7 +30,7 @@
 #include <dbus/dbus-macros.h>
 #include <dbus/dbus-types.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusMutex DBusMutex;
 typedef struct DBusCondVar DBusCondVar;
@@ -117,6 +117,6 @@ dbus_bool_t  dbus_threads_init         (const DBusThreadFunctions *functions);
 
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_THREADS_H */
diff --git a/dbus/dbus-timeout.h b/dbus/dbus-timeout.h
index 2e48f304..f2f21549 100644
--- a/dbus/dbus-timeout.h
+++ b/dbus/dbus-timeout.h
@@ -26,7 +26,7 @@
 #include <dbus/dbus-connection.h>
 #include <dbus/dbus-internals.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusTimeoutList DBusTimeoutList;
 
@@ -62,6 +62,6 @@ void             _dbus_timeout_list_toggle_timeout (DBusTimeoutList           *t
                                                     dbus_bool_t                enabled);
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_TIMEOUT_H */
diff --git a/dbus/dbus-transport-protected.h b/dbus/dbus-transport-protected.h
index 51af9594..275326db 100644
--- a/dbus/dbus-transport-protected.h
+++ b/dbus/dbus-transport-protected.h
@@ -30,7 +30,7 @@
 #include <dbus/dbus-auth.h>
 #include <dbus/dbus-resources.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusTransportVTable DBusTransportVTable;
 
@@ -126,6 +126,6 @@ void        _dbus_transport_finalize_base (DBusTransport             *transport)
 
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_TRANSPORT_PROTECTED_H */
diff --git a/dbus/dbus-transport-unix.h b/dbus/dbus-transport-unix.h
index a4d57880..254144d9 100644
--- a/dbus/dbus-transport-unix.h
+++ b/dbus/dbus-transport-unix.h
@@ -25,7 +25,7 @@
 
 #include <dbus/dbus-transport.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 DBusTransport* _dbus_transport_new_for_fd            (int               fd,
                                                       dbus_bool_t       server,
@@ -38,6 +38,6 @@ DBusTransport* _dbus_transport_new_for_tcp_socket    (const char       *host,
                                                       DBusError        *error);
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_TRANSPORT_UNIX_H */
diff --git a/dbus/dbus-transport.h b/dbus/dbus-transport.h
index e2185989..20d53b7d 100644
--- a/dbus/dbus-transport.h
+++ b/dbus/dbus-transport.h
@@ -27,7 +27,7 @@
 #include <dbus/dbus-connection.h>
 #include <dbus/dbus-protocol.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusTransport DBusTransport;
 
@@ -76,6 +76,6 @@ dbus_bool_t        _dbus_transport_set_auth_mechanisms    (DBusTransport
 
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_TRANSPORT_H */
diff --git a/dbus/dbus-userdb.h b/dbus/dbus-userdb.h
index 51f2fa7c..c66031f6 100644
--- a/dbus/dbus-userdb.h
+++ b/dbus/dbus-userdb.h
@@ -26,7 +26,7 @@
 
 #include <dbus/dbus-sysdeps.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusUserDatabase DBusUserDatabase;
 
@@ -78,6 +78,6 @@ dbus_bool_t _dbus_is_console_user               (dbus_uid_t         uid,
                                                  DBusError         *error);
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_USERDB_H */
diff --git a/dbus/dbus-watch.h b/dbus/dbus-watch.h
index 90c01356..3dc0b24e 100644
--- a/dbus/dbus-watch.h
+++ b/dbus/dbus-watch.h
@@ -26,7 +26,7 @@
 #include <dbus/dbus-internals.h>
 #include <dbus/dbus-connection.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 /* Public methods on DBusWatch are in dbus-connection.h */
 
@@ -70,6 +70,6 @@ void           _dbus_watch_list_toggle_watch  (DBusWatchList           *watch_li
                                                dbus_bool_t              enabled);
 
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_WATCH_H */