CFStorage's includes was hidden

Common/cfcpp/RBTree/action.h

@@ -0,0 +1,39 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include <functional>
+
+namespace RedBlackTree
+{
+template  <class T>
+using Action = std::function<void(T)>;
+}

Common/cfcpp/RBTree/rbtree.h

@@ -4,14 +4,11 @@
 #include <iterator>
 #include <functional>
 #include <list>
+#include "action.h"
 
 
 namespace RedBlackTree
 {
-template  <class T>
-using Action = std::function<void(T)>;
-
-
 class RBTree
 {
 public:

Common/cfcpp/cfcpp.pro

@@ -27,6 +27,7 @@ SOURCES += \
     streamview.cpp
 
 HEADERS += \
+    RBTree/action.h \
     RBTree/irbnode.h \
     RBTree/rbtree.h \
     RBTree/rbtreeexception.h \

Common/cfcpp/cfitem.h

@@ -30,6 +30,7 @@
  *
  */
 #pragma once
+
 #include "guid.h"
 #include "cfexception.h" // Used by heirs
 #include <memory>

Common/cfcpp/cfstorage.cpp

@@ -35,6 +35,7 @@
 #include "directoryentry.h"
 #include "RBTree/rbtreeexception.h"
 #include "RBTree/irbnode.h"
+#include "RBTree/rbtree.h"
 
 using namespace CFCPP;
 using RedBlackTree::RBTree;

Common/cfcpp/cfstorage.h

@@ -31,10 +31,13 @@
  */
 #pragma once
 
-#include "RBTree/rbtree.h"
-#include "idirectoryentry.h"
+#include "RBTree/action.h"
 #include "cfstream.h"
 
+namespace RedBlackTree
+{
+class RBTree;
+}
 
 namespace CFCPP
 {

Common/cfcpp/compoundfile.h

@@ -32,6 +32,7 @@
 #pragma once
 
 #include "cfstorage.h"
+#include "idirectoryentry.h"
 
 namespace CFCPP
 {

Common/cfcpp/streamrw.cpp

@@ -30,7 +30,6 @@
  *
  */
 #include "streamrw.h"
-#include <algorithm>
 
 
 using namespace CFCPP;