diagnostics: use diagnostic.h in fewer places

No functional change intended.

gcc/ChangeLog:
	* diagnostics/buffering.cc: Drop include of "diagnostic.h".
	* diagnostics/buffering.h: Likewise.
	* diagnostics/context.h (diagnostics::metadata): Add forward decl.
	* diagnostics/html-sink.cc: Drop include of "diagnostic.h".
	* diagnostics/lazy-paths.cc: Likewise.
	* diagnostics/macro-unwinding.cc: Likewise.
	* diagnostics/macro-unwinding.h (diagnostics:diagnostic_info): Add
	forward decl.
	* diagnostics/option-classifier.h: Include
	"diagnostics/option-id.h" and "diagnostics/kinds.h".
	(diagnostics:diagnostic_info): Add forward decl.
	* diagnostics/output-spec.cc: Drop include of "diagnostic.h".
	* diagnostics/paths-output.cc: Likewise.
	* diagnostics/paths.cc: Likewise.
	* diagnostics/sarif-sink.cc: Likewise.
	* diagnostics/selftest-context.cc: Likewise.
	* diagnostics/selftest-paths.cc: Likewise.
	* diagnostics/source-printing-options.h: Include
	"rich-location.h".
	* diagnostics/text-sink.cc: Drop include of "diagnostic.h".

Signed-off-by: David Malcolm <dmalcolm@redhat.com>

gcc/diagnostics/buffering.cc

@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/buffering.h"
 #include "diagnostics/sink.h"
 #include "diagnostics/dumping.h"

gcc/diagnostics/buffering.h

@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_DIAGNOSTICS_BUFFERING_H
 #define GCC_DIAGNOSTICS_BUFFERING_H
 
-#include "diagnostic.h"
+#include "diagnostics/counters.h"
 
 namespace diagnostics {
 

gcc/diagnostics/context.h

@@ -47,6 +47,7 @@ namespace diagnostics {
   class diagram;
   class sink;
     class text_sink;
+  class metadata;
 
   class source_effect_info;
 

gcc/diagnostics/html-sink.cc

@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/metadata.h"
 #include "diagnostics/sink.h"
 #include "diagnostics/html-sink.h"

gcc/diagnostics/lazy-paths.cc

@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/lazy-paths.h"
 #include "selftest.h"
 #include "diagnostics/selftest-context.h"

gcc/diagnostics/macro-unwinding.cc

@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
-#include "diagnostic.h"
 #include "diagnostics/macro-unwinding.h"
 #include "diagnostics/text-sink.h"
 #include "intl.h"

gcc/diagnostics/macro-unwinding.h

@@ -22,6 +22,8 @@ along with GCC; see the file COPYING3.  If not see
 
 namespace diagnostics {
 
+struct diagnostic_info;
+
 extern void virt_loc_aware_text_finalizer (text_sink &,
 					   const diagnostic_info *);
 

gcc/diagnostics/option-classifier.h

@@ -20,10 +20,14 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_DIAGNOSTICS_OPTION_CLASSIFIER_H
 #define GCC_DIAGNOSTICS_OPTION_CLASSIFIER_H
 
+#include "diagnostics/option-id.h"
+#include "diagnostics/kinds.h"
+
 namespace diagnostics {
 
 /*  Forward declarations.  */
 class context;
+struct diagnostic_info;
 
 /* A stack of sets of classifications: each entry in the stack is
    a mapping from option index to diagnostic severity that can be changed

gcc/diagnostics/output-spec.cc

@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "version.h"
 #include "intl.h"
-#include "diagnostic.h"
 #include "diagnostics/color.h"
 #include "diagnostics/sink.h"
 #include "diagnostics/html-sink.h"

gcc/diagnostics/paths-output.cc

@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/macro-unwinding.h"
 #include "intl.h"
 #include "diagnostics/paths.h"

gcc/diagnostics/paths.cc

@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/paths.h"
 #include "diagnostics/state-graphs.h"
 

gcc/diagnostics/sarif-sink.cc

@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/metadata.h"
 #include "diagnostics/digraphs.h"
 #include "diagnostics/state-graphs.h"

gcc/diagnostics/selftest-context.cc

@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic.h"
 #include "diagnostics/sink.h"
 #include "selftest.h"
 #include "diagnostics/selftest-context.h"

gcc/diagnostics/selftest-paths.cc

@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "version.h"
-#include "diagnostic.h"
 #include "diagnostics/selftest-paths.h"
 
 #if CHECKING_P

gcc/diagnostics/source-printing-options.h

@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_DIAGNOSTICS_SOURCE_PRINTING_OPTIONS_H
 #define GCC_DIAGNOSTICS_SOURCE_PRINTING_OPTIONS_H
 
+#include "rich-location.h"
+
 namespace diagnostics {
 
 /* A bundle of options relating to printing the user's source code

gcc/diagnostics/text-sink.cc

@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "version.h"
 #include "intl.h"
-#include "diagnostic.h"
 #include "diagnostics/color.h"
 #include "diagnostics/url.h"
 #include "diagnostics/metadata.h"