corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [3/3] incubator-corinthia git commit: update files for different pos of header files.
Date Thu, 30 Jul 2015 19:38:06 GMT
update files for different pos of header files.


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/055b257c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/055b257c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/055b257c

Branch: refs/heads/newZipExperiment
Commit: 055b257ca4534326524c6c60e12ddb1594510fad
Parents: 5f67db9
Author: jani <jani@apache.org>
Authored: Thu Jul 30 21:32:54 2015 +0200
Committer: jani <jani@apache.org>
Committed: Thu Jul 30 21:32:54 2015 +0200

----------------------------------------------------------------------
 DocFormats/api/src/Formats.c                            |  1 +
 DocFormats/api/src/Operations.c                         |  1 +
 DocFormats/core/src/common/DFBDT.c                      |  5 +++--
 DocFormats/core/src/common/DFTable.c                    |  6 +++---
 DocFormats/core/src/css/CSS.c                           |  9 +++++----
 DocFormats/core/src/css/CSSParser.c                     |  7 ++++---
 DocFormats/core/src/css/CSSProperties.c                 |  8 ++++----
 DocFormats/core/src/css/CSSSelector.c                   |  7 ++++---
 DocFormats/core/src/css/CSSSheet.c                      |  7 ++++---
 DocFormats/core/src/css/CSSStyle.c                      |  8 ++++----
 DocFormats/core/src/html/DFHTDocument.c                 |  1 +
 DocFormats/core/src/html/DFHTML.c                       |  1 +
 DocFormats/core/src/html/DFHTMLNormalization.c          |  7 ++++---
 DocFormats/core/src/html/DFHTMLTables.c                 |  5 +++--
 DocFormats/core/src/html/DFTidyHelper.c                 |  1 +
 DocFormats/core/src/html/DFTidyWrapper.c                |  1 +
 DocFormats/core/src/lib/DFAllocator.c                   |  5 +++--
 DocFormats/core/src/lib/DFArray.c                       |  7 ++++---
 DocFormats/core/src/lib/DFBuffer.c                      |  8 ++++----
 DocFormats/core/src/lib/DFCallback.c                    |  5 +++--
 DocFormats/core/src/lib/DFError.c                       |  6 +++---
 DocFormats/core/src/lib/DFFilesystem.c                  | 12 ++++++------
 DocFormats/core/src/lib/DFHashTable.c                   |  6 +++---
 DocFormats/core/src/lib/DFStorage.c                     |  8 ++++----
 DocFormats/core/src/lib/DFString.c                      | 10 +++++-----
 DocFormats/core/src/lib/DFZipFile.c                     |  5 +++--
 DocFormats/core/src/lib/TextPackage.c                   |  5 +++--
 DocFormats/core/src/xml/DFChanges.c                     |  7 ++++---
 DocFormats/core/src/xml/DFDOM.c                         |  7 ++++---
 DocFormats/core/src/xml/DFMarkupCompatibility.c         | 10 +++++-----
 DocFormats/core/src/xml/DFNameMap.c                     |  7 ++++---
 DocFormats/core/src/xml/DFXML.c                         |  9 +++++----
 DocFormats/core/tests/common/BDTTests.c                 |  8 ++++----
 DocFormats/core/tests/css/CSSTests.c                    |  5 +++--
 DocFormats/core/tests/html/HTMLPlain.c                  |  7 ++++---
 DocFormats/core/tests/html/HTMLTests.c                  |  3 ++-
 DocFormats/core/tests/lib/LibTests.c                    |  4 +++-
 DocFormats/core/tests/xml/XMLTests.c                    |  3 ++-
 DocFormats/filters/latex/src/HTMLToLaTeX.c              |  5 +++--
 DocFormats/filters/latex/tests/LaTeXTests.c             |  3 ++-
 DocFormats/filters/odf/src/ODF.c                        |  1 +
 DocFormats/filters/odf/src/ODFManifest.c                |  5 +++--
 DocFormats/filters/odf/src/ODFPackage.c                 |  5 +++--
 DocFormats/filters/odf/src/ODFSheet.c                   |  3 ++-
 DocFormats/filters/odf/src/text/ODFText.c               |  2 +-
 DocFormats/filters/odf/src/text/ODFTextConverter.c      |  3 ++-
 DocFormats/filters/ooxml/src/common/OPC.c               |  5 +++--
 DocFormats/filters/ooxml/src/word/CSSClassNames.c       |  5 +++--
 DocFormats/filters/ooxml/src/word/Word.c                |  3 ++-
 DocFormats/filters/ooxml/src/word/WordCaption.c         |  3 ++-
 DocFormats/filters/ooxml/src/word/WordConverter.c       |  7 ++++---
 DocFormats/filters/ooxml/src/word/WordGC.c              |  5 +++--
 DocFormats/filters/ooxml/src/word/WordLists.c           |  9 +++++----
 DocFormats/filters/ooxml/src/word/WordNotes.c           |  5 +++--
 DocFormats/filters/ooxml/src/word/WordNumbering.c       |  8 ++++----
 DocFormats/filters/ooxml/src/word/WordObjects.c         |  5 +++--
 DocFormats/filters/ooxml/src/word/WordPackage.c         |  7 ++++---
 DocFormats/filters/ooxml/src/word/WordSection.c         |  5 +++--
 DocFormats/filters/ooxml/src/word/WordSettings.c        |  3 ++-
 DocFormats/filters/ooxml/src/word/WordSheet.c           |  7 ++++---
 DocFormats/filters/ooxml/src/word/WordStyles.c          |  7 ++++---
 DocFormats/filters/ooxml/src/word/WordTheme.c           |  7 ++++---
 DocFormats/filters/ooxml/src/word/WordWhitespace.c      |  3 ++-
 .../filters/ooxml/src/word/formatting/WordCommonPr.c    |  7 ++++---
 .../filters/ooxml/src/word/formatting/WordNumPr.c       |  9 +++++----
 DocFormats/filters/ooxml/src/word/formatting/WordPPr.c  |  9 +++++----
 DocFormats/filters/ooxml/src/word/formatting/WordRPr.c  |  5 +++--
 .../filters/ooxml/src/word/formatting/WordTblPr.c       |  7 ++++---
 .../filters/ooxml/src/word/lenses/WordBlockLevel.c      |  1 +
 DocFormats/filters/ooxml/src/word/lenses/WordBody.c     |  1 +
 DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c |  7 ++++---
 DocFormats/filters/ooxml/src/word/lenses/WordChange.c   |  1 +
 DocFormats/filters/ooxml/src/word/lenses/WordDocument.c |  1 +
 DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c  | 10 +++++-----
 DocFormats/filters/ooxml/src/word/lenses/WordEquation.c |  1 +
 DocFormats/filters/ooxml/src/word/lenses/WordField.c    |  9 +++++----
 .../filters/ooxml/src/word/lenses/WordHyperlink.c       |  5 +++--
 DocFormats/filters/ooxml/src/word/lenses/WordLenses.c   |  1 +
 .../filters/ooxml/src/word/lenses/WordParagraph.c       |  7 ++++---
 .../ooxml/src/word/lenses/WordParagraphContent.c        |  3 ++-
 DocFormats/filters/ooxml/src/word/lenses/WordRun.c      |  7 ++++---
 .../filters/ooxml/src/word/lenses/WordRunContent.c      |  3 ++-
 DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c |  1 +
 DocFormats/filters/ooxml/src/word/lenses/WordTable.c    |  9 +++++----
 DocFormats/filters/ooxml/tests/word/WordPlain.c         |  6 +++---
 DocFormats/filters/ooxml/tests/word/WordTests.c         |  7 ++++---
 DocFormats/platform/src/Apple.c                         |  1 +
 DocFormats/platform/src/Linux.c                         |  1 +
 DocFormats/platform/src/Unix.c                          |  2 +-
 DocFormats/platform/src/Win32.c                         |  1 +
 DocFormats/platform/src/Wrapper_zip.c                   |  9 ++++-----
 DocFormats/platform/tests/OStests.c                     |  5 +++--
 DocFormats/platform/tests/WrapperTests.c                |  3 ++-
 DocFormats/unittest/DFUnitTest.c                        |  4 ++--
 consumers/dfconvert/src/main.c                          |  4 ++--
 consumers/dftest/src/main.c                             |  8 ++++----
 consumers/dfutil/src/Commands.c                         |  8 ++++----
 consumers/dfutil/src/main.c                             |  6 +++---
 98 files changed, 294 insertions(+), 218 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/api/src/Formats.c
