Index: www/hacking.html
===================================================================
--- www/hacking.html	(revision 32709)
+++ www/hacking.html	(working copy)
@@ -2659,15 +2659,17 @@
     * Similar to svn_repos_dump_fs2(), but with the @a use_deltas
     * parameter always set to @c FALSE.
     */
-   svn_error_t *svn_repos_dump_fs(svn_repos_t *repos,
-                                  svn_stream_t *dumpstream,
-                                  svn_stream_t *feedback_stream,
-                                  svn_revnum_t start_rev,
-                                  svn_revnum_t end_rev,
-                                  svn_boolean_t incremental,
-                                  svn_cancel_func_t cancel_func,
-                                  void *cancel_baton,
-                                  apr_pool_t *pool);
+   SVN_DEPRECATED
+   svn_error_t *
+   svn_repos_dump_fs(svn_repos_t *repos,
+                     svn_stream_t *dumpstream,
+                     svn_stream_t *feedback_stream,
+                     svn_revnum_t start_rev,
+                     svn_revnum_t end_rev,
+                     svn_boolean_t incremental,
+                     svn_cancel_func_t cancel_func,
+                     void *cancel_baton,
+                     apr_pool_t *pool);
 </pre>
 
 <p>When the major release number changes, the "best" new API in a
Index: subversion/bindings/swig/include/svn_global.swg
===================================================================
--- subversion/bindings/swig/include/svn_global.swg	(revision 32709)
+++ subversion/bindings/swig/include/svn_global.swg	(working copy)
@@ -26,8 +26,10 @@
    SWIG standard library before they get %apply-ed anywhere. */
 %include svn_swigcompat.swg
 
-/* SWIG can't understand __attribute__(x), so we make it go away */
+/* SWIG can't understand __attribute__(x) or __declspec(x), so we make
+   them go away */
 #define __attribute__(x)
+#define __declspec(x)
 
 /* SWIG doesn't handle variadic parameters well */
 %ignore svn_string_createv;
