Run IWYU

include/yaml-cpp/node/convert.h

@@ -7,16 +7,25 @@
 #pragma once
 #endif
 
-#include "yaml-cpp/binary.h"
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/iterator.h"
-#include "yaml-cpp/null.h"
 #include <limits>
 #include <list>
 #include <map>
 #include <sstream>
 #include <vector>
 
+#include "yaml-cpp/binary.h"
+#include "yaml-cpp/node/impl.h"
+#include "yaml-cpp/node/iterator.h"
+#include "yaml-cpp/node/node.h"
+#include "yaml-cpp/node/type.h"
+#include "yaml-cpp/null.h"
+
+namespace YAML {
+class Binary;
+struct _Null;
+template <typename T> struct convert;
+}  // namespace YAML
+
 namespace YAML {
 namespace conversion {
 inline bool IsInfinity(const std::string& input) {

include/yaml-cpp/node/detail/memory.h

@@ -7,9 +7,17 @@
 #pragma once
 #endif
 
-#include "yaml-cpp/node/ptr.h"
-#include <set>
 #include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <set>
+
+#include "yaml-cpp/node/ptr.h"
+
+namespace YAML {
+namespace detail {
+class node;
+}  // namespace detail
+}  // namespace YAML
 
 namespace YAML {
 namespace detail {

include/yaml-cpp/node/detail/node_data.h

@@ -7,10 +7,7 @@
 #pragma once
 #endif
 
-#include "yaml-cpp/dll.h"
+#include <boost/noncopyable.hpp>
-#include "yaml-cpp/node/iterator.h"
-#include "yaml-cpp/node/ptr.h"
-#include "yaml-cpp/node/type.h"
 #include <boost/utility.hpp>
 #include <list>
 #include <map>
@@ -18,6 +15,18 @@
 #include <utility>
 #include <vector>
 
+#include "yaml-cpp/dll.h"
+#include "yaml-cpp/node/detail/node_iterator.h"
+#include "yaml-cpp/node/iterator.h"
+#include "yaml-cpp/node/ptr.h"
+#include "yaml-cpp/node/type.h"
+
+namespace YAML {
+namespace detail {
+class node;
+}  // namespace detail
+}  // namespace YAML
+
 namespace YAML {
 namespace detail {
 class node_data : private boost::noncopyable {

include/yaml-cpp/node/node.h

@@ -7,12 +7,21 @@
 #pragma once
 #endif
 
+#include <stdexcept>
+
 #include "yaml-cpp/dll.h"
+#include "yaml-cpp/node/detail/bool_type.h"
+#include "yaml-cpp/node/detail/iterator_fwd.h"
 #include "yaml-cpp/node/ptr.h"
 #include "yaml-cpp/node/type.h"
-#include "yaml-cpp/node/detail/iterator_fwd.h"
+
-#include "yaml-cpp/node/detail/bool_type.h"
+namespace YAML {
-#include <stdexcept>
+namespace detail {
+class node;
+class node_data;
+struct iterator_value;
+}  // namespace detail
+}  // namespace YAML
 
 namespace YAML {
 class Node {

src/convert.cpp

@@ -1,7 +1,7 @@
-#include "yaml-cpp/node/convert.h"
-#include "yaml-cpp/node/impl.h"
 #include <algorithm>
 
+#include "yaml-cpp/node/convert.h"
+
 namespace {
 // we're not gonna mess with the mess that is all the isupper/etc. functions
 bool IsLower(char ch) { return 'a' <= ch && ch <= 'z'; }

src/memory.cpp

@@ -1,8 +1,10 @@
 #include "yaml-cpp/node/detail/memory.h"
-#include "yaml-cpp/node/detail/node.h"
+#include "yaml-cpp/node/detail/node.h"  // IWYU pragma: keep
+#include "yaml-cpp/node/ptr.h"
 
 namespace YAML {
 namespace detail {
+
 void memory_holder::merge(memory_holder& rhs) {
   if (m_pMemory == rhs.m_pMemory)
     return;

src/node_data.cpp

@@ -1,11 +1,18 @@
-#include "yaml-cpp/node/detail/node_data.h"
+#include <assert.h>
-#include "yaml-cpp/node/detail/memory.h"
+#include <boost/smart_ptr/shared_ptr.hpp>
-#include "yaml-cpp/node/detail/node.h"
-#include "yaml-cpp/exceptions.h"
 #include <sstream>
 
+#include "yaml-cpp/exceptions.h"
+#include "yaml-cpp/node/detail/memory.h"
+#include "yaml-cpp/node/detail/node.h"  // IWYU pragma: keep
+#include "yaml-cpp/node/detail/node_data.h"
+#include "yaml-cpp/node/detail/node_iterator.h"
+#include "yaml-cpp/node/ptr.h"
+#include "yaml-cpp/node/type.h"
+
 namespace YAML {
 namespace detail {
+
 std::string node_data::empty_scalar;
 
 node_data::node_data()

src/nodebuilder.cpp

@@ -1,10 +1,15 @@
-#include "nodebuilder.h"
+#include <assert.h>
-#include "yaml-cpp/mark.h"
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/impl.h"
 #include <cassert>
 
+#include "nodebuilder.h"
+#include "yaml-cpp/node/detail/node.h"
+#include "yaml-cpp/node/impl.h"
+#include "yaml-cpp/node/node.h"
+#include "yaml-cpp/node/type.h"
+
 namespace YAML {
+struct Mark;
+
 NodeBuilder::NodeBuilder()
     : m_pMemory(new detail::memory_holder), m_pRoot(0), m_mapDepth(0) {
   m_anchors.push_back(0);  // since the anchors start at 1

src/nodebuilder.h

@@ -7,9 +7,18 @@
 #pragma once
 #endif
 
+#include <vector>
+
+#include "yaml-cpp/anchor.h"
 #include "yaml-cpp/eventhandler.h"
 #include "yaml-cpp/node/ptr.h"
-#include <vector>
+
+namespace YAML {
+namespace detail {
+class node;
+}  // namespace detail
+struct Mark;
+}  // namespace YAML
 
 namespace YAML {
 class Node;

src/nodeevents.cpp

@@ -1,8 +1,10 @@
 #include "nodeevents.h"
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/impl.h"
 #include "yaml-cpp/eventhandler.h"
 #include "yaml-cpp/mark.h"
+#include "yaml-cpp/node/detail/node.h"
+#include "yaml-cpp/node/detail/node_iterator.h"
+#include "yaml-cpp/node/node.h"
+#include "yaml-cpp/node/type.h"
 
 namespace YAML {
 void NodeEvents::AliasManager::RegisterReference(const detail::node& node) {

src/nodeevents.h

@@ -7,11 +7,18 @@
 #pragma once
 #endif
 
-#include "yaml-cpp/anchor.h"
-#include "yaml-cpp/node/ptr.h"
 #include <map>
 #include <vector>
 
+#include "yaml-cpp/anchor.h"
+#include "yaml-cpp/node/ptr.h"
+
+namespace YAML {
+namespace detail {
+class node;
+}  // namespace detail
+}  // namespace YAML
+
 namespace YAML {
 class EventHandler;
 class Node;

src/parse.cpp

@@ -1,12 +1,13 @@
 #include "yaml-cpp/node/parse.h"
+
+#include <fstream>
+#include <sstream>
+
 #include "yaml-cpp/node/node.h"
 #include "yaml-cpp/node/impl.h"
 #include "yaml-cpp/parser.h"
 #include "nodebuilder.h"
 
-#include <fstream>
-#include <sstream>
-
 namespace YAML {
 Node Load(const std::string& input) {
   std::stringstream stream(input);

test/emittertests.cpp

@@ -1,7 +1,6 @@
 #include <iostream>
 
 #include "teststruct.h"
-#include "yaml-cpp/eventhandler.h"
 #include "yaml-cpp/yaml.h"  // IWYU pragma: keep
 
 namespace Test {

test/new-api/nodetests.cpp

@@ -1,8 +1,13 @@
-#include "nodetests.h"
+#include <boost/version.hpp>
-#include "yaml-cpp/yaml.h"
 #include <iostream>
 
-#include <boost/version.hpp>
+#include "nodetests.h"
+#include "yaml-cpp/yaml.h"  // IWYU pragma: keep
+
+namespace YAML {
+class InvalidNode;
+template <typename T> class TypedBadConversion;
+}  // namespace YAML
 
 #if BOOST_VERSION >= 103400
 #include <boost/foreach.hpp>

test/new-api/spectests.cpp

@@ -1,8 +1,9 @@
-#include "spectests.h"
-#include "specexamples.h"
-#include "yaml-cpp/yaml.h"
 #include <iostream>
 
+#include "specexamples.h"
+#include "spectests.h"
+#include "yaml-cpp/yaml.h"  // IWYU pragma: keep
+
 #define YAML_ASSERT(cond)               \
   do {                                  \
     if (!(cond))                        \

test/spectests.cpp

@@ -3,10 +3,6 @@
 #include "spectests.h"
 #include "yaml-cpp/yaml.h"  // IWYU pragma: keep
 
-namespace YAML {
-class Exception;
-}  // namespace YAML
-
 namespace Test {
 namespace {
 void RunSpecTest(TEST (*test)(), const std::string& index,

util/parse.cpp

@@ -1,9 +1,10 @@
-#include "yaml-cpp/yaml.h"
-#include "yaml-cpp/eventhandler.h"
 #include <fstream>
 #include <iostream>
 #include <vector>
 
+#include "yaml-cpp/eventhandler.h"
+#include "yaml-cpp/yaml.h"  // IWYU pragma: keep
+
 struct Params {
   bool hasFile;
   std::string fileName;