----------------------------------------------------------------------
diff --git a/DocFormats/api/src/Formats.c b/DocFormats/api/src/Formats.c
index 289c288..2f27b39 100644
--- a/DocFormats/api/src/Formats.c
+++ b/DocFormats/api/src/Formats.c
@@ -16,6 +16,7 @@
 // under the License.
 
 #include <DocFormats/Formats.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFFilesystem.h"
 #include "DFString.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/api/src/Operations.c
----------------------------------------------------------------------
diff --git a/DocFormats/api/src/Operations.c b/DocFormats/api/src/Operations.c
index f605ad8..9f6f7e9 100644
--- a/DocFormats/api/src/Operations.c
+++ b/DocFormats/api/src/Operations.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include <DocFormats/Operations.h>
 #include "DFFilesystem.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/common/DFBDT.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/common/DFBDT.c b/DocFormats/core/src/common/DFBDT.c
index db96e3b..21325dc 100644
--- a/DocFormats/core/src/common/DFBDT.c
+++ b/DocFormats/core/src/common/DFBDT.c
@@ -15,14 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFBDT.h"
 #include "DFDOM.h"
 #include "DFXML.h"
 #include "DFCommon.h"
 #include "DFHashTable.h"
-#include <assert.h>
-#include <stdlib.h>
 
 int nullIsVisible(void *ctx, DFNode *concrete)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/common/DFTable.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/common/DFTable.c b/DocFormats/core/src/common/DFTable.c
index 1038f47..7073e9a 100644
--- a/DocFormats/core/src/common/DFTable.c
+++ b/DocFormats/core/src/common/DFTable.c
@@ -15,13 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "DFTable.h"
 #include "DFDOM.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 DFTableDimensions DFTableDimensionsMake(unsigned int rows, unsigned int cols)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/css/CSS.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSS.c b/DocFormats/core/src/css/CSS.c
index 7f2bbf2..a82fe40 100644
--- a/DocFormats/core/src/css/CSS.c
+++ b/DocFormats/core/src/css/CSS.c
@@ -15,6 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "CSS.h"
 #include "CSSParser.h"
 #include "CSSProperties.h"
