diff --git a/OOXML/Base/DateTime.h b/OOXML/Base/DateTime.h
index a63b9b8380..6460d07ac3 100644
--- a/OOXML/Base/DateTime.h
+++ b/OOXML/Base/DateTime.h
@@ -33,7 +33,7 @@
 #ifndef UTILITY_DATE_TIME_INCLUDE_H_
 #define UTILITY_DATE_TIME_INCLUDE_H_
 
-#include "./Base.h"
+#include <string>
 
 //----------------------------------------------------------------------------------------------
 //  DateTime
diff --git a/OOXML/Common/SimpleTypes_Base.h b/OOXML/Common/SimpleTypes_Base.h
index 5bbadfffd6..741aa8b2bf 100644
--- a/OOXML/Common/SimpleTypes_Base.h
+++ b/OOXML/Common/SimpleTypes_Base.h
@@ -31,7 +31,6 @@
  */
 #pragma once
 
-#include <string>
 #include "../Base/Base.h"
 
 namespace SimpleTypes
diff --git a/OOXML/Common/SimpleTypes_Vml.h b/OOXML/Common/SimpleTypes_Vml.h
index 1d1b032073..c5fa190c9f 100644
--- a/OOXML/Common/SimpleTypes_Vml.h
+++ b/OOXML/Common/SimpleTypes_Vml.h
@@ -33,10 +33,6 @@
 
 #include "SimpleTypes_Drawing.h"
 
