Clean up unused includes

libaegisub/ass/dialogue_parser.cpp

@@ -18,9 +18,9 @@
 
 #include "libaegisub/spellchecker.h"
 
-#include "iconv.h"
-
-#include <boost/locale/boundary.hpp>
+#include <boost/locale/boundary/index.hpp>
+#include <boost/locale/boundary/segment.hpp>
+#include <boost/locale/boundary/types.hpp>
 
 namespace {
 

libaegisub/common/cajun/elements.cpp

@@ -9,8 +9,7 @@ Author: Terry Caton
 
 #include "libaegisub/cajun/visitor.h"
 
-#include <algorithm>
-#include <cassert>
+#include <utility>
 
 namespace {
 	using namespace json;

libaegisub/common/calltip_provider.cpp

@@ -18,8 +18,6 @@
 
 #include "libaegisub/ass/dialogue_parser.h"
 
-#include <boost/range.hpp>
-
 namespace {
 	struct proto_lit {
 		const char *name;

libaegisub/common/charset.cpp

@@ -28,7 +28,6 @@
 
 #include "../../vendor/universalchardet/nscore.h"
 #include "../../vendor/universalchardet/nsUniversalDetector.h"
-#include "../../vendor/universalchardet/nsMBCSGroupProber.h"
 #include "../../vendor/universalchardet/nsCharSetProber.h"
 
 namespace {

libaegisub/common/charset_6937.cpp

@@ -18,12 +18,10 @@
 
 #include "charset_6937.h"
 
-#include <algorithm>
 #include <cerrno>
-
 #include <iconv.h>
 
-#include <boost/range/algorithm.hpp>
+#include <boost/range/algorithm/lower_bound.hpp>
 
 namespace {
 

libaegisub/common/file_mapping.cpp

@@ -20,7 +20,7 @@
 #include "libaegisub/make_unique.h"
 #include "libaegisub/util.h"
 
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/interprocess/mapped_region.hpp>
 #include <limits>
 

libaegisub/common/fs.cpp

@@ -17,12 +17,11 @@
 #include "libaegisub/fs.h"
 
 #include "libaegisub/access.h"
-#include "libaegisub/exception.h"
 #include "libaegisub/log.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #define BOOST_NO_SCOPED_ENUMS
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
 #undef BOOST_NO_SCOPED_ENUMS
 
 namespace bfs = boost::filesystem;

libaegisub/common/hotkey.cpp

@@ -19,7 +19,6 @@
 #include "libaegisub/hotkey.h"
 
 #include "libaegisub/cajun/writer.h"
-#include "libaegisub/exception.h"
 #include "libaegisub/io.h"
 #include "libaegisub/json.h"
 #include "libaegisub/log.h"
@@ -27,7 +26,6 @@
 #include <algorithm>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/range/adaptor/map.hpp>
-#include <cmath>
 #include <tuple>
 
 namespace agi {

libaegisub/common/io.cpp

@@ -22,11 +22,10 @@
 #include "libaegisub/fs.h"
 #include "libaegisub/log.h"
 #include "libaegisub/make_unique.h"
-#include "libaegisub/path.h"
 #include "libaegisub/util.h"
 
-#include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/operations.hpp>
 
 namespace agi {
 	namespace io {

libaegisub/common/json.cpp

@@ -18,10 +18,10 @@
 
 #include "libaegisub/json.h"
 
+#include "libaegisub/cajun/reader.h"
 #include "libaegisub/fs.h"
 #include "libaegisub/io.h"
 #include "libaegisub/log.h"
-#include "libaegisub/make_unique.h"
 
 #include <boost/interprocess/streams/bufferstream.hpp>
 

libaegisub/common/keyframe.cpp

@@ -19,13 +19,11 @@
 
 #include "libaegisub/keyframe.h"
 
-#include <algorithm>
-
 #include "libaegisub/io.h"
 #include "libaegisub/line_iterator.h"
 
 #include <boost/algorithm/string/predicate.hpp>
-#include <boost/range/algorithm.hpp>
+#include <boost/range/algorithm/copy.hpp>
 
 namespace {
 std::vector<int> agi_keyframes(std::istream &file) {

libaegisub/common/log.cpp

@@ -12,25 +12,18 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-/// @file log.cpp
-/// @brief Logging
-/// @ingroup libaegisub
-
 #include "libaegisub/log.h"
 
 #include "libaegisub/cajun/elements.h"
 #include "libaegisub/cajun/writer.h"
 #include "libaegisub/dispatch.h"
-#include "libaegisub/io.h"
+#include "libaegisub/time.h"
 #include "libaegisub/util.h"
 
-#include <algorithm>
-#include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
-#include <boost/range/algorithm.hpp>
-#include <cstring>
-#include <functional>
-#include <mutex>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/range/algorithm/remove_if.hpp>
 
 namespace agi {
 	namespace log {

libaegisub/common/option.cpp

@@ -30,7 +30,6 @@
 #include "option_visit.h"
 
 #include <boost/interprocess/streams/bufferstream.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <cassert>
 #include <memory>
 

libaegisub/common/option_visit.cpp

@@ -20,9 +20,7 @@
 #include "option_visit.h"
 
 #include <cassert>
-#include <cmath>
 
-#include <libaegisub/color.h>
 #include <libaegisub/log.h>
 #include <libaegisub/option_value.h>
 #include <libaegisub/make_unique.h>

libaegisub/common/option_visit.h

@@ -22,7 +22,6 @@
 #include "libaegisub/cajun/visitor.h"
 
 #include <memory>
-#include <vector>
 
 namespace agi {
 

libaegisub/common/path.cpp

@@ -21,10 +21,8 @@
 #include "libaegisub/path.h"
 
 #include "libaegisub/fs.h"
-#include "libaegisub/make_unique.h"
 
 #include <boost/algorithm/string/predicate.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/range/distance.hpp>
 
 namespace {

libaegisub/common/thesaurus.cpp

@@ -23,7 +23,7 @@
 #include "libaegisub/line_iterator.h"
 #include "libaegisub/make_unique.h"
 
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/split.hpp>
 #include <boost/interprocess/streams/bufferstream.hpp>
 #include <boost/phoenix/operator/comparison.hpp>
 #include <boost/phoenix/core/argument.hpp>

libaegisub/common/util.cpp

@@ -17,11 +17,9 @@
 #include "libaegisub/util.h"
 #include "libaegisub/util_osx.h"
 
-#include "libaegisub/exception.h"
-
 #include <boost/locale/boundary.hpp>
 #include <boost/locale/conversion.hpp>
-#include <boost/range/algorithm_ext.hpp>
+#include <boost/range/distance.hpp>
 #include <ctime>
 
 namespace {

libaegisub/common/vfr.cpp

@@ -21,7 +21,6 @@
 #include "libaegisub/charset.h"
 #include "libaegisub/io.h"
 #include "libaegisub/line_iterator.h"
-#include "libaegisub/scoped_ptr.h"
 
 #include <algorithm>
 #include <boost/interprocess/streams/bufferstream.hpp>
@@ -30,7 +29,6 @@
 #include <functional>
 #include <iterator>
 #include <list>
-#include <numeric>
 
 namespace {
 

libaegisub/include/libaegisub/access.h

@@ -12,16 +12,9 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-/// @file access.h
-/// @brief Public interface for access methods.
-/// @ingroup libaegisub
-
-#include <libaegisub/exception.h>
 #include <libaegisub/fs_fwd.h>
 
-namespace agi {
-	namespace acs {
-
+namespace agi { namespace acs {
 enum Type {
 	FileRead,
 	DirRead,
@@ -36,6 +29,4 @@ inline void CheckFileWrite(fs::path const& file) { Check(file, acs::FileWrite);
 
 inline void CheckDirRead(fs::path const& dir) { Check(dir, acs::DirRead); }
 inline void CheckDirWrite(fs::path const& dir) { Check(dir, acs::DirWrite); }
-
-	} // namespace axs
-} // namespace agi
+} }

libaegisub/include/libaegisub/cajun/elements.h

@@ -10,7 +10,6 @@ Author: Terry Caton
 
 #include <cstdint>
 #include <deque>
-#include <list>
 #include <map>
 #include <memory>
 #include <string>
@@ -25,9 +24,6 @@ struct Visitor;
 struct ConstVisitor;
 class UnknownElement;
 
-template <typename ValueTypeT>
-class TrivialType_T;
-
 typedef int64_t Integer;
 typedef double Double;
 typedef bool Boolean;

libaegisub/include/libaegisub/hotkey.h

@@ -18,7 +18,6 @@
 
 #include <boost/filesystem/path.hpp>
 #include <map>
-#include <memory>
 #include <string>
 #include <vector>
 

libaegisub/include/libaegisub/json.h

@@ -16,14 +16,10 @@
 /// @brief Parse JSON files and return json::UnknownElement
 /// @ingroup libaegisub io
 
-#include <libaegisub/cajun/reader.h>
 #include <libaegisub/cajun/elements.h>
 #include <libaegisub/fs_fwd.h>
 
-#include <memory>
-
-namespace agi {
-	namespace json_util {
+namespace agi { namespace json_util {
 
 /// Parse a JSON stream.
 /// @param stream JSON stream to parse
@@ -41,5 +37,4 @@ json::UnknownElement file(agi::fs::path const& file);
 /// @return json::UnknownElement
 json::UnknownElement file(agi::fs::path const& file, std::pair<const char *, size_t> default_config);
 
-	} // namespace json_util
-} // namespace agi
+} }

libaegisub/include/libaegisub/kana_table.h

@@ -14,7 +14,8 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-#include <boost/range/iterator_range.hpp>
+#include <boost/range/iterator_range_core.hpp>
+#include <string>
 #include <vector>
 
 namespace agi {

libaegisub/include/libaegisub/keyframe.h

@@ -12,18 +12,12 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-/// @file keyframe.h
-/// @see keyframe.cpp
-/// @ingroup libaegisub
-///
-
 #include <vector>
 
 #include "exception.h"
 #include "fs_fwd.h"
 
 namespace agi {
-	namespace vfr { class Framerate; }
 	namespace keyframe {
 		/// @brief Load a keyframe file
 		/// @param filename File to load

libaegisub/include/libaegisub/log.h

@@ -19,7 +19,6 @@
 #include <libaegisub/fs_fwd.h>
 #include <libaegisub/time.h>
 
-#include <ctime>
 #include <boost/circular_buffer.hpp>
 #include <boost/interprocess/streams/bufferstream.hpp>
 #include <iosfwd>

libaegisub/include/libaegisub/path.h

@@ -18,7 +18,6 @@
 /// @brief Common paths.
 /// @ingroup libaegisub
 
-#include <libaegisub/exception.h>
 #include <libaegisub/fs_fwd.h>
 
 #include <boost/filesystem/path.hpp>

libaegisub/include/libaegisub/thesaurus.h

@@ -12,10 +12,6 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-/// @file thesaurus.h
-/// @brief MyThes-compatible thesaurus implementation
-/// @ingroup libaegisub thesaurus
-
 #include "fs_fwd.h"
 
 #include <boost/container/flat_map.hpp>

libaegisub/include/libaegisub/util.h

@@ -12,17 +12,11 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-/// @file util.h
-/// @brief Public interface for general utilities.
-/// @ingroup libaegisub
-
 #include <libaegisub/time.h>
 
 #include <algorithm>
 #include <boost/range/irange.hpp>
-#include <cstdint>
 #include <string>
-#include <memory>
 
 struct tm;
 

libaegisub/include/libaegisub/vfr.h

@@ -12,16 +12,10 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-/// @file vfr.h
-/// @brief Framerate handling of all sorts
-/// @ingroup libaegisub video_input
-
 #pragma once
 
-#include <string>
-#include <vector>
-
 #include <cstdint>
+#include <vector>
 
 #include <libaegisub/exception.h>
 #include <libaegisub/fs_fwd.h>

libaegisub/lua/modules/lfs.cpp

@@ -16,7 +16,8 @@
 
 #include "libaegisub/lua/utils.h"
 
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/range/size.hpp>
 
 namespace {

libaegisub/lua/modules/unicode.cpp

@@ -16,7 +16,7 @@
 
 #include "libaegisub/lua/utils.h"
 
-#include <boost/locale.hpp>
+#include <boost/locale/conversion.hpp>
 
 namespace {
 using namespace agi::lua;

libaegisub/unix/fs.cpp

@@ -18,7 +18,8 @@
 #include "libaegisub/fs.h"
 #include "libaegisub/io.h"
 
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <istream>

libaegisub/unix/log.cpp

@@ -12,22 +12,14 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-/// @file log.cpp
-/// @brief Unix logging
-/// @ingroup libaegisub
-
 #include <cstdio>
 #include <ctime>
-#include <cstring>
 
 #include <unistd.h>
 
 #include "libaegisub/log.h"
-#include "libaegisub/make_unique.h"
-
-namespace agi {
-	namespace log {
 
+namespace agi { namespace log {
 void EmitSTDOUT::log(SinkMessage *sm) {
 	tm tmtime;
 	localtime_r(&sm->tv.tv_sec, &tmtime);
@@ -47,6 +39,4 @@ void EmitSTDOUT::log(SinkMessage *sm) {
 	if (!isatty(fileno(stdout)))
 		fflush(stdout);
 }
-
-	} // namespace log
-} // namespace agi
+} }

libaegisub/unix/path.cpp

@@ -16,9 +16,10 @@
 
 #include <libaegisub/path.h>
 
+#include <libaegisub/exception.h>
 #include <libaegisub/util_osx.h>
 
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <pwd.h>
 
 namespace {
@@ -38,7 +39,6 @@ std::string home_dir() {
 }
 
 namespace agi {
-
 void Path::FillPlatformSpecificPaths() {
 #ifndef __APPLE__
 	agi::fs::path home = home_dir();

libaegisub/unix/util.cpp

@@ -12,12 +12,6 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-/// @file util.cpp
-/// @brief Unix utility methods.
-/// @ingroup libaegisub unix
-
-#include "libaegisub/make_unique.h"
-
 #include <boost/thread.hpp>
 
 namespace agi { namespace util {

libaegisub/windows/path_win.cpp

@@ -20,6 +20,7 @@
 
 #include <libaegisub/path.h>
 
+#include <libaegisub/exception.h>
 #include <libaegisub/make_unique.h>
 
 #include <boost/filesystem.hpp>

src/ass_attachment.h

@@ -19,7 +19,6 @@
 #include <libaegisub/fs_fwd.h>
 
 #include <boost/flyweight.hpp>
-#include <vector>
 
 /// @class AssAttachment
 class AssAttachment final : public AssEntry {

src/ass_dialogue.h

@@ -36,8 +36,6 @@
 #include "ass_override.h"
 #include "ass_time.h"
 
-#include <libaegisub/exception.h>
-
 #include <array>
 #include <boost/flyweight.hpp>
 #include <vector>

src/ass_exporter.h

@@ -39,7 +39,6 @@
 #include <vector>
 
 class AssExportFilter;
-class AssFile;
 namespace agi { struct Context; }
 class wxSizer;
 class wxWindow;

src/ass_file.cpp

@@ -22,9 +22,6 @@
 #include "ass_style.h"
 #include "ass_style_storage.h"
 #include "options.h"
-#include "utils.h"
-
-#include <libaegisub/fs.h>
 
 #include <algorithm>
 #include <boost/algorithm/string/case_conv.hpp>

src/ass_karaoke.cpp

@@ -17,14 +17,10 @@
 #include "ass_karaoke.h"
 
 #include "ass_dialogue.h"
-#include "ass_file.h"
-#include "include/aegisub/context.h"
-#include "selection_controller.h"
 
 #include <boost/format.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/trim.hpp>
-#include <wx/intl.h>
 
 std::string AssKaraoke::Syllable::GetText(bool k_tag) const {
 	std::string ret;

src/ass_karaoke.h

@@ -15,7 +15,6 @@
 // Aegisub Project http://www.aegisub.org/
 
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
 

src/ass_parser.h

@@ -12,8 +12,6 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-#include <array>
-#include <map>
 #include <memory>
 
 class AssAttachment;

src/ass_style.cpp

@@ -39,12 +39,9 @@
 
 #include <libaegisub/split.h>
 
-#include <algorithm>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
-#include <cctype>
-
 #include <wx/intl.h>
 
 AssStyle::AssStyle() {

src/ass_style.h

@@ -27,17 +27,13 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file ass_style.h
-/// @see ass_style.cpp
-/// @ingroup subs_storage
-///
-
 #include "ass_entry.h"
 
 #include <libaegisub/color.h>
 
 #include <array>
-#include <wx/arrstr.h>
+
+class wxArrayString;
 
 class AssStyle final : public AssEntry, public AssEntryListHook {
 	std::string data;

src/async_video_provider.cpp

@@ -20,15 +20,10 @@
 #include "ass_file.h"
 #include "export_fixstyle.h"
 #include "include/aegisub/subtitles_provider.h"
-#include "video_frame.h"
 #include "video_provider_manager.h"
 
 #include <libaegisub/dispatch.h>
 
-#include <condition_variable>
-#include <functional>
-#include <mutex>
-
 enum {
 	NEW_SUBS_FILE = -1,
 	SUBS_FILE_ALREADY_LOADED = -2

src/audio_box.cpp

@@ -27,28 +27,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio_box.cpp
-/// @brief The entire audio area in the main UI, containing display and related toolbars
-/// @ingroup audio_ui
-///
-
-#include <cmath>
-
-#include <wx/bmpbuttn.h>
-#include <wx/panel.h>
-#include <wx/slider.h>
-#include <wx/scrolbar.h>
-#include <wx/sizer.h>
-#include <wx/slider.h>
-#include <wx/string.h>
-#include <wx/statline.h>
-#include <wx/textctrl.h>
-#include <wx/tglbtn.h>
-#include <wx/toolbar.h>
-#include <wx/laywin.h> // Keep this last so wxSW_3D is set.
-
-#include <libaegisub/log.h>
-
 #include "audio_box.h"
 
 #include "include/aegisub/context.h"
@@ -58,14 +36,20 @@
 #include "audio_display.h"
 #include "audio_karaoke.h"
 #include "audio_timing.h"
-#include "command/command.h"
-#include "libresrc/libresrc.h"
 #include "options.h"
 #include "project.h"
 #include "toggle_bitmap.h"
-#include "selection_controller.h"
 #include "utils.h"
 
+#include <cmath>
+#include <wx/panel.h>
+#include <wx/slider.h>
+#include <wx/scrolbar.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/string.h>
+#include <wx/toolbar.h>
+
 enum {
 	Audio_Horizontal_Zoom = 1600,
 	Audio_Vertical_Zoom,

src/audio_box.h

@@ -27,11 +27,7 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio_box.h
-/// @see audio_box.cpp
-/// @ingroup audio_ui
-///
-
+#include <wx/defs.h>
 #include <wx/sashwin.h>
 
 #include <libaegisub/signal.h>

src/audio_colorscheme.cpp

@@ -27,13 +27,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio_colorscheme.cpp
-/// @ingroup audio_ui
-///
-/// Manage colour schemes for the audio display
-
-#include <algorithm>
-
 #include "audio_colorscheme.h"
 
 #include "audio_rendering_style.h"

src/audio_controller.cpp

@@ -35,8 +35,6 @@
 #include "include/aegisub/context.h"
 #include "options.h"
 #include "project.h"
-#include "selection_controller.h"
-#include "utils.h"
 
 #include <algorithm>
 

src/audio_controller.h

@@ -28,7 +28,6 @@
 // Aegisub Project http://www.aegisub.org/
 
 #include <libaegisub/exception.h>
-#include <libaegisub/fs_fwd.h>
 #include <libaegisub/signal.h>
 
 #include <cstdint>

src/audio_display.cpp

@@ -28,28 +28,20 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio_display.cpp
-/// @brief Display audio in the main UI
-/// @ingroup audio_ui
-///
-
 #include "audio_display.h"
 
 #include "ass_time.h"
-#include "audio_colorscheme.h"
 #include "audio_controller.h"
 #include "audio_renderer.h"
 #include "audio_renderer_spectrum.h"
 #include "audio_renderer_waveform.h"
 #include "audio_timing.h"
-#include "block_cache.h"
 #include "compat.h"
 #include "include/aegisub/audio_provider.h"
 #include "include/aegisub/context.h"
 #include "include/aegisub/hotkey.h"
 #include "options.h"
 #include "project.h"
-#include "selection_controller.h"
 #include "utils.h"
 #include "video_controller.h"
 
@@ -58,7 +50,6 @@
 #include <algorithm>
 
 #include <wx/dcbuffer.h>
-#include <wx/dcclient.h>
 #include <wx/mousestate.h>
 
 namespace {

src/audio_display.h

@@ -27,11 +27,8 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-
-/// @file audio_display.h
-/// @see audio_display.cpp
-/// @ingroup audio_ui
-///
+//
+#include <libaegisub/signal.h>
 
 #include <chrono>
 #include <cstdint>
@@ -43,14 +40,11 @@
 #include <wx/timer.h>
 #include <wx/window.h>
 
-#include <libaegisub/signal.h>
-
 namespace agi { struct Context; }
 
 class AudioController;
 class AudioRenderer;
 class AudioRendererBitmapProvider;
-class AudioKaraoke;
 class AudioProvider;
 class TimeRange;
 
@@ -58,7 +52,6 @@ class TimeRange;
 namespace {
 	class AudioDisplayScrollbar;
 	class AudioDisplayTimeline;
-	class AudioDisplaySelection;
 }
 class AudioMarkerInteractionObject;
 

src/audio_karaoke.cpp

@@ -40,7 +40,6 @@
 
 #include <algorithm>
 #include <boost/locale/boundary.hpp>
-#include <numeric>
 #include <wx/bmpbuttn.h>
 #include <wx/button.h>
 #include <wx/dcclient.h>

src/audio_marker.h

@@ -16,18 +16,18 @@
 
 #pragma once
 
+#include "time_range.h"
+
 #include <libaegisub/signal.h>
 
 #include <memory>
 #include <vector>
-
 #include <wx/string.h>
 
 class AudioMarkerKeyframe;
 class Pen;
 class Project;
 class VideoController;
-class TimeRange;
 class VideoPositionMarker;
 class wxPen;
 
@@ -36,8 +36,6 @@ namespace agi {
 	struct Context;
 }
 
-#include "time_range.h"
-
 /// @class AudioMarker
 /// @brief A marker on the audio display
 class AudioMarker {

src/audio_provider.cpp

@@ -27,23 +27,15 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio_provider.cpp
-/// @brief Baseclass for audio providers
-/// @ingroup audio_input
-///
-
 #include "include/aegisub/audio_provider.h"
 
 #include "audio_controller.h"
 #include "factory_manager.h"
-#include "frame_main.h"
 #include "options.h"
 #include "utils.h"
 
-#include <libaegisub/background_runner.h>
 #include <libaegisub/fs.h>
 #include <libaegisub/log.h>
-#include <libaegisub/make_unique.h>
 
 #include <boost/range/iterator_range.hpp>
 

src/audio_provider_dummy.cpp

@@ -27,17 +27,12 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio_provider_dummy.cpp
-/// @brief Dummy (silence or noise) audio provider
-/// @ingroup audio_input
-///
-
 #include "include/aegisub/audio_provider.h"
 
-#include <libaegisub/fs.h>
 #include <libaegisub/make_unique.h>
 
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem/path.hpp>
 
 /*
  * scheme            ::= "dummy-audio" ":" signal-specifier "?" signal-parameters

src/audio_provider_hd.cpp

@@ -17,7 +17,6 @@
 #include "include/aegisub/audio_provider.h"
 
 #include "audio_controller.h"
-#include "compat.h"
 #include "options.h"
 
 #include <libaegisub/file_mapping.h>
@@ -25,13 +24,10 @@
 #include <libaegisub/path.h>
 #include <libaegisub/make_unique.h>
 
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/format.hpp>
 #include <boost/interprocess/detail/os_thread_functions.hpp>
 #include <thread>
-#include <wx/intl.h>
 
 namespace {
 class HDAudioProvider final : public AudioProviderWrapper {

src/audio_provider_pcm.cpp

@@ -27,19 +27,12 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio_provider_pcm.cpp
-/// @brief PCM WAV and WAV64 audio provider
-/// @ingroup audio_input
-///
-
 #include "include/aegisub/audio_provider.h"
 
 #include "audio_controller.h"
-#include "utils.h"
 
 #include <libaegisub/file_mapping.h>
 #include <libaegisub/fs.h>
-#include <libaegisub/log.h>
 #include <libaegisub/make_unique.h>
 
 #include <vector>

src/audio_provider_ram.cpp

@@ -35,14 +35,12 @@
 #include "include/aegisub/audio_provider.h"
 
 #include "audio_controller.h"
-#include "compat.h"
 
 #include <libaegisub/make_unique.h>
 
 #include <array>
 #include <boost/container/stable_vector.hpp>
 #include <thread>
-#include <wx/intl.h>
 
 namespace {
 

src/audio_renderer.cpp

@@ -38,10 +38,7 @@
 #include <libaegisub/make_unique.h>
 
 #include <algorithm>
-#include <functional>
-
-#include <wx/bitmap.h>
-#include <wx/dcmemory.h>
+#include <wx/dc.h>
 
 namespace {
 	template<typename T>

src/audio_renderer.h

@@ -27,29 +27,20 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio_renderer.h
-/// @see audio_renderer.cpp
-/// @ingroup audio_ui
-///
-/// Base classes for audio renderers (spectrum, waveform, ...)
-
 #pragma once
 
 #include <memory>
 #include <vector>
 
-#include <wx/dc.h>
 #include <wx/gdicmn.h>
 
 #include "audio_rendering_style.h"
 #include "block_cache.h"
 
-// Some forward declarations for outside stuff
 class AudioProvider;
-
-// Forwards declarations for internal stuff
 class AudioRendererBitmapProvider;
 class AudioRenderer;
+class wxDC;
 
 /// @class AudioRendererBitmapCacheBitmapFactory
 /// @brief Produces wxBitmap objects for DataBlockCache storage for the audio renderer

src/audio_renderer_spectrum.cpp

@@ -39,15 +39,12 @@
 #include "fft.h"
 #endif
 #include "include/aegisub/audio_provider.h"
-#include "utils.h"
 
-#include <libaegisub/log.h>
 #include <libaegisub/make_unique.h>
 
 #include <algorithm>
 
 #include <wx/image.h>
-#include <wx/rawbmp.h>
 #include <wx/dcmemory.h>
 
 /// Allocates blocks of derived data for the audio spectrum

src/audio_renderer_waveform.cpp

@@ -27,23 +27,16 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio_renderer_waveform.cpp
-/// @ingroup audio_ui
-///
-/// Render a waveform display of PCM audio data
-
 #include "audio_renderer_waveform.h"
 
+#include "audio_colorscheme.h"
+#include "include/aegisub/audio_provider.h"
+#include "options.h"
+
 #include <algorithm>
 
 #include <wx/dcmemory.h>
 
-#include "audio_colorscheme.h"
-#include "block_cache.h"
-#include "colorspace.h"
-#include "include/aegisub/audio_provider.h"
-#include "options.h"
-
 enum {
 	/// Only render the peaks
 	Waveform_MaxOnly = 0,

src/audio_renderer_waveform.h

@@ -27,19 +27,14 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-/// @file audio_renderer_waveform.h
-/// @see audio_renderer_waveform.cpp
-/// @ingroup audio_ui
-///
-/// Render a waveform display of PCM audio data
+#include "audio_renderer.h"
 
-#include <cstdint>
 #include <vector>