Index: subversion/include/svn_fs.h
===================================================================
--- subversion/include/svn_fs.h	(revision 32709)
+++ subversion/include/svn_fs.h	(working copy)
@@ -343,6 +343,7 @@
  * callback is registered with Berkeley DB, and will forward notifications to
  * a user provided callback after performing its own processing.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_fs_set_berkeley_errcall(svn_fs_t *fs,
                             void (*handler)(const char *errpfx,
@@ -381,21 +382,32 @@
  */
 
 /** @deprecated Provided for backward compatibility with the 1.0 API. */
-svn_fs_t *svn_fs_new(apr_hash_t *fs_config, apr_pool_t *pool);
+SVN_DEPRECATED
+svn_fs_t *
+svn_fs_new(apr_hash_t *fs_config, apr_pool_t *pool);
 
 /** @deprecated Provided for backward compatibility with the 1.0 API. */
-svn_error_t *svn_fs_create_berkeley(svn_fs_t *fs, const char *path);
+SVN_DEPRECATED
+svn_error_t *
+svn_fs_create_berkeley(svn_fs_t *fs, const char *path);
 
 /** @deprecated Provided for backward compatibility with the 1.0 API. */
-svn_error_t *svn_fs_open_berkeley(svn_fs_t *fs, const char *path);
+SVN_DEPRECATED
+svn_error_t *
+svn_fs_open_berkeley(svn_fs_t *fs, const char *path);
 
 /** @deprecated Provided for backward compatibility with the 1.0 API. */
-const char *svn_fs_berkeley_path(svn_fs_t *fs, apr_pool_t *pool);
+SVN_DEPRECATED
+const char *
+svn_fs_berkeley_path(svn_fs_t *fs, apr_pool_t *pool);
 
 /** @deprecated Provided for backward compatibility with the 1.0 API. */
-svn_error_t *svn_fs_delete_berkeley(const char *path, apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_fs_delete_berkeley(const char *path, apr_pool_t *pool);
 
 /** @deprecated Provided for backward compatibility with the 1.0 API. */
+SVN_DEPRECATED
 svn_error_t *
 svn_fs_hotcopy_berkeley(const char *src_path,
                         const char *dest_path,
@@ -403,6 +415,7 @@
                         apr_pool_t *pool);
 
 /** @deprecated Provided for backward compatibility with the 1.4 API. */
+SVN_DEPRECATED
 svn_error_t *
 svn_fs_berkeley_recover(const char *path,
                         apr_pool_t *pool);
@@ -489,6 +502,7 @@
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
 
+SVN_DEPRECATED
 svn_error_t *
 svn_fs_access_add_lock_token(svn_fs_access_t *access_ctx,
                              const char *token);
@@ -551,6 +565,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_fs_id_t *
 svn_fs_parse_id(const char *data,
                 apr_size_t len,
@@ -716,6 +731,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_fs_begin_txn(svn_fs_txn_t **txn_p,
                  svn_fs_t *fs,
@@ -1552,6 +1568,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.5 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_fs_file_md5_checksum(unsigned char digest[],
                          svn_fs_root_t *root,
Index: subversion/include/svn_diff.h
===================================================================
--- subversion/include/svn_diff.h	(revision 32709)
+++ subversion/include/svn_diff.h	(working copy)
@@ -424,6 +424,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_diff_file_diff(svn_diff_t **diff,
                    const char *original,
@@ -453,6 +454,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_diff_file_diff3(svn_diff_t **diff,
                     const char *original,
@@ -484,6 +486,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_diff_file_diff4(svn_diff_t **diff,
                     const char *original,
@@ -527,6 +530,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_diff_file_output_unified2(svn_stream_t *output_stream,
                               svn_diff_t *diff,
@@ -542,6 +546,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_diff_file_output_unified(svn_stream_t *output_stream,
                              svn_diff_t *diff,
@@ -593,6 +598,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.5 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_diff_file_output_merge(svn_stream_t *output_stream,
                            svn_diff_t *diff,
@@ -712,6 +718,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.5 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_diff_mem_string_output_merge(svn_stream_t *output_stream,
                                  svn_diff_t *diff,
Index: subversion/include/svn_base64.h
===================================================================
--- subversion/include/svn_base64.h	(revision 32709)
+++ subversion/include/svn_base64.h	(working copy)
@@ -25,6 +25,7 @@
 #include <apr_md5.h>
 
 #include "svn_io.h"
+#include "svn_types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -72,8 +73,10 @@
  *
  * @deprecated Provided for backward compatibility with the 1.5 API.
  */
-const svn_string_t *svn_base64_encode_string(const svn_string_t *str,
-                                             apr_pool_t *pool);
+SVN_DEPRECATED
+const svn_string_t *
+svn_base64_encode_string(const svn_string_t *str,
+                         apr_pool_t *pool);
 
 /** Decode an @c svn_stringbuf_t from base64.
  *
Index: subversion/include/svn_dso.h
===================================================================
--- subversion/include/svn_dso.h	(revision 32709)
+++ subversion/include/svn_dso.h	(working copy)
@@ -27,6 +27,7 @@
 #include <apr_dso.h>
 
 #include "svn_error.h"
+#include "svn_types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -71,7 +72,9 @@
  *
  * @since New in 1.4.
  */
-void svn_dso_initialize(void);
+SVN_DEPRECATED
+void
+svn_dso_initialize(void);
 
 #if APR_HAS_DSO
 /**
Index: subversion/include/svn_ra_svn.h
===================================================================
--- subversion/include/svn_ra_svn.h	(revision 32709)
+++ subversion/include/svn_ra_svn.h	(working copy)
@@ -31,6 +31,7 @@
 #include "svn_config.h"
 
 #include "svn_delta.h"
+#include "svn_types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -366,10 +367,12 @@
  *
  * @deprecated Provided for backward compatibility with the 1.5 API.
  */
-svn_error_t *svn_ra_svn_handle_commands(svn_ra_svn_conn_t *conn,
-                                        apr_pool_t *pool,
-                                        const svn_ra_svn_cmd_entry_t *commands,
-                                        void *baton);
+SVN_DEPRECATED
+svn_error_t *
+svn_ra_svn_handle_commands(svn_ra_svn_conn_t *conn,
+                           apr_pool_t *pool,
+                           const svn_ra_svn_cmd_entry_t *commands,
+                           void *baton);
 
 /** Write a command over the network, using the same format string notation
  * as svn_ra_svn_write_tuple().
Index: subversion/include/svn_repos.h
===================================================================
--- subversion/include/svn_repos.h	(revision 32709)
+++ subversion/include/svn_repos.h	(working copy)
@@ -343,6 +343,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_recover2(const char *path,
                    svn_boolean_t nonblocking,
@@ -356,7 +357,10 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
-svn_error_t *svn_repos_recover(const char *path, apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_repos_recover(const char *path,
+                  apr_pool_t *pool);
 
 /** This function is a wrapper around svn_fs_berkeley_logfiles(),
  * returning log file paths relative to the root of the repository.
@@ -546,6 +550,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_begin_report(void **report_baton,
                        svn_revnum_t revnum,
@@ -613,6 +618,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_set_path2(void *report_baton,
                     const char *path,
@@ -626,6 +632,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_set_path(void *report_baton,
                    const char *path,
@@ -676,6 +683,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_link_path2(void *report_baton,
                      const char *path,
@@ -690,6 +698,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_link_path(void *report_baton,
                     const char *path,
@@ -836,6 +845,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_dir_delta(svn_fs_root_t *src_root,
                     const char *src_parent_dir,
@@ -904,6 +914,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_replay(svn_fs_root_t *root,
                  const svn_delta_editor_t *editor,
@@ -981,6 +992,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_get_commit_editor4(const svn_delta_editor_t **editor,
                              void **edit_baton,
@@ -1004,6 +1016,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_get_commit_editor3(const svn_delta_editor_t **editor,
                              void **edit_baton,
@@ -1025,6 +1038,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_get_commit_editor2(const svn_delta_editor_t **editor,
                              void **edit_baton,
@@ -1045,6 +1059,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_get_commit_editor(const svn_delta_editor_t **editor,
                             void **edit_baton,
@@ -1181,6 +1196,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_history(svn_fs_t *fs,
                   const char *path,
@@ -1360,6 +1376,7 @@
  * @since New in 1.2.
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_get_logs3(svn_repos_t *repos,
                     const apr_array_header_t *paths,
@@ -1380,6 +1397,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_get_logs2(svn_repos_t *repos,
                     const apr_array_header_t *paths,
@@ -1399,6 +1417,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_get_logs(svn_repos_t *repos,
                    const apr_array_header_t *paths,
@@ -1509,6 +1528,7 @@
  * @deprecated Provided for backward compatibility with the 1.4 API.
  * @since New in 1.1.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_get_file_revs(svn_repos_t *repos,
                         const char *path,
@@ -1580,6 +1600,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_fs_begin_txn_for_commit(svn_fs_txn_t **txn_p,
                                   svn_repos_t *repos,
@@ -1713,6 +1734,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_fs_change_rev_prop2(svn_repos_t *repos,
                               svn_revnum_t rev,
@@ -1730,6 +1752,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_fs_change_rev_prop(svn_repos_t *repos,
                              svn_revnum_t rev,
@@ -2073,6 +2096,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_dump_fs(svn_repos_t *repos,
                   svn_stream_t *dumpstream,
@@ -2140,6 +2164,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_load_fs(svn_repos_t *repos,
                   svn_stream_t *dumpstream,
@@ -2359,6 +2384,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_parse_dumpstream(svn_stream_t *stream,
                            const svn_repos_parser_fns_t *parse_fns,
@@ -2374,6 +2400,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_get_fs_build_parser(const svn_repos_parser_fns_t **parser,
                               void **parse_baton,
Index: subversion/include/svn_delta.h
===================================================================
--- subversion/include/svn_delta.h	(revision 32709)
+++ subversion/include/svn_delta.h	(working copy)
@@ -417,10 +417,12 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
-void svn_txdelta_to_svndiff(svn_stream_t *output,
-                            apr_pool_t *pool,
-                            svn_txdelta_window_handler_t *handler,
-                            void **handler_baton);
+SVN_DEPRECATED
+void
+svn_txdelta_to_svndiff(svn_stream_t *output,
+                       apr_pool_t *pool,
+                       svn_txdelta_window_handler_t *handler,
+                       void **handler_baton);
 
 /** Return a writable generic stream which will parse svndiff-format
  * data into a text delta, invoking @a handler with @a handler_baton
Index: subversion/include/svn_subst.h
===================================================================
--- subversion/include/svn_subst.h	(revision 32709)
+++ subversion/include/svn_subst.h	(working copy)
@@ -140,6 +140,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_subst_build_keywords(svn_subst_keywords_t *kw,
                          const char *keywords_string,
@@ -177,6 +178,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_boolean_t
 svn_subst_keywords_differ(const svn_subst_keywords_t *a,
                           const svn_subst_keywords_t *b,
@@ -291,6 +293,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_subst_translate_stream2(svn_stream_t *src,
                             svn_stream_t *dst,
@@ -308,6 +311,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_subst_translate_stream(svn_stream_t *src,
                            svn_stream_t *dst,
@@ -354,6 +358,7 @@
  * @deprecated Provided for backward compatibility with the 1.2 API.
  * @since New in 1.1.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_subst_copy_and_translate2(const char *src,
                               const char *dst,
@@ -370,6 +375,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_subst_copy_and_translate(const char *src,
                              const char *dst,
@@ -408,6 +414,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_subst_translate_cstring(const char *src,
                             const char **dst,
Index: subversion/include/svn_types.h
===================================================================
--- subversion/include/svn_types.h	(revision 32709)
+++ subversion/include/svn_types.h	(working copy)
@@ -38,6 +38,26 @@
 
 
 
+/** Macro used to mark deprecated functions.
+ *
+ * @since New in 1.6.
+ */
+#ifndef SVN_DEPRECATED
+#if !defined(SWIGPERL) && !defined(SWIGPYTHON) && !defined(SWIGRUBY)
+#if defined(__GNUC__)
+#define SVN_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER) && _MSC_VER >= 1300
+#define SVN_DEPRECATED __declspec(deprecated)
+#else
+#define SVN_DEPRECATED
+#endif
+#else
+#define SVN_DEPRECATED
+#endif
+#endif
+
+
+
 /** Subversion error object.
  *
  * Defined here, rather than in svn_error.h, to avoid a recursive @#include
Index: subversion/include/svn_config.h
===================================================================
--- subversion/include/svn_config.h	(revision 32709)
+++ subversion/include/svn_config.h	(working copy)
@@ -280,9 +280,11 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.2 API.
  */
-int svn_config_enumerate_sections(svn_config_t *cfg,
-                                  svn_config_section_enumerator_t callback,
-                                  void *baton);
+SVN_DEPRECATED
+int
+svn_config_enumerate_sections(svn_config_t *cfg,
+                              svn_config_section_enumerator_t callback,
+                              void *baton);
 
 /** A callback function used in enumerating config sections.
  *
@@ -324,8 +326,10 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.2 API.
  */
-int svn_config_enumerate(svn_config_t *cfg, const char *section,
-                         svn_config_enumerator_t callback, void *baton);
+SVN_DEPRECATED
+int
+svn_config_enumerate(svn_config_t *cfg, const char *section,
+                     svn_config_enumerator_t callback, void *baton);
 
 
 /** A callback function used in enumerating config options.
Index: subversion/include/svn_io.h
===================================================================
--- subversion/include/svn_io.h	(revision 32709)
+++ subversion/include/svn_io.h	(working copy)
@@ -181,12 +181,14 @@
  *       required.
  *
  */
-svn_error_t *svn_io_open_unique_file(apr_file_t **f,
-                                     const char **unique_name_p,
-                                     const char *path,
-                                     const char *suffix,
-                                     svn_boolean_t delete_on_close,
-                                     apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_io_open_unique_file(apr_file_t **f,
+                        const char **unique_name_p,
+                        const char *path,
+                        const char *suffix,
+                        svn_boolean_t delete_on_close,
+                        apr_pool_t *pool);
 
 /**
  * Like svn_io_open_unique_file(), except that instead of creating a
@@ -349,10 +351,12 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
-svn_error_t *svn_io_set_file_read_write_carefully(const char *path,
-                                                  svn_boolean_t enable_write,
-                                                  svn_boolean_t ignore_enoent,
-                                                  apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_io_set_file_read_write_carefully(const char *path,
+                                     svn_boolean_t enable_write,
+                                     svn_boolean_t ignore_enoent,
+                                     apr_pool_t *pool);
 
 /** Set @a path's "executability" (but do nothing if it is a symlink).
  *
@@ -478,9 +482,11 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
-svn_error_t *svn_io_file_lock(const char *lock_file,
-                              svn_boolean_t exclusive,
-                              apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_io_file_lock(const char *lock_file,
+                 svn_boolean_t exclusive,
+                 apr_pool_t *pool);
 
 /**
  * Lock file at @a lock_file. If @a exclusive is TRUE,
@@ -615,7 +621,9 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
-svn_stream_t *svn_stream_from_aprfile(apr_file_t *file, apr_pool_t *pool);
+SVN_DEPRECATED
+svn_stream_t *
+svn_stream_from_aprfile(apr_file_t *file, apr_pool_t *pool);
 
 /** Set @a *out to a generic stream connected to stdout, allocated in
  * @a pool.  The stream and its underlying APR handle will be closed
@@ -685,11 +693,13 @@
  * @since New in 1.4.
  * @deprecated Provided for backward compatibility with the 1.5 API.
  */
-svn_stream_t *svn_stream_checksummed(svn_stream_t *stream,
-                                     const unsigned char **read_digest,
-                                     const unsigned char **write_digest,
-                                     svn_boolean_t read_all,
-                                     apr_pool_t *pool);
+SVN_DEPRECATED
+svn_stream_t *
+svn_stream_checksummed(svn_stream_t *stream,
+                       const unsigned char **read_digest,
+                       const unsigned char **write_digest,
+                       svn_boolean_t read_all,
+                       apr_pool_t *pool);
 
 /** Read from a generic stream. @see svn_stream_t. */
 svn_error_t *svn_stream_read(svn_stream_t *stream, char *buffer,
@@ -763,8 +773,10 @@
  * @since New in 1.1.
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
-svn_error_t *svn_stream_copy(svn_stream_t *from, svn_stream_t *to,
-                             apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_stream_copy(svn_stream_t *from, svn_stream_t *to,
+                apr_pool_t *pool);
 
 /** Set @a *same to TRUE if @a stream1 and @a stream2 have the same
  * contents, else set it to FALSE.  Use @a pool for temporary allocations.
@@ -801,9 +813,11 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.4 API.
  */
-svn_error_t *svn_stringbuf_from_file(svn_stringbuf_t **result,
-                                     const char *filename,
-                                     apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_stringbuf_from_file(svn_stringbuf_t **result,
+                        const char *filename,
+                        apr_pool_t *pool);
 
 /** Sets @a *result to a string containing the contents of the already opened
  * @a file.  Reads from the current position in file to the end.  Does not
@@ -838,7 +852,9 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API
  */
-svn_error_t *svn_io_remove_dir(const char *path, apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_io_remove_dir(const char *path, apr_pool_t *pool);
 
 /** Read all of the disk entries in directory @a path, a utf8-encoded
  * path.  Set @a *dirents to a hash mapping dirent names (<tt>char *</tt>) to
@@ -874,9 +890,11 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.2 API.
  */
-svn_error_t *svn_io_get_dirents(apr_hash_t **dirents,
-                                const char *path,
-                                apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_io_get_dirents(apr_hash_t **dirents,
+                   const char *path,
+                   apr_pool_t *pool);
 
 
 /** Callback function type for svn_io_dir_walk() */
@@ -1053,17 +1071,19 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API.
  */
-svn_error_t *svn_io_run_diff3(const char *dir,
-                              const char *mine,
-                              const char *older,
-                              const char *yours,
-                              const char *mine_label,
-                              const char *older_label,
-                              const char *yours_label,
-                              apr_file_t *merged,
-                              int *exitcode,
-                              const char *diff3_cmd,
-                              apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_io_run_diff3(const char *dir,
+                 const char *mine,
+                 const char *older,
+                 const char *yours,
+                 const char *mine_label,
+                 const char *older_label,
+                 const char *yours_label,
+                 apr_file_t *merged,
+                 int *exitcode,
+                 const char *diff3_cmd,
+                 apr_pool_t *pool);
 
 
 /** Parse utf8-encoded @a mimetypes_file as a MIME types file (such as
@@ -1102,9 +1122,11 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API
  */
-svn_error_t *svn_io_detect_mimetype(const char **mimetype,
-                                    const char *file,
-                                    apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_io_detect_mimetype(const char **mimetype,
+                       const char *file,
+                       apr_pool_t *pool);
 
 
 /** Wrapper for apr_file_open().  @a fname is utf8-encoded. */
Index: subversion/include/svn_wc.h
===================================================================
--- subversion/include/svn_wc.h	(revision 32709)
+++ subversion/include/svn_wc.h	(working copy)
@@ -194,6 +194,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_adm_open2(svn_wc_adm_access_t **adm_access,
                  svn_wc_adm_access_t *associated,
@@ -209,6 +210,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_adm_open(svn_wc_adm_access_t **adm_access,
                 svn_wc_adm_access_t *associated,
@@ -246,6 +248,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_adm_probe_open2(svn_wc_adm_access_t **adm_access,
                        svn_wc_adm_access_t *associated,
@@ -261,6 +264,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_adm_probe_open(svn_wc_adm_access_t **adm_access,
                       svn_wc_adm_access_t *associated,
@@ -369,6 +373,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_adm_probe_try2(svn_wc_adm_access_t **adm_access,
                       svn_wc_adm_access_t *associated,
@@ -384,6 +389,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_adm_probe_try(svn_wc_adm_access_t **adm_access,
                      svn_wc_adm_access_t *associated,
@@ -618,6 +624,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_wc_external_item_t *
 svn_wc_external_item_dup(const svn_wc_external_item_t *item,
                          apr_pool_t *pool);
@@ -659,6 +666,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_parse_externals_description2(apr_array_header_t **externals_p,
                                     const char *parent_directory,
@@ -673,6 +681,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_parse_externals_description(apr_hash_t **externals_p,
                                    const char *parent_directory,
@@ -2087,6 +2096,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_walk_entries2(const char *path,
                      svn_wc_adm_access_t *adm_access,
@@ -2103,6 +2113,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_walk_entries(const char *path,
                     svn_wc_adm_access_t *adm_access,
@@ -2164,6 +2175,7 @@
  *
  * @since New in 1.3.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_ensure_adm2(const char *path,
                    const char *uuid,
@@ -2178,6 +2190,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_ensure_adm(const char *path,
                   const char *uuid,
@@ -2432,6 +2445,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_wc_status_t *
 svn_wc_dup_status(svn_wc_status_t *orig_stat,
                   apr_pool_t *pool);
@@ -2476,6 +2490,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_status(svn_wc_status_t **status,
               const char *path,
@@ -2593,6 +2608,7 @@
  * @since New in 1.2.
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_get_status_editor2(const svn_delta_editor_t **editor,
                           void **edit_baton,
@@ -2617,6 +2633,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_get_status_editor(const svn_delta_editor_t **editor,
                          void **edit_baton,
@@ -2697,6 +2714,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_copy(const char *src,
             svn_wc_adm_access_t *dst_parent,
@@ -2747,6 +2765,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_delete2(const char *path,
                svn_wc_adm_access_t *adm_access,
@@ -2761,6 +2780,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_delete(const char *path,
               svn_wc_adm_access_t *adm_access,
@@ -2847,6 +2867,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.5 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_add2(const char *path,
             svn_wc_adm_access_t *parent_access,
@@ -2863,6 +2884,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_add(const char *path,
            svn_wc_adm_access_t *parent_access,
@@ -2930,6 +2952,7 @@
  *
  */
 
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_add_repos_file(const char *dst_path,
                       svn_wc_adm_access_t *adm_access,
@@ -3048,6 +3071,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_resolved_conflict2(const char *path,
                           svn_wc_adm_access_t *adm_access,
@@ -3066,6 +3090,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_resolved_conflict(const char *path,
                          svn_wc_adm_access_t *adm_access,
@@ -3195,6 +3220,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_process_committed3(const char *path,
                           svn_wc_adm_access_t *adm_access,
@@ -3214,6 +3240,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_process_committed2(const char *path,
                           svn_wc_adm_access_t *adm_access,
@@ -3231,6 +3258,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_process_committed(const char *path,
                          svn_wc_adm_access_t *adm_access,
@@ -3313,6 +3341,7 @@
  *
  * @deprecated Provided for compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_crawl_revisions2(const char *path,
                         svn_wc_adm_access_t *adm_access,
@@ -3332,6 +3361,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_crawl_revisions(const char *path,
                        svn_wc_adm_access_t *adm_access,
@@ -3488,6 +3518,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_get_update_editor2(svn_revnum_t *target_revision,
                           svn_wc_adm_access_t *anchor,
@@ -3510,6 +3541,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_get_update_editor(svn_revnum_t *target_revision,
                          svn_wc_adm_access_t *anchor,
@@ -3616,6 +3648,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_get_switch_editor2(svn_revnum_t *target_revision,
                           svn_wc_adm_access_t *anchor,
@@ -3639,6 +3672,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_get_switch_editor(svn_revnum_t *target_revision,
                          svn_wc_adm_access_t *anchor,
@@ -3736,6 +3770,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_prop_set(const char *name,
                 const svn_string_t *value,
@@ -3882,6 +3917,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.5 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_get_diff_editor4(svn_wc_adm_access_t *anchor,
                         const char *target,
@@ -3907,6 +3943,7 @@
 
  * @since New in 1.2.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_get_diff_editor3(svn_wc_adm_access_t *anchor,
                         const char *target,
@@ -3929,6 +3966,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_get_diff_editor2(svn_wc_adm_access_t *anchor,
                         const char *target,
@@ -3951,6 +3989,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_get_diff_editor(svn_wc_adm_access_t *anchor,
                        const char *target,
@@ -4011,6 +4050,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.5 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_diff4(svn_wc_adm_access_t *anchor,
              const char *target,
@@ -4029,6 +4069,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_diff3(svn_wc_adm_access_t *anchor,
              const char *target,
@@ -4044,6 +4085,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_diff2(svn_wc_adm_access_t *anchor,
              const char *target,
@@ -4059,6 +4101,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_diff(svn_wc_adm_access_t *anchor,
             const char *target,
@@ -4200,6 +4243,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome,
               const char *left,
@@ -4219,6 +4263,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_merge(const char *left,
              const char *right,
@@ -4277,6 +4322,7 @@
  * @deprecated Provided for backward compatibility with the 1.3 API.
  *
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_merge_props(svn_wc_notify_state_t *state,
                    const char *path,
@@ -4297,6 +4343,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_merge_prop_diffs(svn_wc_notify_state_t *state,
                         const char *path,
@@ -4348,6 +4395,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_cleanup(const char *path,
                svn_wc_adm_access_t *optional_adm_access,
@@ -4421,6 +4469,7 @@
 /** Similar to svn_wc_relocate3(), but uses @c svn_wc_relocation_validator2_t.
  *
  * @deprecated Provided for backwards compatibility with the 1.4 API. */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_relocate2(const char *path,
                  svn_wc_adm_access_t *adm_access,
@@ -4434,6 +4483,7 @@
 /** Similar to svn_wc_relocate2(), but uses @c svn_wc_relocation_validator_t.
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API. */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_relocate(const char *path,
                 svn_wc_adm_access_t *adm_access,
@@ -4508,6 +4558,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_revert2(const char *path,
                svn_wc_adm_access_t *parent_access,
@@ -4524,6 +4575,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_revert(const char *path,
               svn_wc_adm_access_t *parent_access,
@@ -4563,6 +4615,7 @@
  *
  * @deprecated For compatibility with 1.3 API
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_create_tmp_file(apr_file_t **fp,
                        const char *path,
@@ -4618,6 +4671,7 @@
  *
  * @deprecated Provided for compatibility with the 1.3 API
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_translated_file(const char **xlated_p,
                        const char *vfile,
@@ -4696,6 +4750,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_wc_transmit_text_deltas(const char *path,
                             svn_wc_adm_access_t *adm_access,
Index: subversion/include/svn_cmdline.h
===================================================================
--- subversion/include/svn_cmdline.h	(revision 32709)
+++ subversion/include/svn_cmdline.h	(working copy)
@@ -34,6 +34,7 @@
 #include "svn_utf.h"
 #include "svn_auth.h"
 #include "svn_config.h"
+#include "svn_types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -180,6 +181,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_cmdline_prompt_user(const char **result,
                         const char *prompt_str,
@@ -329,6 +331,7 @@
  * function name is distinguished from the old by a grammatical
  * improvement: the verb "set_up" instead of the noun "setup".
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_cmdline_setup_auth_baton(svn_auth_baton_t **ab,
                              svn_boolean_t non_interactive,
Index: subversion/include/svn_client.h
===================================================================
--- subversion/include/svn_client.h	(revision 32709)
+++ subversion/include/svn_client.h	(working copy)
@@ -104,7 +104,9 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
-void svn_client_get_simple_prompt_provider
+SVN_DEPRECATED
+void
+svn_client_get_simple_prompt_provider
   (svn_auth_provider_object_t **provider,
    svn_auth_simple_prompt_func_t prompt_func,
    void *prompt_baton,
@@ -125,7 +127,9 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
-void svn_client_get_username_prompt_provider
+SVN_DEPRECATED
+void
+svn_client_get_username_prompt_provider
   (svn_auth_provider_object_t **provider,
    svn_auth_username_prompt_func_t prompt_func,
    void *prompt_baton,
@@ -146,6 +150,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_client_get_simple_provider(svn_auth_provider_object_t **provider,
                                apr_pool_t *pool);
@@ -173,6 +178,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_client_get_windows_simple_provider(svn_auth_provider_object_t **provider,
                                        apr_pool_t *pool);
@@ -189,6 +195,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_client_get_username_provider(svn_auth_provider_object_t **provider,
                                  apr_pool_t *pool);
@@ -203,6 +210,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_client_get_ssl_server_trust_file_provider
   (svn_auth_provider_object_t **provider,
@@ -218,6 +226,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_client_get_ssl_client_cert_file_provider
   (svn_auth_provider_object_t **provider,
@@ -233,6 +242,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_client_get_ssl_client_cert_pw_file_provider
   (svn_auth_provider_object_t **provider,
@@ -248,6 +258,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_client_get_ssl_server_trust_prompt_provider
   (svn_auth_provider_object_t **provider,
@@ -266,6 +277,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_client_get_ssl_client_cert_prompt_provider
   (svn_auth_provider_object_t **provider,
@@ -285,6 +297,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_client_get_ssl_client_cert_pw_prompt_provider
   (svn_auth_provider_object_t **provider,
@@ -340,6 +353,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_client_proplist_item_t *
 svn_client_proplist_item_dup(const svn_client_proplist_item_t *item,
                              apr_pool_t *pool);
@@ -532,6 +546,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_client_commit_item2_t *
 svn_client_commit_item2_dup(const svn_client_commit_item2_t *item,
                             apr_pool_t *pool);
@@ -1038,6 +1053,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_checkout2(svn_revnum_t *result_rev,
                      const char *URL,
@@ -1057,6 +1073,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_checkout(svn_revnum_t *result_rev,
                     const char *URL,
@@ -1147,6 +1164,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_update2(apr_array_header_t **result_revs,
                    const apr_array_header_t *paths,
@@ -1163,6 +1181,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_update(svn_revnum_t *result_rev,
                   const char *path,
@@ -1246,6 +1265,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_switch(svn_revnum_t *result_rev,
                   const char *path,
@@ -1319,6 +1339,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_add3(const char *path,
                 svn_boolean_t recursive,
@@ -1333,6 +1354,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_add2(const char *path,
                 svn_boolean_t recursive,
@@ -1345,6 +1367,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_add(const char *path,
                svn_boolean_t recursive,
@@ -1406,6 +1429,7 @@
  * @since New in 1.3.
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_mkdir2(svn_commit_info_t **commit_info_p,
                   const apr_array_header_t *paths,
@@ -1418,6 +1442,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_mkdir(svn_client_commit_info_t **commit_info_p,
                  const apr_array_header_t *paths,
@@ -1489,6 +1514,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_delete2(svn_commit_info_t **commit_info_p,
                    const apr_array_header_t *paths,
@@ -1502,6 +1528,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_delete(svn_client_commit_info_t **commit_info_p,
                   const apr_array_header_t *paths,
@@ -1586,6 +1613,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_import2(svn_commit_info_t **commit_info_p,
                    const char *path,
@@ -1602,6 +1630,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_import(svn_client_commit_info_t **commit_info_p,
                   const char *path,
@@ -1691,6 +1720,7 @@
  *
  * @since New in 1.3.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_commit3(svn_commit_info_t **commit_info_p,
                    const apr_array_header_t *targets,
@@ -1707,6 +1737,7 @@
  *
  * @since New in 1.2.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_commit2(svn_client_commit_info_t **commit_info_p,
                    const apr_array_header_t *targets,
@@ -1721,6 +1752,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_commit(svn_client_commit_info_t **commit_info_p,
                   const apr_array_header_t *targets,
@@ -1793,6 +1825,7 @@
  * @since New in 1.2.
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_status2(svn_revnum_t *result_rev,
                    const char *path,
@@ -1817,6 +1850,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_status(svn_revnum_t *result_rev,
                   const char *path,
@@ -1908,6 +1942,7 @@
  * @deprecated Provided for compatibility with the 1.4 API.
  * @since New in 1.4.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_log3(const apr_array_header_t *targets,
                 const svn_opt_revision_t *peg_revision,
@@ -1929,6 +1964,7 @@
  * @deprecated Provided for compatibility with the 1.3 API.
  * @since New in 1.2.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_log2(const apr_array_header_t *targets,
                 const svn_opt_revision_t *start,
@@ -1962,6 +1998,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_log(const apr_array_header_t *targets,
                const svn_opt_revision_t *start,
@@ -2030,6 +2067,7 @@
  *
  * @since New in 1.4.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_blame3(const char *path_or_url,
                   const svn_opt_revision_t *peg_revision,
@@ -2051,6 +2089,7 @@
  *
  * @since New in 1.2.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_blame2(const char *path_or_url,
                   const svn_opt_revision_t *peg_revision,
@@ -2067,6 +2106,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_blame(const char *path_or_url,
                  const svn_opt_revision_t *start,
@@ -2182,6 +2222,7 @@
  *
  * @since New in 1.3.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_diff3(const apr_array_header_t *diff_options,
                  const char *path1,
@@ -2207,6 +2248,7 @@
  *
  * @since New in 1.2.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_diff2(const apr_array_header_t *diff_options,
                  const char *path1,
@@ -2228,6 +2270,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_diff(const apr_array_header_t *diff_options,
                 const char *path1,
@@ -2284,6 +2327,7 @@
  *
  * @since New in 1.3.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_diff_peg3(const apr_array_header_t *diff_options,
                      const char *path,
@@ -2308,6 +2352,7 @@
  *
  * @since New in 1.2.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_diff_peg2(const apr_array_header_t *diff_options,
                      const char *path,
@@ -2330,6 +2375,7 @@
  * @since New in 1.1.
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_diff_peg(const apr_array_header_t *diff_options,
                     const char *path,
@@ -2383,6 +2429,7 @@
  *
  * @since New in 1.4.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_diff_summarize(const char *path1,
                           const svn_opt_revision_t *revision1,
@@ -2439,6 +2486,7 @@
  *
  * @since New in 1.4.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_diff_summarize_peg(const char *path,
                               const svn_opt_revision_t *peg_revision,
@@ -2544,6 +2592,7 @@
  *
  * @since New in 1.4.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_merge2(const char *source1,
                   const svn_opt_revision_t *revision1,
@@ -2564,6 +2613,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_merge(const char *source1,
                  const svn_opt_revision_t *revision1,
@@ -2644,6 +2694,7 @@
  *
  * @since New in 1.4.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_merge_peg2(const char *source,
                       const svn_opt_revision_t *revision1,
@@ -2666,6 +2717,7 @@
  *
  * @since New in 1.1.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_merge_peg(const char *source,
                      const svn_opt_revision_t *revision1,
@@ -2883,6 +2935,7 @@
  *
  * @deprecated Provided for backwards compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_revert(const apr_array_header_t *paths,
                   svn_boolean_t recursive,
@@ -2904,6 +2957,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_resolved(const char *path,
                     svn_boolean_t recursive,
@@ -3052,6 +3106,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_copy3(svn_commit_info_t **commit_info_p,
                  const char *src_path,
@@ -3070,6 +3125,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_copy2(svn_commit_info_t **commit_info_p,
                  const char *src_path,
@@ -3085,6 +3141,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_copy(svn_client_commit_info_t **commit_info_p,
                 const char *src_path,
@@ -3198,6 +3255,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_move4(svn_commit_info_t **commit_info_p,
                  const char *src_path,
@@ -3215,6 +3273,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_move3(svn_commit_info_t **commit_info_p,
                  const char *src_path,
@@ -3231,6 +3290,7 @@
  *
  * @since New in 1.2.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_move2(svn_client_commit_info_t **commit_info_p,
                  const char *src_path,
@@ -3247,6 +3307,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_move(svn_client_commit_info_t **commit_info_p,
                 const char *src_path,
@@ -3347,6 +3408,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_propset2(const char *propname,
                     const svn_string_t *propval,
@@ -3362,6 +3424,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_propset(const char *propname,
                    const svn_string_t *propval,
@@ -3421,6 +3484,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_revprop_set(const char *propname,
                        const svn_string_t *propval,
@@ -3491,6 +3555,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_propget2(apr_hash_t **props,
                     const char *propname,
@@ -3507,6 +3572,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_propget(apr_hash_t **props,
                    const char *propname,
@@ -3595,6 +3661,7 @@
  *
  * @deprecated Provided for backward compatiblility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_proplist2(apr_array_header_t **props,
                      const char *target,
@@ -3610,6 +3677,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_proplist(apr_array_header_t **props,
                     const char *target,
@@ -3721,6 +3789,7 @@
  *
  * @since New in 1.2.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_export3(svn_revnum_t *result_rev,
                    const char *from,
@@ -3744,6 +3813,7 @@
  * @since New in 1.1.
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_export2(svn_revnum_t *result_rev,
                    const char *from,
@@ -3761,6 +3831,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_export(svn_revnum_t *result_rev,
                   const char *from,
@@ -3847,6 +3918,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_list(const char *path_or_url,
                 const svn_opt_revision_t *peg_revision,
@@ -3875,6 +3947,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_ls3(apr_hash_t **dirents,
                apr_hash_t **locks,
@@ -3892,6 +3965,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_ls2(apr_hash_t **dirents,
                const char *path_or_url,
@@ -3907,6 +3981,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_ls(apr_hash_t **dirents,
               const char *path_or_url,
@@ -3961,6 +4036,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_cat(svn_stream_t *out,
                const char *path_or_url,
@@ -4332,6 +4408,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_info(const char *path_or_url,
                 const svn_opt_revision_t *peg_revision,
Index: subversion/include/svn_hash.h
===================================================================
--- subversion/include/svn_hash.h	(revision 32709)
+++ subversion/include/svn_hash.h	(working copy)
@@ -123,9 +123,11 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
-svn_error_t *svn_hash_read(apr_hash_t *hash,
-                           apr_file_t *srcfile,
-                           apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_hash_read(apr_hash_t *hash,
+              apr_file_t *srcfile,
+              apr_pool_t *pool);
 
 /**
  * This function behaves like svn_hash_write2(), but it only works
@@ -133,9 +135,11 @@
  *
  * @deprecated Provided for backward compatibility with the 1.0 API.
  */
-svn_error_t *svn_hash_write(apr_hash_t *hash,
-                            apr_file_t *destfile,
-                            apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_hash_write(apr_hash_t *hash,
+               apr_file_t *destfile,
+               apr_pool_t *pool);
 
 /** @} */
 
Index: subversion/include/svn_error.h
===================================================================
--- subversion/include/svn_error.h	(revision 32709)
+++ subversion/include/svn_error.h	(working copy)
@@ -195,9 +195,11 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
-void svn_handle_error(svn_error_t *error,
-                      FILE *stream,
-                      svn_boolean_t fatal);
+SVN_DEPRECATED
+void
+svn_handle_error(svn_error_t *error,
+                 FILE *stream,
+                 svn_boolean_t fatal);
 
 /**
  * Very basic default warning handler: print out the error @a error to the
Index: subversion/include/svn_utf.h
===================================================================
--- subversion/include/svn_utf.h	(revision 32709)
+++ subversion/include/svn_utf.h	(working copy)
@@ -28,6 +28,7 @@
 
 #include "svn_error.h"
 #include "svn_string.h"
+#include "svn_types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -89,11 +90,13 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
-svn_error_t *svn_utf_cstring_to_utf8_ex(const char **dest,
-                                        const char *src,
-                                        const char *frompage,
-                                        const char *convset_key,
-                                        apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_utf_cstring_to_utf8_ex(const char **dest,
+                           const char *src,
+                           const char *frompage,
+                           const char *convset_key,
+                           apr_pool_t *pool);
 
 
 /** Set @a *dest to a natively-encoded stringbuf from utf8 stringbuf @a src;
@@ -136,11 +139,13 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
-svn_error_t *svn_utf_cstring_from_utf8_ex(const char **dest,
-                                          const char *src,
-                                          const char *topage,
-                                          const char *convset_key,
-                                          apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_utf_cstring_from_utf8_ex(const char **dest,
+                             const char *src,
+                             const char *topage,
+                             const char *convset_key,
+                             apr_pool_t *pool);
 
 
 /** Return a fuzzily native-encoded C string from utf8 C string @a src,
Index: subversion/include/svn_auth.h
===================================================================
--- subversion/include/svn_auth.h	(revision 32709)
+++ subversion/include/svn_auth.h	(working copy)
@@ -770,8 +770,10 @@
  * @deprecated Provided for backwards compatibility with the 1.5 API.
  * @since New in 1.4.
  */
-void svn_auth_get_simple_provider(svn_auth_provider_object_t **provider,
-                                  apr_pool_t *pool);
+SVN_DEPRECATED
+void
+svn_auth_get_simple_provider(svn_auth_provider_object_t **provider,
+                             apr_pool_t *pool);
 
 
 #if (defined(WIN32) && !defined(__MINGW32__)) || defined(DOXYGEN)
@@ -906,7 +908,9 @@
  * @deprecated Provided for backwards compatibility with the 1.5 API.
  * @since New in 1.4.
  */
-void svn_auth_get_ssl_client_cert_pw_file_provider
+SVN_DEPRECATED
+void
+svn_auth_get_ssl_client_cert_pw_file_provider
   (svn_auth_provider_object_t **provider,
    apr_pool_t *pool);
 
Index: subversion/include/svn_ra.h
===================================================================
--- subversion/include/svn_ra.h	(revision 32709)
+++ subversion/include/svn_ra.h	(working copy)
@@ -32,6 +32,7 @@
 #include "svn_delta.h"
 #include "svn_auth.h"
 #include "svn_mergeinfo.h"
+#include "svn_types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -603,6 +604,7 @@
  * @since New in 1.3.
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_open2(svn_ra_session_t **session_p,
              const char *repos_URL,
@@ -616,6 +618,7 @@
  * @since New in 1.2.
  * @deprecated Provided for backward compatibility with the 1.2 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_open(svn_ra_session_t **session_p,
             const char *repos_URL,
@@ -784,6 +787,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_get_commit_editor2(svn_ra_session_t *session,
                           const svn_delta_editor_t **editor,
@@ -802,6 +806,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_get_commit_editor(svn_ra_session_t *session,
                          const svn_delta_editor_t **editor,
@@ -892,6 +897,7 @@
  *
  * @deprecated Provided for compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_get_dir(svn_ra_session_t *session,
                const char *path,
@@ -1003,6 +1009,7 @@
  *
  * @deprecated Provided for compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_do_update(svn_ra_session_t *session,
                  const svn_ra_reporter2_t **reporter,
@@ -1078,6 +1085,7 @@
  *
  * @deprecated Provided for compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_do_switch(svn_ra_session_t *session,
                  const svn_ra_reporter2_t **reporter,
@@ -1149,6 +1157,7 @@
  *
  * @deprecated Provided for compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_do_status(svn_ra_session_t *session,
                  const svn_ra_reporter2_t **reporter,
@@ -1240,6 +1249,7 @@
  *
  * @deprecated Provided for compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_do_diff2(svn_ra_session_t *session,
                 const svn_ra_reporter2_t **reporter,
@@ -1260,6 +1270,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_do_diff(svn_ra_session_t *session,
                const svn_ra_reporter2_t **reporter,
@@ -1353,6 +1364,7 @@
  * @since New in 1.2.
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_get_log(svn_ra_session_t *session,
                const apr_array_header_t *paths,
@@ -1415,6 +1427,7 @@
  * @deprecated Provided for backward compatibility with the 1.4 API.
  * @since New in 1.2.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_get_uuid(svn_ra_session_t *session,
                 const char **uuid,
@@ -1440,6 +1453,7 @@
  * @deprecated Provided for backward compatibility with the 1.4 API.
  * @since New in 1.2.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_get_repos_root(svn_ra_session_t *session,
                       const char **url,
@@ -1541,6 +1555,7 @@
  * @since New in 1.2.
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_get_file_revs(svn_ra_session_t *session,
                      const char *path,
@@ -1810,6 +1825,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_print_ra_libraries(svn_stringbuf_t **descriptions,
                           void *ra_baton,
@@ -2099,6 +2115,7 @@
 /** Initialize libsvn_ra_neon.
  *
  * @deprecated Provided for backward compatibility with the 1.1 API. */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_dav_init(int abi_version,
                 apr_pool_t *pool,
@@ -2107,6 +2124,7 @@
 /** Initialize libsvn_ra_local.
  *
  * @deprecated Provided for backward compatibility with the 1.1 API. */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_local_init(int abi_version,
                   apr_pool_t *pool,
@@ -2115,6 +2133,7 @@
 /** Initialize libsvn_ra_svn.
  *
  * @deprecated Provided for backward compatibility with the 1.1 API. */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_svn_init(int abi_version,
                 apr_pool_t *pool,
@@ -2124,6 +2143,7 @@
  *
  * @since New in 1.4.
  * @deprecated Provided for backward compatibility with the 1.1 API. */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_serf_init(int abi_version,
                  apr_pool_t *pool,
@@ -2136,7 +2156,9 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
-svn_error_t *svn_ra_init_ra_libs(void **ra_baton, apr_pool_t *pool);
+SVN_DEPRECATED
+svn_error_t *
+svn_ra_init_ra_libs(void **ra_baton, apr_pool_t *pool);
 
 /**
  * Return an RA vtable-@a library which can handle URL.  A number of
@@ -2146,6 +2168,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_get_ra_library(svn_ra_plugin_t **library,
                       void *ra_baton,
Index: subversion/include/svn_opt.h
===================================================================
--- subversion/include/svn_opt.h	(revision 32709)
+++ subversion/include/svn_opt.h	(working copy)
@@ -144,6 +144,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 const svn_opt_subcommand_desc_t *
 svn_opt_get_canonical_subcommand(const svn_opt_subcommand_desc_t *table,
                                  const char *cmd_name);
@@ -174,6 +175,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 const apr_getopt_option_t *
 svn_opt_get_option_from_code(int code,
                              const apr_getopt_option_t *option_table);
@@ -198,6 +200,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_boolean_t
 svn_opt_subcommand_takes_option2(const svn_opt_subcommand_desc2_t *command,
                                  int option_code);
@@ -212,6 +215,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_boolean_t
 svn_opt_subcommand_takes_option(const svn_opt_subcommand_desc_t *command,
                                 int option_code);
@@ -246,6 +250,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_opt_print_generic_help(const char *header,
                            const svn_opt_subcommand_desc_t *cmd_table,
@@ -291,6 +296,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 void
 svn_opt_subcommand_help2(const char *subcommand,
                          const svn_opt_subcommand_desc2_t *table,
@@ -304,6 +310,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 void
 svn_opt_subcommand_help(const char *subcommand,
                         const svn_opt_subcommand_desc_t *table,
@@ -492,6 +499,7 @@
  * @deprecated Provided for backward compatibility with the 1.5 API.
  * @see svn_client_args_to_target_array()
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_opt_args_to_target_array3(apr_array_header_t **targets_p,
                               apr_getopt_t *os,
@@ -507,6 +515,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_opt_args_to_target_array2(apr_array_header_t **targets_p,
                               apr_getopt_t *os,
@@ -528,6 +537,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.1 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_opt_args_to_target_array(apr_array_header_t **targets_p,
                              apr_getopt_t *os,
@@ -684,6 +694,7 @@
  * @deprecated Provided for backward compatibility with the 1.4 API.
  */
 
+SVN_DEPRECATED
 svn_error_t *
 svn_opt_print_help2(apr_getopt_t *os,
                     const char *pgm_name,
@@ -702,6 +713,7 @@
  *
  * @deprecated Provided for backward compatibility with the 1.3 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_opt_print_help(apr_getopt_t *os,
                    const char *pgm_name,