iwyu: prune includes

Change-Id: I9e8af1510a54668526bf739e30cb98eb4a3b3559

20 files changed, 70 insertions, 32 deletions

diff --git a/src/conv/svg/pub2xhtml.cpp b/src/conv/svg/pub2xhtml.cpp
index 6179223..f021b39 100644
--- a/src/conv/svg/pub2xhtml.cpp
+++ b/src/conv/svg/pub2xhtml.cpp
@@ -11,9 +11,8 @@
 #include "config.h"
 #endif
 
-#include <iostream>
-#include <sstream>
 #include <fstream>
+#include <iostream>
 #include <stdio.h>
 #include <string.h>
 #include <librevenge-stream/librevenge-stream.h>
diff --git a/src/lib/ColorReference.h b/src/lib/ColorReference.h
index 2549366..61b2a52 100644
--- a/src/lib/ColorReference.h
+++ b/src/lib/ColorReference.h
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_COLORREFERENCE_H
 #define INCLUDED_COLORREFERENCE_H
 
+#include <vector>
+
 #include "MSPUBTypes.h"
 
 namespace libmspub
diff --git a/src/lib/Dash.cpp b/src/lib/Dash.cpp
index bae6ee1..1ca3a17 100644
--- a/src/lib/Dash.cpp
+++ b/src/lib/Dash.cpp
@@ -8,6 +8,8 @@
  */
 
 #include "Dash.h"
+
+#include "MSPUBConstants.h"
 #include "libmspub_utils.h"
 
 namespace libmspub
diff --git a/src/lib/Fill.cpp b/src/lib/Fill.cpp
index eca9633..ccb3d42 100644
--- a/src/lib/Fill.cpp
+++ b/src/lib/Fill.cpp
@@ -9,6 +9,8 @@
 
 #include "Fill.h"
 
+#include <utility>
+
 #include "FillType.h"
 #include "MSPUBCollector.h"
 #include "libmspub_utils.h"
diff --git a/src/lib/Fill.h b/src/lib/Fill.h
index d8250bf..39c5cab 100644
--- a/src/lib/Fill.h
+++ b/src/lib/Fill.h
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_FILL_H
 #define INCLUDED_FILL_H
 
-#include <cstddef>
 #include <vector>
 
 #include <librevenge/librevenge.h>
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 350f029..fae688d 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -9,17 +9,29 @@
 
 #include "MSPUBCollector.h"
 
+#include <algorithm>
+#include <functional>
 #include <math.h>
+#include <memory>
 
 #include <boost/multi_array.hpp>
 
 #include <unicode/ucsdet.h>
 #include <unicode/uloc.h>
 
+#include "Arrow.h"
 #include "Coordinate.h"
+#include "Dash.h"
+#include "Fill.h"
+#include "Line.h"
+#include "Margins.h"
 #include "MSPUBConstants.h"
 #include "MSPUBTypes.h"
 #include "PolygonUtils.h"
+#include "Shadow.h"
+#include "ShapeGroupElement.h"
+#include "TableInfo.h"
+#include "VectorTransformation2D.h"
 #include "libmspub_utils.h"
 
 namespace libmspub
diff --git a/src/lib/MSPUBCollector.h b/src/lib/MSPUBCollector.h
index 62a40fb..a1f0db3 100644
--- a/src/lib/MSPUBCollector.h
+++ b/src/lib/MSPUBCollector.h
@@ -10,36 +10,37 @@
 #ifndef INCLUDED_MSPUBCOLLECTOR_H
 #define INCLUDED_MSPUBCOLLECTOR_H
 
-#include <algorithm>
-#include <functional>
 #include <list>
 #include <map>
-#include <memory>
 #include <set>
-#include <string>
+#include <utility>
 #include <vector>
 
 #include <librevenge/librevenge.h>
 
-#include "Arrow.h"
 #include "BorderArtInfo.h"
 #include "ColorReference.h"
-#include "Coordinate.h"
-#include "Dash.h"
 #include "EmbeddedFontInfo.h"
-#include "Fill.h"
-#include "MSPUBContentChunkType.h"
 #include "MSPUBTypes.h"
 #include "PolygonUtils.h"