@@ -25,10 +30,6 @@
 #include "DFCharacterSet.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
 
 typedef struct {
     char *left;

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/css/CSSParser.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSParser.c b/DocFormats/core/src/css/CSSParser.c
index b6fadfc..26f20e9 100644
--- a/DocFormats/core/src/css/CSSParser.c
+++ b/DocFormats/core/src/css/CSSParser.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "CSSParser.h"
 #include "CSS.h"
 #include "DFHTML.h"
@@ -22,9 +26,6 @@
 #include "DFCharacterSet.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
 
 static int matchPast(CSSParser *p, uint16_t endChar, int *invalid);
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/css/CSSProperties.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSProperties.c b/DocFormats/core/src/css/CSSProperties.c
index 5d96459..5065cbf 100644
--- a/DocFormats/core/src/css/CSSProperties.c
+++ b/DocFormats/core/src/css/CSSProperties.c
@@ -15,16 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "CSSProperties.h"
 #include "CSS.h"
 #include "DFString.h"
 #include "DFHashTable.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 char *CSSPropertiesCopyDescription(CSSProperties *properties)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/css/CSSSelector.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSSelector.c b/DocFormats/core/src/css/CSSSelector.c
index ec17e3e..9d87f04 100644
--- a/DocFormats/core/src/css/CSSSelector.c
+++ b/DocFormats/core/src/css/CSSSelector.c
@@ -15,15 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "CSSSelector.h"
 #include "DFNameMap.h"
 #include "DFString.h"
 #include "DFDOM.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/css/CSSSheet.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSSheet.c b/DocFormats/core/src/css/CSSSheet.c
index 8f8cdcf..244cffa 100644
--- a/DocFormats/core/src/css/CSSSheet.c
+++ b/DocFormats/core/src/css/CSSSheet.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "CSSSheet.h"
 #include "CSS.h"
 #include "CSSProperties.h"
@@ -26,9 +30,6 @@
 #include "DFBuffer.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/css/CSSStyle.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSStyle.c b/DocFormats/core/src/css/CSSStyle.c
index 8b9b8a4..d0da981 100644
--- a/DocFormats/core/src/css/CSSStyle.c
+++ b/DocFormats/core/src/css/CSSStyle.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "CSSStyle.h"
 #include "CSSSheet.h"
 #include "CSS.h"
@@ -25,10 +29,6 @@
 #include "DFString.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/html/DFHTDocument.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTDocument.c b/DocFormats/core/src/html/DFHTDocument.c
index 70aad45..6b12018 100644
--- a/DocFormats/core/src/html/DFHTDocument.c
+++ b/DocFormats/core/src/html/DFHTDocument.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFHTDocument.h"
 #include "DFString.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/html/DFHTML.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTML.c b/DocFormats/core/src/html/DFHTML.c
index b6538ee..d563e1a 100644
--- a/DocFormats/core/src/html/DFHTML.c
+++ b/DocFormats/core/src/html/DFHTML.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFHTML.h"
 #include "DFFilesystem.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/html/DFHTMLNormalization.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTMLNormalization.c b/DocFormats/core/src/html/DFHTMLNormalization.c
index 5455611..4a1f9c3 100644
--- a/DocFormats/core/src/html/DFHTMLNormalization.c
+++ b/DocFormats/core/src/html/DFHTMLNormalization.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "DFHTMLNormalization.h"
 #include "DFDOM.h"
@@ -25,9 +29,6 @@
 #include "DFString.h"
 #include "DFCharacterSet.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 static void removeWhitespaceTextChildren(DFNode *node)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/html/DFHTMLTables.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTMLTables.c b/DocFormats/core/src/html/DFHTMLTables.c
index 5863676..caf15d8 100644
--- a/DocFormats/core/src/html/DFHTMLTables.c
+++ b/DocFormats/core/src/html/DFHTMLTables.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFHTMLTables.h"
 #include "DFTable.h"
 #include "DFDOM.h"
@@ -22,8 +25,6 @@
 #include "CSSLength.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <stdlib.h>
 
 typedef struct RowList RowList;
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/html/DFTidyHelper.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFTidyHelper.c b/DocFormats/core/src/html/DFTidyHelper.c
index af9689b..fcb2aa9 100644
--- a/DocFormats/core/src/html/DFTidyHelper.c
+++ b/DocFormats/core/src/html/DFTidyHelper.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFTidyHelper.h"
 #include "buffio.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/html/DFTidyWrapper.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFTidyWrapper.c b/DocFormats/core/src/html/DFTidyWrapper.c
index 7b81ed6..482bda9 100644
--- a/DocFormats/core/src/html/DFTidyWrapper.c
+++ b/DocFormats/core/src/html/DFTidyWrapper.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFTidyWrapper.h"
 #include "DFHTDocument.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/DFAllocator.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFAllocator.c b/DocFormats/core/src/lib/DFAllocator.c
index f12a72d..0ec5ca9 100644
--- a/DocFormats/core/src/lib/DFAllocator.c
+++ b/DocFormats/core/src/lib/DFAllocator.c
@@ -15,11 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFAllocator.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
 
 typedef struct DFAllocatorBlock DFAllocatorBlock;
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/DFArray.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFArray.c b/DocFormats/core/src/lib/DFArray.c
index 053a754..4c5df7c 100644
--- a/DocFormats/core/src/lib/DFArray.c
+++ b/DocFormats/core/src/lib/DFArray.c
@@ -15,12 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFPlatform.h"
-#include "DFArray.h"
-#include "DFCommon.h"
 #include <assert.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
+#include "DFPlatform.h"
+#include "DFArray.h"
+#include "DFCommon.h"
 
 struct DFArray {
     size_t retainCount;

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/DFBuffer.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFBuffer.c b/DocFormats/core/src/lib/DFBuffer.c
index e79929f..454d28f 100644
--- a/DocFormats/core/src/lib/DFBuffer.c
+++ b/DocFormats/core/src/lib/DFBuffer.c
@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFPlatform.h"
-#include "DFBuffer.h"
-#include "DFCommon.h"
-#include "DFString.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "DFPlatform.h"
+#include "DFBuffer.h"
+#include "DFCommon.h"
+#include "DFString.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/DFCallback.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFCallback.c b/DocFormats/core/src/lib/DFCallback.c
index d48e24d..b67bce6 100644
--- a/DocFormats/core/src/lib/DFCallback.c
+++ b/DocFormats/core/src/lib/DFCallback.c
@@ -15,11 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFCallback.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <stdlib.h>
 
 void DFCallbackAdd(DFCallback **list, DFCallbackFunction fun, void *ctx)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/DFError.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFError.c b/DocFormats/core/src/lib/DFError.c
index 4a716e3..5263d4a 100644
--- a/DocFormats/core/src/lib/DFError.c
+++ b/DocFormats/core/src/lib/DFError.c
@@ -15,13 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFPlatform.h"
-#include <DocFormats/DFError.h>
-#include "DFCommon.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "DFPlatform.h"
+#include <DocFormats/DFError.h>
+#include "DFCommon.h"
 
 struct DFError {
     size_t retainCount;

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/DFFilesystem.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFFilesystem.c b/DocFormats/core/src/lib/DFFilesystem.c
index 6c1a1bc..f24465e 100644
--- a/DocFormats/core/src/lib/DFFilesystem.c
+++ b/DocFormats/core/src/lib/DFFilesystem.c
@@ -15,6 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
 #include "DFPlatform.h"
 #include "DFFilesystem.h"
 #include "DFString.h"
@@ -23,12 +29,6 @@
 #include <DocFormats/DFError.h>
 #include "DFCharacterSet.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/DFHashTable.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFHashTable.c b/DocFormats/core/src/lib/DFHashTable.c
index 5385c3e..9fb796e 100644
--- a/DocFormats/core/src/lib/DFHashTable.c
+++ b/DocFormats/core/src/lib/DFHashTable.c
@@ -15,13 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFPlatform.h"
-#include "DFHashTable.h"
-#include "DFCommon.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "DFPlatform.h"
+#include "DFHashTable.h"
+#include "DFCommon.h"
 
 typedef struct DFHashEntry DFHashEntry;
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/DFStorage.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFStorage.c b/DocFormats/core/src/lib/DFStorage.c
index d6e404f..4a2c4ea 100644
--- a/DocFormats/core/src/lib/DFStorage.c
+++ b/DocFormats/core/src/lib/DFStorage.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include <DocFormats/DFStorage.h>
 #include "DFCommon.h"
@@ -22,10 +26,6 @@
 #include "DFFilesystem.h"
 #include "DFBuffer.h"
 #include "DFZipFile.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 typedef struct DFStorageOps DFStorageOps;
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/DFString.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFString.c b/DocFormats/core/src/lib/DFString.c
index 243439a..ea269ff 100644
--- a/DocFormats/core/src/lib/DFString.c
+++ b/DocFormats/core/src/lib/DFString.c
@@ -15,17 +15,17 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "DFString.h"
 #include "DFBuffer.h"
 #include "DFCharacterSet.h"
 #include "DFCommon.h"
 #include "DFFilesystem.h"
-#include <assert.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 typedef struct {
     int pointerIndex;

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/DFZipFile.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFZipFile.c b/DocFormats/core/src/lib/DFZipFile.c
index 2c17742..795c854 100644
--- a/DocFormats/core/src/lib/DFZipFile.c
+++ b/DocFormats/core/src/lib/DFZipFile.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "DFZipFile.h"
 #include "DFPlatform.h"
@@ -22,8 +25,6 @@
 #include "DFString.h"
 #include "DFCommon.h"
 #include "DFBuffer.h"
-#include <stdlib.h>
-#include <string.h>
 
 static int zipError(DFError **error, const char *format, ...) ATTRIBUTE_FORMAT(printf,2,3);
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/lib/TextPackage.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/TextPackage.c b/DocFormats/core/src/lib/TextPackage.c
index feff1d6..c5a9bc3 100644
--- a/DocFormats/core/src/lib/TextPackage.c
+++ b/DocFormats/core/src/lib/TextPackage.c
@@ -15,14 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "TextPackage.h"
 #include "DFBuffer.h"
 #include "DFString.h"
 #include "DFFilesystem.h"
 #include "DFCommon.h"
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/xml/DFChanges.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFChanges.c b/DocFormats/core/src/xml/DFChanges.c
index c67b0f0..5cdeea8 100644
--- a/DocFormats/core/src/xml/DFChanges.c
+++ b/DocFormats/core/src/xml/DFChanges.c
@@ -15,15 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "DFChanges.h"
 #include "DFHashTable.h"
 #include "DFString.h"
 #include "DFNameMap.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 static char *fullNameForTag(DFDocument *doc, Tag tag)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/xml/DFDOM.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFDOM.c b/DocFormats/core/src/xml/DFDOM.c
index a5ef758..f588295 100644
--- a/DocFormats/core/src/xml/DFDOM.c
+++ b/DocFormats/core/src/xml/DFDOM.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "DFDOM.h"
 #include "DFXMLNames.h"
@@ -23,9 +27,6 @@
 #include "DFAllocator.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/xml/DFMarkupCompatibility.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFMarkupCompatibility.c b/DocFormats/core/src/xml/DFMarkupCompatibility.c
index a77a08d..a2aa0de 100644
--- a/DocFormats/core/src/xml/DFMarkupCompatibility.c
+++ b/DocFormats/core/src/xml/DFMarkupCompatibility.c
@@ -15,16 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFPlatform.h"
-#include "DFMarkupCompatibility.h"
-#include "DFNameMap.h"
-#include "DFString.h"
-#include "DFCommon.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "DFPlatform.h"
+#include "DFMarkupCompatibility.h"
+#include "DFNameMap.h"
+#include "DFString.h"
+#include "DFCommon.h"
 
 #define MAX_DEPTH 256
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/xml/DFNameMap.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFNameMap.c b/DocFormats/core/src/xml/DFNameMap.c
index eb5d868..bd4015c 100644
--- a/DocFormats/core/src/xml/DFNameMap.c
+++ b/DocFormats/core/src/xml/DFNameMap.c
@@ -15,15 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "DFNameMap.h"
 #include "DFDOM.h"
 #include "DFHashTable.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 static void NameMap_staticInit();
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/src/xml/DFXML.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFXML.c b/DocFormats/core/src/xml/DFXML.c
index 449f2e1..71d8073 100644
--- a/DocFormats/core/src/xml/DFXML.c
+++ b/DocFormats/core/src/xml/DFXML.c
@@ -15,6 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <libxml/tree.h>
+#include <libxml/xmlwriter.h>
+#include <string.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFXML.h"
 #include "DFDOM.h"
@@ -23,10 +28,6 @@
 #include "DFBuffer.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <libxml/tree.h>
-#include <libxml/xmlwriter.h>
-#include <string.h>
 
 const xmlChar *INDENT =
 (const xmlChar *)"\n                                                                                "\

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/tests/common/BDTTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/common/BDTTests.c b/DocFormats/core/tests/common/BDTTests.c
index 5fdb8c4..7fb16fe 100644
--- a/DocFormats/core/tests/common/BDTTests.c
+++ b/DocFormats/core/tests/common/BDTTests.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "BDTTests.h"
 #include "DFDOM.h"
@@ -23,10 +27,6 @@
 #include "DFXML.h"
 #include "DFCommon.h"
 #include "DFUnitTest.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/tests/css/CSSTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/css/CSSTests.c b/DocFormats/core/tests/css/CSSTests.c
index ae18dce..6e4fc02 100644
--- a/DocFormats/core/tests/css/CSSTests.c
+++ b/DocFormats/core/tests/css/CSSTests.c
@@ -15,14 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFUnitTest.h"
 #include "DFHashTable.h"
 #include "DFBuffer.h"
 #include "CSSSheet.h"
 #include "DFCommon.h"
-#include <string.h>
-#include <stdlib.h>
 
 static void test_setHeadingNumbering(void)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/tests/html/HTMLPlain.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/html/HTMLPlain.c b/DocFormats/core/tests/html/HTMLPlain.c
index e131f43..85af467 100644
--- a/DocFormats/core/tests/html/HTMLPlain.c
+++ b/DocFormats/core/tests/html/HTMLPlain.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "HTMLPlain.h"
 #include "TextPackage.h"
@@ -26,9 +30,6 @@
 #include "DFCommon.h"
 #include "DFZipFile.h"
 #include "DFUnitTest.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 static void HTML_getImageSourcesRecursive(DFNode *node, DFHashTable *result)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/tests/html/HTMLTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/html/HTMLTests.c b/DocFormats/core/tests/html/HTMLTests.c
index 620182d..b99d547 100644
--- a/DocFormats/core/tests/html/HTMLTests.c
+++ b/DocFormats/core/tests/html/HTMLTests.c
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFUnitTest.h"
 #include "HTMLPlain.h"
@@ -23,7 +25,6 @@
 #include "DFXML.h"
 #include "DFDOM.h"
 #include "DFChanges.h"
-#include <stdlib.h>
 
 static void test_normalize(void)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/tests/lib/LibTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/lib/LibTests.c b/DocFormats/core/tests/lib/LibTests.c
index b4382c9..711b195 100644
--- a/DocFormats/core/tests/lib/LibTests.c
+++ b/DocFormats/core/tests/lib/LibTests.c
@@ -15,8 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFUnitTest.h"
 #include <stddef.h>
+#include <stdio.h>
+#include "DFUnitTest.h"
+
 
 static void test_sample(void)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/core/tests/xml/XMLTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/xml/XMLTests.c b/DocFormats/core/tests/xml/XMLTests.c
index da4480d..04f1041 100644
--- a/DocFormats/core/tests/xml/XMLTests.c
+++ b/DocFormats/core/tests/xml/XMLTests.c
@@ -15,8 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFUnitTest.h"
 #include <stddef.h>
+#include <stdio.h>
+#include "DFUnitTest.h"
 
 static void test_sample(void)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/latex/src/HTMLToLaTeX.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/latex/src/HTMLToLaTeX.c b/DocFormats/filters/latex/src/HTMLToLaTeX.c
index 20589f8..2b2e6c1 100644
--- a/DocFormats/filters/latex/src/HTMLToLaTeX.c
+++ b/DocFormats/filters/latex/src/HTMLToLaTeX.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "HTMLToLaTeX.h"
 #include "DFHTML.h"
@@ -23,8 +26,6 @@
 #include "DFString.h"
 #include "DFFilesystem.h"
 #include "DFCommon.h"
-#include <stdlib.h>
-#include <string.h>
 
 typedef struct LaTeXConverter LaTeXConverter;
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/latex/tests/LaTeXTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/latex/tests/LaTeXTests.c b/DocFormats/filters/latex/tests/LaTeXTests.c
index 65cb9f7..bf191e3 100644
--- a/DocFormats/filters/latex/tests/LaTeXTests.c
+++ b/DocFormats/filters/latex/tests/LaTeXTests.c
@@ -15,12 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFUnitTest.h"
 #include "HTMLPlain.h"
 #include "HTMLToLaTeX.h"
 #include "DFHTMLNormalization.h"
-#include <stdlib.h>
 
 static void test_create(void)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/odf/src/ODF.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODF.c b/DocFormats/filters/odf/src/ODF.c
index f2091de..6a0b3b4 100644
--- a/DocFormats/filters/odf/src/ODF.c
+++ b/DocFormats/filters/odf/src/ODF.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "ODF.h"
 #include "DFCommon.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/odf/src/ODFManifest.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFManifest.c b/DocFormats/filters/odf/src/ODFManifest.c
index b24c4eb..be33d70 100644
--- a/DocFormats/filters/odf/src/ODFManifest.c
+++ b/DocFormats/filters/odf/src/ODFManifest.c
@@ -15,12 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "ODFManifest.h"
 #include "DFXMLNames.h"
 #include "DFCommon.h"
-#include <stdlib.h>
-#include <string.h>
 
 static void ODFManifestParse(ODFManifest *manifest)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/odf/src/ODFPackage.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFPackage.c b/DocFormats/filters/odf/src/ODFPackage.c
index 3507586..f4ba352 100644
--- a/DocFormats/filters/odf/src/ODFPackage.c
+++ b/DocFormats/filters/odf/src/ODFPackage.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "ODFPackage.h"
 #include "DFDOM.h"
@@ -22,8 +25,6 @@
 #include "DFString.h"
 #include "DFFilesystem.h"
 #include "DFCommon.h"
-#include <stdlib.h>
-#include <string.h>
 
 static DFDocument *createDocument(Tag rootTag, Tag childTag)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/odf/src/ODFSheet.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFSheet.c b/DocFormats/filters/odf/src/ODFSheet.c
index c2ea092..3ae795b 100644
--- a/DocFormats/filters/odf/src/ODFSheet.c
+++ b/DocFormats/filters/odf/src/ODFSheet.c
@@ -15,12 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
 #include "ODFSheet.h"
 #include "DFDOM.h"
 #include "DFHashTable.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/odf/src/text/ODFText.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/text/ODFText.c b/DocFormats/filters/odf/src/text/ODFText.c
index 495df4e..05d1ed4 100644
--- a/DocFormats/filters/odf/src/text/ODFText.c
+++ b/DocFormats/filters/odf/src/text/ODFText.c
@@ -15,12 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "ODFText.h"
 #include "ODFPackage.h"
 #include "ODFTextConverter.h"
 #include "DFDOM.h"
-#include <stdio.h>
 
 static void traverseContent(ODFTextConverter *conv, DFNode *odfNode, DFNode *htmlNode)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/odf/src/text/ODFTextConverter.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/text/ODFTextConverter.c b/DocFormats/filters/odf/src/text/ODFTextConverter.c
index 760576a..878e320 100644
--- a/DocFormats/filters/odf/src/text/ODFTextConverter.c
+++ b/DocFormats/filters/odf/src/text/ODFTextConverter.c
@@ -15,10 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "ODFTextConverter.h"
 #include "DFString.h"
-#include <stdlib.h>
 
 ODFTextConverter *ODFTextConverterNew(DFDocument *html,
                                       DFStorage *abstractStorage,

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/common/OPC.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/common/OPC.c b/DocFormats/filters/ooxml/src/common/OPC.c
index 9c7c1ed..998ed79 100644
--- a/DocFormats/filters/ooxml/src/common/OPC.c
+++ b/DocFormats/filters/ooxml/src/common/OPC.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "OPC.h"
 #include "DFDOM.h"
@@ -24,8 +27,6 @@
 #include "DFHashTable.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/CSSClassNames.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/CSSClassNames.c b/DocFormats/filters/ooxml/src/word/CSSClassNames.c
index 2c47bc6..df4be1a 100644
--- a/DocFormats/filters/ooxml/src/word/CSSClassNames.c
+++ b/DocFormats/filters/ooxml/src/word/CSSClassNames.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "CSSClassNames.h"
 #include "CSS.h"
 #include "CSSProperties.h"
@@ -30,8 +33,6 @@
 #include "Word.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <stdlib.h>
-#include <string.h>
 
 static const char *classPrefixForElementName(const char *elementName);
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/Word.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/Word.c b/DocFormats/filters/ooxml/src/word/Word.c
index d5db0c7..80275fb 100644
--- a/DocFormats/filters/ooxml/src/word/Word.c
+++ b/DocFormats/filters/ooxml/src/word/Word.c
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "Word.h"
 #include "WordStyles.h"
@@ -24,7 +26,6 @@
 #include "DFString.h"
 #include "DFCommon.h"
 #include "DFZipFile.h"
-#include <stdlib.h>
 
 DFDocument *WordGet(DFStorage *concreteStorage, DFStorage *abstractStorage, const char *idPrefix, DFError **error)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordCaption.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordCaption.c b/DocFormats/filters/ooxml/src/word/WordCaption.c
index 4ac1149..c811d98 100644
--- a/DocFormats/filters/ooxml/src/word/WordCaption.c
+++ b/DocFormats/filters/ooxml/src/word/WordCaption.c
@@ -15,10 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
 #include "WordCaption.h"
 #include "DFPlatform.h"
 #include "DFCommon.h"
-#include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordConverter.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.c b/DocFormats/filters/ooxml/src/word/WordConverter.c
index a68629e..f4b3298 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.c
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordConverter.h"
 #include "WordBookmark.h"
@@ -48,9 +52,6 @@
 #include "DFString.h"
 #include "DFCharacterSet.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 static int isWhitespaceRun(DFNode *run)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordGC.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordGC.c b/DocFormats/filters/ooxml/src/word/WordGC.c
index 0df299a..24aed62 100644
--- a/DocFormats/filters/ooxml/src/word/WordGC.c
+++ b/DocFormats/filters/ooxml/src/word/WordGC.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordGC.h"
 #include "WordConverter.h"
@@ -25,8 +28,6 @@
 #include "DFString.h"
 #include "DFHashTable.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordLists.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordLists.c b/DocFormats/filters/ooxml/src/word/WordLists.c
index e9dee43..638f60d 100644
--- a/DocFormats/filters/ooxml/src/word/WordLists.c
+++ b/DocFormats/filters/ooxml/src/word/WordLists.c
@@ -15,6 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordLists.h"
 #include "DFDOM.h"
@@ -26,10 +31,6 @@
 #include "DFHTML.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
 
 typedef struct ListDimensions {
     double marginLeftPct;

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordNotes.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordNotes.c b/DocFormats/filters/ooxml/src/word/WordNotes.c
index 2e49c83..029f294 100644
--- a/DocFormats/filters/ooxml/src/word/WordNotes.c
+++ b/DocFormats/filters/ooxml/src/word/WordNotes.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordNotes.h"
 #include "WordConverter.h"
@@ -22,8 +25,6 @@
 #include "WordLenses.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordNumbering.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordNumbering.c b/DocFormats/filters/ooxml/src/word/WordNumbering.c
index 47b85d5..2cecb9b 100644
--- a/DocFormats/filters/ooxml/src/word/WordNumbering.c
+++ b/DocFormats/filters/ooxml/src/word/WordNumbering.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordNumbering.h"
 #include "WordStyles.h"
@@ -23,10 +27,6 @@
 #include "DFHashTable.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordObjects.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordObjects.c b/DocFormats/filters/ooxml/src/word/WordObjects.c
index d4a9877..cbd0c3e 100644
--- a/DocFormats/filters/ooxml/src/word/WordObjects.c
+++ b/DocFormats/filters/ooxml/src/word/WordObjects.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "WordObjects.h"
 #include "WordPackage.h"
 #include "WordDrawing.h"
@@ -25,8 +28,6 @@
 #include "DFHashTable.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordPackage.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordPackage.c b/DocFormats/filters/ooxml/src/word/WordPackage.c
index 7595de6..d28bd34 100644
--- a/DocFormats/filters/ooxml/src/word/WordPackage.c
+++ b/DocFormats/filters/ooxml/src/word/WordPackage.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordPackage.h"
 #include "WordStyles.h"
@@ -27,9 +31,6 @@
 #include "WordField.h"
 #include "WordBookmark.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 static DFDocument *parsePart(WordPackage *package, OPCPart *part, DFError **error);
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordSection.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordSection.c b/DocFormats/filters/ooxml/src/word/WordSection.c
index 97ca444..d1f4b50 100644
--- a/DocFormats/filters/ooxml/src/word/WordSection.c
+++ b/DocFormats/filters/ooxml/src/word/WordSection.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "WordSection.h"
 #include "WordStyles.h"
 #include "CSSProperties.h"
@@ -22,8 +25,6 @@
 #include "DFString.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <math.h>
-#include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordSettings.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordSettings.c b/DocFormats/filters/ooxml/src/word/WordSettings.c
index 6ada764..21276b6 100644
--- a/DocFormats/filters/ooxml/src/word/WordSettings.c
+++ b/DocFormats/filters/ooxml/src/word/WordSettings.c
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordSettings.h"
 #include "DFDOM.h"
@@ -22,7 +24,6 @@
 #include "WordPackage.h"
 #include "WordConverter.h"
 #include "DFCommon.h"
-#include <assert.h>
 
 static Tag WordSettings_Children[] = {
     WORD_WRITEPROTECTION,

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordSheet.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordSheet.c b/DocFormats/filters/ooxml/src/word/WordSheet.c
index 8c9231c..2f5cbe8 100644
--- a/DocFormats/filters/ooxml/src/word/WordSheet.c
+++ b/DocFormats/filters/ooxml/src/word/WordSheet.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "WordSheet.h"
 #include "DFDOM.h"
 #include "CSSSelector.h"
@@ -22,9 +26,6 @@
 #include "Word.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 static char *WordSheetIdentForType(const char *type, const char *styleId)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordStyles.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordStyles.c b/DocFormats/filters/ooxml/src/word/WordStyles.c
index 5358d6d..b077328 100644
--- a/DocFormats/filters/ooxml/src/word/WordStyles.c
+++ b/DocFormats/filters/ooxml/src/word/WordStyles.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordStyles.h"
 #include "DFDOM.h"
@@ -30,9 +34,6 @@
 #include "DFString.h"
 #include "DFHashTable.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 static Tag WordSectPr_Children[] = {
     WORD_FOOTNOTEPR,

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordTheme.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordTheme.c b/DocFormats/filters/ooxml/src/word/WordTheme.c
index d64fc8e..7cc07a4 100644
--- a/DocFormats/filters/ooxml/src/word/WordTheme.c
+++ b/DocFormats/filters/ooxml/src/word/WordTheme.c
@@ -15,14 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordTheme.h"
 #include "WordConverter.h"
 #include "DFDOM.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/WordWhitespace.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordWhitespace.c b/DocFormats/filters/ooxml/src/word/WordWhitespace.c
index ade5d5c..0b5c10d 100644
--- a/DocFormats/filters/ooxml/src/word/WordWhitespace.c
+++ b/DocFormats/filters/ooxml/src/word/WordWhitespace.c
@@ -15,13 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordWhitespace.h"
 #include "DFDOM.h"
 #include "DFClassNames.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <stdlib.h>
 
 static void addNbsps(DFNode *node, int inParagraph, int *havePrecedingSpace)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.c b/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.c
index dd50fd5..4873aa5 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.c
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordCommonPr.h"
 #include "WordStyles.h"
@@ -24,9 +28,6 @@
 #include "DFHTML.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
 
 int Word_parseOnOff(const char *value)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.c b/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.c
index b8e431d..a18c76d 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.c
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.c
@@ -15,6 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordNumPr.h"
 #include "WordNumbering.h"
@@ -22,10 +27,6 @@
 #include "CSS.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
 
 static char *parseLvlText(const char *input, WordConcreteNum *num)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/formatting/WordPPr.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordPPr.c b/DocFormats/filters/ooxml/src/word/formatting/WordPPr.c
index 022ba5e..fc62217 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordPPr.c
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordPPr.c
@@ -15,6 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordPPr.h"
 #include "WordStyles.h"
@@ -23,10 +28,6 @@
 #include "DFHTML.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
 
 static Tag WordNumPr_Children[] = {
     WORD_ILVL,

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/formatting/WordRPr.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordRPr.c b/DocFormats/filters/ooxml/src/word/formatting/WordRPr.c
index a2f13a1..710c717 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordRPr.c
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordRPr.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordRPr.h"
 #include "WordStyles.h"
@@ -23,8 +26,6 @@
 #include "DFHTML.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <stdlib.h>
-#include <string.h>
 
 static Tag WordRPR_Children[] = {
     WORD_RSTYLE,

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.c b/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.c
index 5ce603f..39b7459 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.c
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordTblPr.h"
 #include "WordStyles.h"
@@ -23,9 +27,6 @@
 #include "DFHTML.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
 
 static Tag WordTblPr_children[] = {
     WORD_TBLSTYLE,

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordBlockLevel.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordBlockLevel.c b/DocFormats/filters/ooxml/src/word/lenses/WordBlockLevel.c
index c7857ae..edd9827 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordBlockLevel.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordBlockLevel.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "DFDOM.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordBody.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordBody.c b/DocFormats/filters/ooxml/src/word/lenses/WordBody.c
index a1f920e..aa12b32 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordBody.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordBody.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "DFDOM.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c b/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c
index 56d8a02..a009b66 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 #include "WordBookmark.h"
 #include "WordLenses.h"
 #include "DFDOM.h"
@@ -27,9 +31,6 @@
 #include "DFString.h"
 #include "DFCommon.h"
 #include "DFPlatform.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 static void findTargetAndType(WordBookmark *bookmark, WordSheet *sheet);
 void findLabel(WordBookmark *bookmark);

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordChange.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordChange.c b/DocFormats/filters/ooxml/src/word/lenses/WordChange.c
index 861706a..c7e3de7 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordChange.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordChange.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "DFDOM.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordDocument.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordDocument.c b/DocFormats/filters/ooxml/src/word/lenses/WordDocument.c
index 01bb883..3bee6c3 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordDocument.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordDocument.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "DFDOM.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c b/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c
index 77ef362..ff58da0 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c
@@ -15,6 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordDrawing.h"
 #include "WordLenses.h"
@@ -29,11 +34,6 @@
 #include "DFString.h"
 #include "DFPlatform.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 
 static int internalPut(WordPutData *put, DFNode *abstract, DFNode *concrete, int isNew);
 static void populateDrawingElement(WordConverter *converter, DFNode *root, double widthPts,

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordEquation.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordEquation.c b/DocFormats/filters/ooxml/src/word/lenses/WordEquation.c
index 79694b3..50ed1a7 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordEquation.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordEquation.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "DFCommon.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordField.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordField.c b/DocFormats/filters/ooxml/src/word/lenses/WordField.c
index 5ba51ac..0f8fcb0 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordField.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordField.c
@@ -15,6 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordField.h"
 #include "WordLenses.h"
@@ -27,10 +32,6 @@
 #include "DFString.h"
 #include "DFArray.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
 
 static void WordFieldPut(WordPutData *put, DFNode *abstract, DFNode *concrete);
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordHyperlink.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordHyperlink.c b/DocFormats/filters/ooxml/src/word/lenses/WordHyperlink.c
index 00ee642..6606055 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordHyperlink.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordHyperlink.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "WordStyles.h"
@@ -22,8 +25,6 @@
 #include "CSSProperties.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <string.h>
 
 static void WordHyperlinkPut(WordPutData *put, DFNode *abstract, DFNode *concrete);
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordLenses.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordLenses.c b/DocFormats/filters/ooxml/src/word/lenses/WordLenses.c
index 994f45a..5bdea38 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordLenses.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordLenses.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "DFCommon.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordParagraph.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordParagraph.c b/DocFormats/filters/ooxml/src/word/lenses/WordParagraph.c
index 5801221..f466902 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordParagraph.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordParagraph.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "WordSheet.h"
@@ -31,9 +35,6 @@
 #include "DFNameMap.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordParagraphContent.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordParagraphContent.c b/DocFormats/filters/ooxml/src/word/lenses/WordParagraphContent.c
index 5bc9e57..51881b4 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordParagraphContent.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordParagraphContent.c
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "WordBookmark.h"
@@ -23,7 +25,6 @@
 #include "DFString.h"
 #include "DFHTML.h"
 #include "DFCommon.h"
-#include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordRun.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordRun.c b/DocFormats/filters/ooxml/src/word/lenses/WordRun.c
index 9496dba..b64ac7d 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordRun.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordRun.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "DFString.h"
@@ -25,9 +29,6 @@
 #include "CSS.h"
 #include "CSSProperties.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordRunContent.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordRunContent.c b/DocFormats/filters/ooxml/src/word/lenses/WordRunContent.c
index 0cc5a09..dd8a9c1 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordRunContent.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordRunContent.c
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "DFDOM.h"
@@ -22,7 +24,6 @@
 #include "WordNotes.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //                                                                                                //

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c b/DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c
index df74119..53a1443 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "DFDOM.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/src/word/lenses/WordTable.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordTable.c b/DocFormats/filters/ooxml/src/word/lenses/WordTable.c
index 6f69130..9d0b380 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordTable.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordTable.c
@@ -15,6 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "WordLenses.h"
 #include "WordStyles.h"
@@ -28,10 +33,6 @@
 #include "WordSection.h"
 #include "DFString.h"
 #include "DFCommon.h"
-#include <assert.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
 
 typedef struct {
     CSSProperties *tableProperties;

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/tests/word/WordPlain.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/tests/word/WordPlain.c b/DocFormats/filters/ooxml/tests/word/WordPlain.c
index dfb13a4..7b4d1c3 100644
--- a/DocFormats/filters/ooxml/tests/word/WordPlain.c
+++ b/DocFormats/filters/ooxml/tests/word/WordPlain.c
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "WordPlain.h"
 #include "TextPackage.h"
@@ -28,9 +31,6 @@
 #include "DFCommon.h"
 #include "DFZipFile.h"
 #include "DFUnitTest.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 static void addStrippedSerializedDoc(DFBuffer *result, DFDocument *doc, const char *filename)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/filters/ooxml/tests/word/WordTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/tests/word/WordTests.c b/DocFormats/filters/ooxml/tests/word/WordTests.c
index e32aef8..12755aa 100644
--- a/DocFormats/filters/ooxml/tests/word/WordTests.c
+++ b/DocFormats/filters/ooxml/tests/word/WordTests.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "DFPlatform.h"
 #include "DFUnitTest.h"
 #include "DFCommon.h"
@@ -24,9 +28,6 @@
 #include "DFString.h"
 #include "DFHTML.h"
 #include <DocFormats/Operations.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
 
 static void test_collapseBookmarks(void)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/platform/src/Apple.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Apple.c b/DocFormats/platform/src/Apple.c
index 576743f..9a03cfe 100644
--- a/DocFormats/platform/src/Apple.c
+++ b/DocFormats/platform/src/Apple.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 
 // This file contains functions that are applicable to iOS and OS X

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/platform/src/Linux.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Linux.c b/DocFormats/platform/src/Linux.c
index bba6658..8b79412 100644
--- a/DocFormats/platform/src/Linux.c
+++ b/DocFormats/platform/src/Linux.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 
 // This file contains functions that are applicable to Linux (or more generally, any non-Apple Unix platform)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/platform/src/Unix.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Unix.c b/DocFormats/platform/src/Unix.c
index c318548..bb134bd 100644
--- a/DocFormats/platform/src/Unix.c
+++ b/DocFormats/platform/src/Unix.c
@@ -15,12 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFPlatform.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <sys/stat.h>
+#include "DFPlatform.h"
 
 // This file contains functions that are applicable to all Unix-based platforms, including Linux, iOS, and OS X
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/platform/src/Win32.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Win32.c b/DocFormats/platform/src/Win32.c
index d02f304..edd94d5 100755
--- a/DocFormats/platform/src/Win32.c
+++ b/DocFormats/platform/src/Win32.c
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
 #include "DFPlatform.h"
 
 // This file contains functions that are applicable to Windows

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/platform/src/Wrapper_zip.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Wrapper_zip.c b/DocFormats/platform/src/Wrapper_zip.c
index d61f865..0066254 100644
--- a/DocFormats/platform/src/Wrapper_zip.c
+++ b/DocFormats/platform/src/Wrapper_zip.c
@@ -39,14 +39,14 @@ typedef struct {
 
 static int readEndRecord(FILE *zipFile, DFextZipHandleP zipHandle)
 {
-	long fileSize, readBytes, i;
+	unsigned long fileSize, readBytes, i;
 	unsigned char workBuf[WORK_BUF_SIZE];
 
 	// find end of file, and calculate size
 	if (fseek(zipFile, 0, SEEK_END))
 		return -1;
 	fileSize = ftell(zipFile);
-	if ( fileSize <= sizeof(ZipEndRecord) ) {
+	if ( fileSize <= sizeof(ZipEndRecord) )
 		return -1;
 
 	// Read WORK_BUF_SIZE of filesize from end of file to locate EndRecord
@@ -71,8 +71,7 @@ DFextZipHandleP DFextZipOpen(const char *zipFilename) {
 
 
 
-
-
+#if 0
 		// Naively assume signature can only be found in one place...
 		for (i = readBytes - sizeof(JZEndRecord); i >= 0; i--) {
 			er = (JZEndRecord *)(jzBuffer + i);
@@ -94,7 +93,7 @@ DFextZipHandleP DFextZipOpen(const char *zipFilename) {
 		}
 
 		return Z_OK;
-
+#endif
 
 
 	// release memory

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/platform/tests/OStests.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/tests/OStests.c b/DocFormats/platform/tests/OStests.c
index 6ee74f1..3d00bcd 100644
--- a/DocFormats/platform/tests/OStests.c
+++ b/DocFormats/platform/tests/OStests.c
@@ -15,10 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFUnitTest.h"
-#include "DFPlatform.h"
 #include <stddef.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include "DFUnitTest.h"
+#include "DFPlatform.h"
 
 static void test_DFGetImageDimensions_gif(void)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/platform/tests/WrapperTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/tests/WrapperTests.c b/DocFormats/platform/tests/WrapperTests.c
index daa5726..8e21024 100644
--- a/DocFormats/platform/tests/WrapperTests.c
+++ b/DocFormats/platform/tests/WrapperTests.c
@@ -15,9 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stddef.h>
+#include <stdio.h>
 #include "DFUnitTest.h"
 #include "DFPlatform.h"
-#include <stddef.h>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/DocFormats/unittest/DFUnitTest.c
----------------------------------------------------------------------
diff --git a/DocFormats/unittest/DFUnitTest.c b/DocFormats/unittest/DFUnitTest.c
index 17e8ae1..1296b4f 100644
--- a/DocFormats/unittest/DFUnitTest.c
+++ b/DocFormats/unittest/DFUnitTest.c
@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFUnitTest.h"
-#include "DFPlatform.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "DFUnitTest.h"
+#include "DFPlatform.h"
 
 struct {
     int failed;

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/consumers/dfconvert/src/main.c
----------------------------------------------------------------------
diff --git a/consumers/dfconvert/src/main.c b/consumers/dfconvert/src/main.c
index 7295691..430eed5 100644
--- a/consumers/dfconvert/src/main.c
+++ b/consumers/dfconvert/src/main.c
@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "DFPlatform.h"
-#include <DocFormats/DocFormats.h>
 #include <stdio.h>
 #include <string.h>
+#include "DFPlatform.h"
+#include <DocFormats/DocFormats.h>
 
 void usage(void)
 {

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/consumers/dftest/src/main.c
----------------------------------------------------------------------
diff --git a/consumers/dftest/src/main.c b/consumers/dftest/src/main.c
index 2621b89..dc88e32 100644
--- a/consumers/dftest/src/main.c
+++ b/consumers/dftest/src/main.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
 #include "DFPlatform.h"
 #include "DFUnitTest.h"
 #include "TextPackage.h"
@@ -24,10 +28,6 @@
 #include "DFUnitTest.h"
 #include "DFArray.h"
 #include "DFBuffer.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
 
 extern TestGroup APITests;
 extern TestGroup CSSTests;

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/055b257c/consumers/dfutil/src/Commands.c
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/Commands.c b/consumers/dfutil/src/Commands.c
index 7ec5827..60253e9 100644
--- a/consumers/dfutil/src/Commands.c
+++ b/consumers/dfutil/src/Commands.c
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "DFPlatform.h"
 #include "Commands.h"
 #include "BDTTests.h"
@@ -34,10 +38,6 @@
 #include "DFCommon.h"
 #include "DFZipFile.h"
 #include <DocFormats/DocFormats.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 static DFBuffer *readData(const char *filename, DFError **error)
 {



Mime
View raw message