-#include <vector>
-#include <map>
-#include <boost/shared_ptr.hpp>
-
 // Here are simple types Vml from spec Office Open Xml Part4 14
 namespace SimpleTypes
 {
diff --git a/OOXML/DocxFormat/Diagram/DiagramData.h b/OOXML/DocxFormat/Diagram/DiagramData.h
index b59f218fde..e9c70ddab9 100644
--- a/OOXML/DocxFormat/Diagram/DiagramData.h
+++ b/OOXML/DocxFormat/Diagram/DiagramData.h
@@ -31,9 +31,6 @@
  */
 #pragma once
 
-#include "../IFileContainer.h"
-#include "../FileTypes.h"
-#include "../File.h"
 #include "../../Base/Nullable.h"
 
 #include "../WritingElement.h"
diff --git a/OOXML/DocxFormat/Diagram/DiagramDrawing.h b/OOXML/DocxFormat/Diagram/DiagramDrawing.h
index a4b9217958..2bcbf365d7 100644
--- a/OOXML/DocxFormat/Diagram/DiagramDrawing.h
+++ b/OOXML/DocxFormat/Diagram/DiagramDrawing.h
@@ -31,13 +31,8 @@
  */
 #pragma once
 
-#include "../IFileContainer.h"
-#include "../FileTypes.h"
-#include "../File.h"
 #include "../../Base/Nullable.h"
-
 #include "../WritingElement.h"
-
 #include "../../PPTXFormat/Logic/SpTree.h"
 
 namespace OOX
diff --git a/OOXML/DocxFormat/Drawing/Drawing.h b/OOXML/DocxFormat/Drawing/Drawing.h
index 70e47cbd9c..a9742141c7 100644
--- a/OOXML/DocxFormat/Drawing/Drawing.h
+++ b/OOXML/DocxFormat/Drawing/Drawing.h
@@ -36,12 +36,8 @@
 #include "../../Common/SimpleTypes_Shared.h"
 
 #include "../WritingElement.h"
-#include "../RId.h"
-
 #include "../../PPTXFormat/Logic/GraphicFrame.h"
 
-#include "../../SystemUtility/SystemUtility.h"
-
 namespace OOX
 {
 	namespace Drawing
diff --git a/OOXML/DocxFormat/Logic/AlternateContent.h b/OOXML/DocxFormat/Logic/AlternateContent.h
index 045d283076..7e4cbfd63d 100644
--- a/OOXML/DocxFormat/Logic/AlternateContent.h
+++ b/OOXML/DocxFormat/Logic/AlternateContent.h
@@ -35,7 +35,7 @@
 
 #include "../../Base/Nullable.h"
 #include "../WritingElement.h"
-#include "../../XlsxFormat/WritingElement.h"
+
 namespace OOX
 {
 	namespace Logic
diff --git a/OOXML/DocxFormat/Logic/Annotations.h b/OOXML/DocxFormat/Logic/Annotations.h
index d358f99040..deabc0d6b8 100644
--- a/OOXML/DocxFormat/Logic/Annotations.h
+++ b/OOXML/DocxFormat/Logic/Annotations.h
@@ -32,11 +32,7 @@
 #pragma once
 
 #include "../../Base/Nullable.h"
-
-#include "../../Common/SimpleTypes_Shared.h"
 #include "../../Common/SimpleTypes_Word.h"
-#include "../../Common/ComplexTypes.h"
-
 #include "./../WritingElement.h"
 
 namespace OOX
diff --git a/OOXML/DocxFormat/Logic/Hyperlink.h b/OOXML/DocxFormat/Logic/Hyperlink.h
index e0d6106f55..95556c167a 100644
--- a/OOXML/DocxFormat/Logic/Hyperlink.h
+++ b/OOXML/DocxFormat/Logic/Hyperlink.h
@@ -34,7 +34,6 @@
 #include "../../Base/Nullable.h"
 
 #include "../WritingElement.h"
-#include "../../Common/SimpleTypes_Word.h"
 #include "../../Common/SimpleTypes_Shared.h"
 #include "../../Common/ComplexTypes.h"
 
diff --git a/OOXML/DocxFormat/Logic/ParagraphProperty.h b/OOXML/DocxFormat/Logic/ParagraphProperty.h
index af7ecbad22..5522b99f7b 100644
--- a/OOXML/DocxFormat/Logic/ParagraphProperty.h
+++ b/OOXML/DocxFormat/Logic/ParagraphProperty.h
@@ -33,9 +33,7 @@
 #ifndef OOX_LOGIC_PARAGRAPH_PROPERTY_INCLUDE_H_
 #define OOX_LOGIC_PARAGRAPH_PROPERTY_INCLUDE_H_
 
-#include "../../Common/SimpleTypes_Shared.h"
 #include "../../Common/SimpleTypes_Word.h"
-
 #include "./../WritingElement.h"
 
 #include "RunProperty.h"
@@ -66,7 +64,6 @@ namespace OOX
 			nullable<ComplexTypes::Word::CDecimalNumber > m_oIlvl;
 			nullable<ComplexTypes::Word::CTrackChange   > m_oIns;
 			nullable<ComplexTypes::Word::CDecimalNumber > m_oNumID;
-
 		};
 
 		//--------------------------------------------------------------------------------
diff --git a/OOXML/DocxFormat/Logic/Pict.h b/OOXML/DocxFormat/Logic/Pict.h
index 239ed6c67b..9630d15408 100644
--- a/OOXML/DocxFormat/Logic/Pict.h
+++ b/OOXML/DocxFormat/Logic/Pict.h
@@ -32,7 +32,6 @@
 #pragma once
 
 #include "../Drawing/Drawing.h"
-#include "../../Common/SimpleTypes_Word.h"
 
 #include "VmlOfficeDrawing.h"
 #include "Vml.h"
diff --git a/OOXML/DocxFormat/Logic/RunContent.h b/OOXML/DocxFormat/Logic/RunContent.h
index 0aa6f9b0ac..069587802c 100644
--- a/OOXML/DocxFormat/Logic/RunContent.h
+++ b/OOXML/DocxFormat/Logic/RunContent.h
@@ -33,7 +33,6 @@
 
 #include "../../DocxFormat/WritingElement.h"
 #include "../../Base/Nullable.h"
-#include "../../Common/SimpleTypes_Word.h"
 #include "../../Common/ComplexTypes.h"
 #include "../../PPTXFormat/Logic/Xfrm.h"
 
diff --git a/OOXML/DocxFormat/Logic/RunProperty.h b/OOXML/DocxFormat/Logic/RunProperty.h
index a52fd525b4..f6a7753755 100644
--- a/OOXML/DocxFormat/Logic/RunProperty.h
+++ b/OOXML/DocxFormat/Logic/RunProperty.h
@@ -34,7 +34,6 @@
 #include "../WritingElement.h"
 
 #include "../../Base/Nullable.h"
-#include "../../Common/SimpleTypes_Shared.h"
 #include "../../Common/ComplexTypes.h"
 
 #include "../../PPTXFormat/Logic/Ln.h"
diff --git a/OOXML/DocxFormat/Logic/SectionProperty.h b/OOXML/DocxFormat/Logic/SectionProperty.h
index 5fe003dc46..e934da6fd6 100644
--- a/OOXML/DocxFormat/Logic/SectionProperty.h
+++ b/OOXML/DocxFormat/Logic/SectionProperty.h
@@ -32,10 +32,7 @@
 #pragma once
 
 #include "../../Base/Nullable.h"
-
 #include "../WritingElement.h"
-#include "../../Common/SimpleTypes_Shared.h"
-#include "../../Common/SimpleTypes_Word.h"
 #include "../../Common/ComplexTypes.h"
 
 namespace ComplexTypes
diff --git a/OOXML/DocxFormat/Logic/SmartTag.h b/OOXML/DocxFormat/Logic/SmartTag.h
index 0098ed8ee7..5982e27dc7 100644
--- a/OOXML/DocxFormat/Logic/SmartTag.h
+++ b/OOXML/DocxFormat/Logic/SmartTag.h
@@ -31,10 +31,7 @@
  */
 #pragma once
 #include "../../Base/Nullable.h"
-
 #include "../WritingElement.h"
-#include "../../Common/SimpleTypes_Word.h"
-#include "../../Common/SimpleTypes_Shared.h"
 
 namespace OOX
 {
diff --git a/OOXML/DocxFormat/Logic/Vml.cpp b/OOXML/DocxFormat/Logic/Vml.cpp
index 09a5e6a159..93f8504c07 100644
--- a/OOXML/DocxFormat/Logic/Vml.cpp
+++ b/OOXML/DocxFormat/Logic/Vml.cpp
@@ -32,6 +32,7 @@
 #include "../DocxFlat.h"
 #include "Vml.h"
 #include "VmlOfficeDrawing.h"
+#include "VmlWord.h"
 
 #include "Paragraph.h"
 #include "Annotations.h"
diff --git a/OOXML/DocxFormat/Logic/Vml.h b/OOXML/DocxFormat/Logic/Vml.h
index aa9a6fea0f..baab40a38f 100644
--- a/OOXML/DocxFormat/Logic/Vml.h
+++ b/OOXML/DocxFormat/Logic/Vml.h
@@ -32,17 +32,12 @@
 #pragma once
 
 #include "../../Base/Nullable.h"
-
-#include "../../Common/SimpleTypes_Word.h"
 #include "../../Common/SimpleTypes_Vml.h"
 #include "../../XlsxFormat/Controls/Controls.h"
 
-#include "VmlWord.h"
 #include "Shape.h"
 
 #include "../WritingElement.h"
-#include "../RId.h"
-
 #include "VmlOfficeDrawing.h"
 
 namespace OOX
diff --git a/OOXML/DocxFormat/Logic/VmlOfficeDrawing.h b/OOXML/DocxFormat/Logic/VmlOfficeDrawing.h
index 7a35774e5e..d8971b20a8 100644
--- a/OOXML/DocxFormat/Logic/VmlOfficeDrawing.h
+++ b/OOXML/DocxFormat/Logic/VmlOfficeDrawing.h
@@ -34,16 +34,10 @@
 #define OOX_VML_OFFICE_INCLUDE_H_
 
 #include "../../Base/Nullable.h"
-
 #include "../../Common/ComplexTypes.h"
-
-#include "../../Common/SimpleTypes_Shared.h"
-#include "../../Common/SimpleTypes_Word.h"
 #include "../../Common/SimpleTypes_Vml.h"
 
 #include "../WritingElement.h"
-#include "../RId.h"
-
 #include "../../PPTXFormat/WrapperWritingElement.h"
 
 namespace OOX
diff --git a/OOXML/DocxFormat/Logic/VmlWord.h b/OOXML/DocxFormat/Logic/VmlWord.h
index 2b47d7e444..42a1a34d68 100644
--- a/OOXML/DocxFormat/Logic/VmlWord.h
+++ b/OOXML/DocxFormat/Logic/VmlWord.h
@@ -34,12 +34,8 @@
 #define OOX_VML_WORD_INCLUDE_H_
 
 #include "../../Base/Nullable.h"
-
-#include "../../Common/SimpleTypes_Word.h"
-#include "../../Common/SimpleTypes_Vml.h"
-
 #include "../WritingElement.h"
-#include "../RId.h"
+#include "../../Common/SimpleTypes_Vml.h"
 
 namespace OOX
 {
diff --git a/OOXML/DocxFormat/Math/OMath.h b/OOXML/DocxFormat/Math/OMath.h
index 3a55e83448..63f0db2e1f 100644
--- a/OOXML/DocxFormat/Math/OMath.h
+++ b/OOXML/DocxFormat/Math/OMath.h
@@ -30,8 +30,8 @@
  *
  */
 #pragma once
+
 #include "../WritingElement.h"
-#include "../../Base/Nullable.h"
 
 namespace OOX
 {	
diff --git a/OOXML/DocxFormat/Math/oMathBottomNodes.h b/OOXML/DocxFormat/Math/oMathBottomNodes.h
index d8e8bd9eaa..b5377cf2d8 100644
--- a/OOXML/DocxFormat/Math/oMathBottomNodes.h
+++ b/OOXML/DocxFormat/Math/oMathBottomNodes.h
@@ -30,6 +30,7 @@
  *
  */
 #pragma once
+#include "../../Base/Nullable.h"
 #include "../WritingElement.h"
 #include "../../Common/SimpleTypes_Shared.h"
 #include "../../Common/SimpleTypes_OMath.h"
diff --git a/OOXML/DocxFormat/Math/oMathContent.h b/OOXML/DocxFormat/Math/oMathContent.h
index 4782e1a9fe..8ac50ad8eb 100644
--- a/OOXML/DocxFormat/Math/oMathContent.h
+++ b/OOXML/DocxFormat/Math/oMathContent.h
@@ -31,8 +31,6 @@
  */
 #pragma once
 
-#include "../../Common/ComplexTypes.h"
-
 #include "oMathBottomNodes.h"
 #include "OMath.h"
 
@@ -44,7 +42,6 @@
 #include "../Drawing/Drawing.h"
 #include "../../PPTXFormat/Logic/RunProperties.h"
 
-
 namespace OOX
 {	
 	// Elements 22.1.2
diff --git a/OOXML/DocxFormat/WritingElement.h b/OOXML/DocxFormat/WritingElement.h
index 3c305165de..bc50cd176a 100644
--- a/OOXML/DocxFormat/WritingElement.h
+++ b/OOXML/DocxFormat/WritingElement.h
@@ -32,7 +32,6 @@
 #pragma once
 
 #include "../../DesktopEditor/xml/include/xmlutils.h"
-#include "../../MsBinaryFile/XlsFile/Format/Logic/BaseObject.h"
 #include "../Base/SmartPtr.h"
 
 namespace NSBinPptxRW
diff --git a/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro b/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro
index 8177b1c4da..ad8d0b219e 100644
--- a/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro
+++ b/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro
@@ -221,7 +221,6 @@ HEADERS += \
 	../../../DocxFormat/External/HyperLink.h \
 	../../../DocxFormat/Logic/AlternateContent.h \
 	../../../DocxFormat/Logic/Annotations.h \
-	../../../DocxFormat/Logic/BaseLogicSettings.h \
 	../../../DocxFormat/Logic/Bdo.h \
 	../../../DocxFormat/Logic/Dir.h \
 	../../../DocxFormat/Logic/FldChar.h \
diff --git a/OdfFile/Writer/Converter/Converter.h b/OdfFile/Writer/Converter/Converter.h
index 33ad5b76da..35ebb13f61 100644
--- a/OdfFile/Writer/Converter/Converter.h
+++ b/OdfFile/Writer/Converter/Converter.h
@@ -34,6 +34,7 @@
 #include <CPOptional.h>
 #include "../../../OOXML/Base/SmartPtr.h"
 #include "../../../OOXML/DocxFormat/Math/oMathContent.h"
+#include "../../../OOXML/DocxFormat/Logic/VmlWord.h"
 
 #include <vector>
 #include <string>
diff --git a/RtfFile/OOXml/Reader/OOXShapeReader.cpp b/RtfFile/OOXml/Reader/OOXShapeReader.cpp
index 938b04ec96..b4de5fe7ef 100644
--- a/RtfFile/OOXml/Reader/OOXShapeReader.cpp
+++ b/RtfFile/OOXml/Reader/OOXShapeReader.cpp
@@ -41,6 +41,7 @@
 #include "../../../OOXML/PPTXFormat/Logic/Pic.h"
 #include "../../../OOXML/PPTXFormat/Logic/Shape.h"
 #include "../../../OOXML/PPTXFormat/Logic/Colors/SchemeClr.h"
+#include "../../../OOXML/DocxFormat/Logic/VmlWord.h"
 
 #include "../../../OdfFile/Reader/Format/svg_parser.h"
 #include <boost/algorithm/string.hpp>
diff --git a/RtfFile/OOXml/Reader/OOXShapeReader.h b/RtfFile/OOXml/Reader/OOXShapeReader.h
index 0c08c83923..568d31c87c 100644
--- a/RtfFile/OOXml/Reader/OOXShapeReader.h
+++ b/RtfFile/OOXml/Reader/OOXShapeReader.h
@@ -37,6 +37,7 @@
 #include "../../Format/RtfShape.h"
 
 #include "../../../OOXML/DocxFormat/Logic/Vml.h"
+#include "../../../OOXML/PPTXFormat/Logic/SpTree.h"
 
 namespace OOX
 {