-#include "Shadow.h"
-#include "ShapeGroupElement.h"
 #include "ShapeInfo.h"
 #include "ShapeType.h"
 #include "VerticalAlign.h"
-#include "libmspub_utils.h"
 
 namespace libmspub
 {
+
+class Fill;
+class ShapeGroupElement;
+class VectorTransformation2D;
+
+struct Arrow;
+struct Coordinate;
+struct Dash;
+struct Line;
+struct Shadow;
+struct TableInfo;
+
 class MSPUBCollector
 {
   friend class Fill;
@@ -200,6 +201,7 @@ private:
 public:
   static librevenge::RVNGString getColorString(const Color &);
 };
+
 } // namespace libmspub
 
 #endif /* INCLUDED_MSPUBCOLLECTOR_H */
diff --git a/src/lib/MSPUBDocument.cpp b/src/lib/MSPUBDocument.cpp
index 0f178fe..b44a558 100644
--- a/src/lib/MSPUBDocument.cpp
+++ b/src/lib/MSPUBDocument.cpp
@@ -7,13 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <memory>
-#include <sstream>
-#include <string.h>
-#include <string>
-
 #include <libmspub/libmspub.h>
 
+#include <memory>
+
 #include "MSPUBCollector.h"
 #include "MSPUBParser.h"
 #include "MSPUBParser2k.h"
diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index ad12b7e..4152179 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -13,6 +13,7 @@
 #include <cstdio>
 #include <cstring>
 #include <ctime>
+#include <string>
 
 #include "libmspub_utils.h"
 
diff --git a/src/lib/MSPUBMetaData.h b/src/lib/MSPUBMetaData.h
index cb70e1c..9167f4f 100644
--- a/src/lib/MSPUBMetaData.h
+++ b/src/lib/MSPUBMetaData.h
@@ -18,8 +18,6 @@
 
 #include <librevenge-stream/librevenge-stream.h>
 
