make sure headers are self-contained

Change-Id: I77beb4ce00ec070f2599362f6462d967613abd2b

23 files changed, 39 insertions, 18 deletions

diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index 0e5cc1b..c305ab8 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -7,12 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "VDXParser.h"
+
 #include <memory>
 #include <string.h>
 #include <libxml/xmlIO.h>
 #include <libxml/xmlstring.h>
 #include <librevenge-stream/librevenge-stream.h>
-#include "VDXParser.h"
 #include "libvisio_utils.h"
 #include "libvisio_xml.h"
 #include "VSDContentCollector.h"
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index fe841cc..cfc0d94 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -7,13 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "VSD5Parser.h"
+
 #include <librevenge-stream/librevenge-stream.h>
 #include <locale.h>
 #include <sstream>
 #include <string>
 #include <stack>
 #include "libvisio_utils.h"
-#include "VSD5Parser.h"
 #include "VSDInternalStream.h"
 #include "VSDDocumentStructure.h"
 #include "VSDContentCollector.h"
diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index ea3be55..a41016b 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -7,12 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "VSD6Parser.h"
+
 #include <librevenge-stream/librevenge-stream.h>
 #include <locale.h>
 #include <sstream>
 #include <string>
 #include "libvisio_utils.h"
-#include "VSD6Parser.h"
 #include "VSDInternalStream.h"
 #include "VSDDocumentStructure.h"
 #include "VSDContentCollector.h"
diff --git a/src/lib/VSDCharacterList.cpp b/src/lib/VSDCharacterList.cpp
index 6f9fe8e..17935fc 100644
--- a/src/lib/VSDCharacterList.cpp
+++ b/src/lib/VSDCharacterList.cpp
@@ -7,9 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "VSDCollector.h"
 #include "VSDCharacterList.h"
 
