Index: src/wp-includes/default-filters.php
===================================================================
--- src/wp-includes/default-filters.php	(revision 25419)
+++ src/wp-includes/default-filters.php	(working copy)
@@ -245,6 +245,7 @@
 add_action( 'admin_print_footer_scripts', '_wp_footer_scripts'                             );
 add_action( 'admin_print_styles',         'print_admin_styles',                      20    );
 add_action( 'init',                       'smilies_init',                             5    );
+add_action( 'init',                       'add_shortcodes',                           0    );
 add_action( 'plugins_loaded',             'wp_maybe_load_widgets',                    0    );
 add_action( 'plugins_loaded',             'wp_maybe_load_embeds',                     0    );
 add_action( 'shutdown',                   'wp_ob_end_flush_all',                      1    );
Index: src/wp-includes/media.php
===================================================================
--- src/wp-includes/media.php	(revision 25419)
+++ src/wp-includes/media.php	(working copy)
@@ -607,9 +607,6 @@
 	remove_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
 }
 
-add_shortcode('wp_caption', 'img_caption_shortcode');
-add_shortcode('caption', 'img_caption_shortcode');
-
 /**
  * The Caption shortcode.
  *
@@ -656,8 +653,6 @@
 	. do_shortcode( $content ) . '<p class="wp-caption-text">' . $caption . '</p></div>';
 }
 
-add_shortcode('gallery', 'gallery_shortcode');
-
 /**
  * The Gallery shortcode.
  *
@@ -946,7 +941,6 @@
 
 	return apply_filters( 'wp_audio_shortcode', $html, $atts, $audio, $post_id, $library );
 }
-add_shortcode( 'audio', apply_filters( 'wp_audio_shortcode_handler', 'wp_audio_shortcode' ) );
 
 /**
  * Return a filtered list of WP-supported video formats
@@ -1090,7 +1084,6 @@
 	$html = sprintf( '<div style="width: %dpx; max-width: 100%%;">%s</div>', $width, $html );
 	return apply_filters( 'wp_video_shortcode', $html, $atts, $video, $post_id, $library );
 }
-add_shortcode( 'video', apply_filters( 'wp_video_shortcode_handler', 'wp_video_shortcode' ) );
 
 /**
  * Display previous image link that has the same post parent.
@@ -2027,3 +2020,16 @@
 	$gallery = get_post_gallery( $post, false );
 	return empty( $gallery['src'] ) ? array() : $gallery['src'];
 }
+
+/**
+ * Add default shortcodes.
+ *
+ * @since 3.7.0
+ */
+function add_shortcodes() {
+	add_shortcode( 'wp_caption', 'img_caption_shortcode' );
+	add_shortcode( 'caption',    'img_caption_shortcode' );
+	add_shortcode( 'gallery',    'gallery_shortcode' );
+	add_shortcode( 'audio',      apply_filters( 'wp_audio_shortcode_handler', 'wp_audio_shortcode' ) );
+	add_shortcode( 'video',      apply_filters( 'wp_video_shortcode_handler', 'wp_video_shortcode' ) );
+}