-#include "libmspub_utils.h"
-
 namespace libmspub
 {
 
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index d838d5d..1078eda 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -11,10 +11,10 @@
 
 #include <algorithm>
 #include <cassert>
+#include <list>
 #include <memory>
 #include <set>
 #include <sstream>
-#include <string.h>
 #include <string>
 #include <utility>
 
@@ -22,13 +22,15 @@
 
 #include <librevenge-stream/librevenge-stream.h>
 
-#include <zlib.h>
-
+#include "Arrow.h"
+#include "ColorReference.h"
+#include "Coordinate.h"
 #include "Dash.h"
 #include "EscherContainerType.h"
 #include "EscherFieldIds.h"
 #include "Fill.h"
 #include "FillType.h"
+#include "Line.h"
 #include "ListInfo.h"
 #include "MSPUBBlockID.h"
 #include "MSPUBBlockType.h"
@@ -36,6 +38,7 @@
 #include "MSPUBConstants.h"
 #include "MSPUBContentChunkType.h"
 #include "MSPUBMetaData.h"
+#include "Shadow.h"
 #include "ShapeFlags.h"
 #include "ShapeType.h"
 #include "TableInfo.h"
diff --git a/src/lib/MSPUBParser.h b/src/lib/MSPUBParser.h
index 0dfe017..9d00a8f 100644
--- a/src/lib/MSPUBParser.h
+++ b/src/lib/MSPUBParser.h
@@ -20,14 +20,17 @@
 
 #include <librevenge/librevenge.h>
 
-#include "Coordinate.h"
-#include "Fill.h"
 #include "MSPUBTypes.h"
 #include "PolygonUtils.h"
 
 namespace libmspub
 {
+
+class Fill;
 class MSPUBCollector;
+
+struct Coordinate;
+
 class FindBySeqNum
 {
   unsigned seqNum;
diff --git a/src/lib/MSPUBParser2k.cpp b/src/lib/MSPUBParser2k.cpp
index 9b3a7c4..615e63a 100644
--- a/src/lib/MSPUBParser2k.cpp
+++ b/src/lib/MSPUBParser2k.cpp
@@ -10,11 +10,14 @@
 #include "MSPUBParser2k.h"
 
 #include <algorithm>
+#include <utility>
 #include <memory>
 
 #include <librevenge-stream/librevenge-stream.h>
 
 #include "ColorReference.h"
+#include "Fill.h"
+#include "Line.h"
 #include "MSPUBCollector.h"
 #include "ShapeType.h"
 #include "libmspub_utils.h"
diff --git a/src/lib/MSPUBParser97.cpp b/src/lib/MSPUBParser97.cpp
index e34968b..9ea7172 100644
--- a/src/lib/MSPUBParser97.cpp
+++ b/src/lib/MSPUBParser97.cpp
@@ -9,9 +9,10 @@
 
 #include "MSPUBParser97.h"
 
+#include <algorithm>
 #include <limits>
+#include <map>
 #include <memory>
-#include <utility>
 
 #include "MSPUBCollector.h"
 #include "MSPUBTypes.h"
diff --git a/src/lib/MSPUBParser97.h b/src/lib/MSPUBParser97.h
index 018e3fa..829e760 100644
--- a/src/lib/MSPUBParser97.h
+++ b/src/lib/MSPUBParser97.h
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_MSPUBPARSER97_H
 #define INCLUDED_MSPUBPARSER97_H
 
+#include <vector>
+
 #include "MSPUBParser2k.h"
 
 namespace libmspub
diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp
index bb7ffce..b5e47e9 100644
--- a/src/lib/PolygonUtils.cpp
+++ b/src/lib/PolygonUtils.cpp
@@ -9,12 +9,16 @@
 
 #include "PolygonUtils.h"
 
+#include <algorithm>
 #include <math.h>
 
 #include <librevenge/librevenge.h>
 
+#include "ColorReference.h"
+#include "Line.h"
 #include "MSPUBCollector.h"
 #include "ShapeType.h"
+#include "VectorTransformation2D.h"
 #include "libmspub_utils.h"
 
 #define CALCULATED_VALUE(val) (int(unsigned(val) | 0x80000000))
diff --git a/src/lib/PolygonUtils.h b/src/lib/PolygonUtils.h
index be3eadc..bf956d3 100644
--- a/src/lib/PolygonUtils.h
+++ b/src/lib/PolygonUtils.h
@@ -17,9 +17,7 @@
 #include <librevenge/librevenge.h>
 
 #include "Coordinate.h"
-#include "Line.h"
 #include "ShapeType.h"
-#include "VectorTransformation2D.h"
 
 namespace libmspub
 {
@@ -33,7 +31,10 @@ const int PROP_GEO_BOTTOM       = 323;
 const int OTHER_CALC_VAL        = 0x400;
 const int ASPECT_RATIO          = 0x600;
 
-class MSPUBCollector;
+class VectorTransformation2D;
+
+struct Color;
+struct Line;
 
 typedef struct
 {
diff --git a/src/lib/ShapeGroupElement.cpp b/src/lib/ShapeGroupElement.cpp
index 098b958..cc19bcc 100644
--- a/src/lib/ShapeGroupElement.cpp
+++ b/src/lib/ShapeGroupElement.cpp
@@ -9,6 +9,11 @@
 
 #include "ShapeGroupElement.h"
 
+#include <algorithm>
+
+#include "Coordinate.h"
+#include "MSPUBConstants.h"
+
 namespace libmspub
 {
 
diff --git a/src/lib/ShapeGroupElement.h b/src/lib/ShapeGroupElement.h
index 34f5dd7..3567cb1 100644
--- a/src/lib/ShapeGroupElement.h
+++ b/src/lib/ShapeGroupElement.h
@@ -21,6 +21,9 @@
 
 namespace libmspub
 {
+
+struct Coordinate;
+
 class ShapeGroupElement
 {
   boost::optional<ShapeInfo> m_shapeInfo;
diff --git a/src/lib/libmspub_utils.h b/src/lib/libmspub_utils.h
index 3d1c712..b54f8dc 100644
--- a/src/lib/libmspub_utils.h
+++ b/src/lib/libmspub_utils.h
@@ -15,7 +15,6 @@
 #endif
 
 #include <cmath>
-#include <map>
 #include <vector>
 
 #include <boost/cstdint.hpp>