+#include "VSDCollector.h"
+
 namespace libvisio
 {
 
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index cde0ad0..8b297da 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "VSDContentCollector.h"
+
 #include <algorithm>
 #include <cassert>
 #include <string.h> // for memcpy
@@ -17,7 +19,6 @@
 #include <unicode/ucnv.h>
 #include <unicode/utf8.h>
 
-#include "VSDContentCollector.h"
 #include "VSDParser.h"
 #include "VSDInternalStream.h"
 
diff --git a/src/lib/VSDFieldList.cpp b/src/lib/VSDFieldList.cpp
index 363d20e..c4c16ef 100644
--- a/src/lib/VSDFieldList.cpp
+++ b/src/lib/VSDFieldList.cpp
@@ -7,9 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "VSDFieldList.h"
+
 #include <time.h>
 #include "VSDCollector.h"
-#include "VSDFieldList.h"
 #include "libvisio_utils.h"
 
 void libvisio::VSDTextField::handle(VSDCollector *collector) const
diff --git a/src/lib/VSDGeometryList.cpp b/src/lib/VSDGeometryList.cpp
index 92746d8..a195136 100644
--- a/src/lib/VSDGeometryList.cpp
+++ b/src/lib/VSDGeometryList.cpp
@@ -7,8 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "VSDCollector.h"
 #include "VSDGeometryList.h"
+
+#include "VSDCollector.h"
 #include "libvisio_utils.h"
 
 namespace libvisio
diff --git a/src/lib/VSDInternalStream.cpp b/src/lib/VSDInternalStream.cpp
index 9d66015..bc3548a 100644
--- a/src/lib/VSDInternalStream.cpp
+++ b/src/lib/VSDInternalStream.cpp
@@ -7,9 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <string.h>
 #include "VSDInternalStream.h"
 
+#include <string.h>
 
 VSDInternalStream::VSDInternalStream(librevenge::RVNGInputStream *input, unsigned long size, bool compressed) :
   librevenge::RVNGInputStream(),
diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index c200b5f..09e8f97 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "VSDMetaData.h"
+
 #include <cassert>
 #include <cmath>
 #include <cstdio>
diff --git a/src/lib/VSDPages.cpp b/src/lib/VSDPages.cpp
index 335dd69..1236435 100644
--- a/src/lib/VSDPages.cpp
+++ b/src/lib/VSDPages.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "VSDPages.h"
+
 #include "libvisio_utils.h"
 
 libvisio::VSDPage::VSDPage()
diff --git a/src/lib/VSDParagraphList.cpp b/src/lib/VSDParagraphList.cpp
index f77b500..33f75fa 100644
--- a/src/lib/VSDParagraphList.cpp
+++ b/src/lib/VSDParagraphList.cpp
@@ -7,9 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "VSDCollector.h"
 #include "VSDParagraphList.h"
 
+#include "VSDCollector.h"
+
 namespace libvisio
 {
 
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 673cc93..c967165 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "VSDParser.h"
+
 #include <librevenge-stream/librevenge-stream.h>
 #include <locale.h>
 #include <cassert>
@@ -15,7 +17,6 @@
 #include <cmath>
 #include <set>
 #include "libvisio_utils.h"
-#include "VSDParser.h"
 #include "VSDInternalStream.h"
 #include "VSDDocumentStructure.h"
 #include "VSDContentCollector.h"
diff --git a/src/lib/VSDShapeList.cpp b/src/lib/VSDShapeList.cpp
index de15718..bfa29d1 100644
--- a/src/lib/VSDShapeList.cpp
+++ b/src/lib/VSDShapeList.cpp
@@ -7,9 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "VSDCollector.h"
 #include "VSDShapeList.h"
 
+#include "VSDCollector.h"
 
 libvisio::VSDShapeList::VSDShapeList() :
   m_elements(),
diff --git a/src/lib/VSDStencils.cpp b/src/lib/VSDStencils.cpp
index 192114c..7037f2f 100644
--- a/src/lib/VSDStencils.cpp
+++ b/src/lib/VSDStencils.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "VSDStencils.h"
+
 #include "libvisio_utils.h"
 
 libvisio::VSDShape::VSDShape()
diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp
index cc87a68..9a3d400 100644
--- a/src/lib/VSDStyles.cpp
+++ b/src/lib/VSDStyles.cpp
@@ -7,9 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "VSDStyles.h"
+
 #include <set>
 #include <stack>
-#include "VSDStyles.h"
 #include "VSDTypes.h"
 
 namespace libvisio
diff --git a/src/lib/VSDStylesCollector.cpp b/src/lib/VSDStylesCollector.cpp
index 527bc33..cc8021f 100644
--- a/src/lib/VSDStylesCollector.cpp
+++ b/src/lib/VSDStylesCollector.cpp
@@ -7,9 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "VSDStylesCollector.h"
+
 #include <vector>
 #include <map>
-#include "VSDStylesCollector.h"
 
 libvisio::VSDStylesCollector::VSDStylesCollector(
   std::vector<std::map<unsigned, XForm> > &groupXFormsSequence,
diff --git a/src/lib/VSDXMLHelper.cpp b/src/lib/VSDXMLHelper.cpp
index 80f62a5..c0e1cf5 100644
--- a/src/lib/VSDXMLHelper.cpp
+++ b/src/lib/VSDXMLHelper.cpp
@@ -11,13 +11,14 @@
 #define BOOST_LEXICAL_CAST_ASSUME_C_LOCALE 1
 #endif
 
+#include "VSDXMLHelper.h"
+
 #include <memory>
 #include <sstream>
 #include <istream>
 #include <vector>
 #include <boost/algorithm/string.hpp>
 #include <librevenge-stream/librevenge-stream.h>
-#include "VSDXMLHelper.h"
 #include "libvisio_utils.h"
 #include "libvisio_xml.h"
 
diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp
index c78b872..edbaac4 100644
--- a/src/lib/VSDXMLParserBase.cpp
+++ b/src/lib/VSDXMLParserBase.cpp
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "VSDXMLParserBase.h"
+
 #include <string.h>
 #include <libxml/xmlIO.h>
 #include <libxml/xmlstring.h>
@@ -15,7 +17,6 @@
 #include <boost/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
 
-#include "VSDXMLParserBase.h"
 #include "libvisio_utils.h"
 #include "libvisio_xml.h"
 #include "VSDContentCollector.h"
diff --git a/src/lib/VSDXMLTokenMap.cpp b/src/lib/VSDXMLTokenMap.cpp
index b9a5829..97b01f2 100644
--- a/src/lib/VSDXMLTokenMap.cpp
+++ b/src/lib/VSDXMLTokenMap.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "VSDXMLTokenMap.h"
+
 #include <string.h>
 
 namespace
diff --git a/src/lib/VSDXMetaData.cpp b/src/lib/VSDXMetaData.cpp
index c0e5708..9b3d3cf 100644
--- a/src/lib/VSDXMetaData.cpp
+++ b/src/lib/VSDXMetaData.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "VSDXMetaData.h"
+
 #include "VSDXMLTokenMap.h"
 #include "libvisio_utils.h"
 #include "libvisio_xml.h"
diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index 153e464..1bb46cf 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -7,12 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "VSDXParser.h"
+
 #include <memory>
 #include <string.h>
 #include <libxml/xmlIO.h>
 #include <libxml/xmlstring.h>
 #include <librevenge-stream/librevenge-stream.h>
-#include "VSDXParser.h"
 #include "libvisio_utils.h"
 #include "libvisio_xml.h"
 #include "VSDContentCollector.h"
diff --git a/src/lib/VisioDocument.cpp b/src/lib/VisioDocument.cpp
index bc2b477..accb5d1 100644
--- a/src/lib/VisioDocument.cpp
+++ b/src/lib/VisioDocument.cpp
@@ -7,12 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <libvisio/libvisio.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
 
 #include <librevenge/librevenge.h>
-#include <libvisio/libvisio.h>
 #include "libvisio_utils.h"
 #include "libvisio_xml.h"
 #include "VDXParser.h"
diff --git a/src/lib/libvisio_utils.cpp b/src/lib/libvisio_utils.cpp
index 8ab2aab..457b06d 100644
--- a/src/lib/libvisio_utils.cpp
+++ b/src/lib/libvisio_utils.cpp
@@ -7,10 +7,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "libvisio_utils.h"
+
 #include <cstdarg>
 #include <cstdio>
 #include "VSDInternalStream.h"
-#include "libvisio_utils.h"
 
 uint8_t libvisio::readU8(librevenge::RVNGInputStream *input)
 {