Remove all unnecessary headers as guided by Qt Creator on macOS.

src/analyser_p.h

@@ -14,9 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+#include "libcellml/generatorprofile.h"
+#include "libcellml/issue.h"
+
 #include "analysermodel_p.h"
 #include "internaltypes.h"
-#include "issue_p.h"
 #include "logger_p.h"
 #include "utilities.h"
 

src/analysermodel_p.h

@@ -16,6 +16,8 @@ limitations under the License.
 
 #pragma once
 
+#include <map>
+
 #include "libcellml/analysermodel.h"
 
 namespace libcellml {

src/anycellmlelement_p.h

@@ -18,6 +18,8 @@ limitations under the License.
 
 #include <any>
 
+#include "libcellml/types.h"
+
 namespace libcellml {
 
 /**

src/api/libcellml/analyserequation.h

@@ -16,6 +16,9 @@ limitations under the License.
 
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "libcellml/analyser.h"
 
 namespace libcellml {

src/api/libcellml/analyserequationast.h

@@ -17,7 +17,6 @@ limitations under the License.
 #pragma once
 
 #include "libcellml/analyser.h"
-
 #include "libcellml/undefines.h"
 
 namespace libcellml {

src/api/libcellml/analyserexternalvariable.h

@@ -16,12 +16,12 @@ limitations under the License.
 
 #pragma once
 
-#include "libcellml/exportdefinitions.h"
-#include "libcellml/types.h"
-
 #include <string>
 #include <vector>
 
+#include "libcellml/exportdefinitions.h"
+#include "libcellml/types.h"
+
 namespace libcellml {
 
 /**

src/api/libcellml/analysermodel.h

@@ -16,6 +16,9 @@ limitations under the License.
 
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "libcellml/analyser.h"
 
 #ifndef SWIG

src/api/libcellml/analyservariable.h

@@ -16,6 +16,8 @@ limitations under the License.
 
 #pragma once
 
+#include <vector>
+
 #include "libcellml/analyser.h"
 
 namespace libcellml {

src/api/libcellml/entity.h

@@ -16,7 +16,6 @@ limitations under the License.
 
 #pragma once
 
-#include <memory>
 #include <string>
 
 #include "libcellml/exportdefinitions.h"

src/api/libcellml/generator.h

@@ -16,7 +16,6 @@ limitations under the License.
 
 #pragma once
 
-#include "libcellml/generatorvariabletracker.h"
 #include "libcellml/logger.h"
 
 namespace libcellml {

src/api/libcellml/logger.h

@@ -16,9 +16,6 @@ limitations under the License.
 
 #pragma once
 
-#include <string>
-#include <vector>
-
 #include "libcellml/exportdefinitions.h"
 #include "libcellml/types.h"
 

src/api/libcellml/parentedentity.h

@@ -16,8 +16,6 @@ limitations under the License.
 
 #pragma once
 
-#include <string>
-
 #include "libcellml/entity.h"
 #include "libcellml/exportdefinitions.h"
 #include "libcellml/types.h"

src/api/libcellml/types.h

@@ -16,9 +16,7 @@ limitations under the License.
 
 #pragma once
 
-#include <map>
 #include <memory>
-#include <utility>
 
 #include "libcellml/enums.h"
 #include "libcellml/exportdefinitions.h"

src/api/libcellml/units.h

@@ -17,7 +17,6 @@ limitations under the License.
 #pragma once
 
 #include <string>
-#include <vector>
 
 #include "libcellml/exportdefinitions.h"
 #include "libcellml/importedentity.h"

src/bindings/interface/generator.i

@@ -45,6 +45,7 @@
 
 %{
 #include "libcellml/generator.h"
+#include "libcellml/generatorvariabletracker.h"
 %}
 
 %pythoncode %{

src/component.cpp

@@ -18,7 +18,6 @@ limitations under the License.
 
 #include <algorithm>
 #include <iterator>
-#include <numeric>
 #include <string>
 #include <vector>
 
@@ -108,7 +107,8 @@ ComponentPtr Component::create(const std::string &name) noexcept
 bool Component::ComponentImpl::performTestWithHistory(History &history, const ComponentConstPtr &component, TestType type) const
 {
     if (mComponent->isImport()) {
-        auto model = mComponent->importSource()->model();
+        auto importSource = mComponent->importSource();
+        auto model = importSource->model();
         if (model == nullptr) {
             return false;
         }
@@ -118,7 +118,7 @@ bool Component::ComponentImpl::performTestWithHistory(History &history, const Co
             return false;
         }
 
-        auto h = createHistoryEpoch(component, importeeModelUrl(history, mComponent->importSource()->url()));
+        auto h = createHistoryEpoch(component, importeeModelUrl(history, importSource->url()));
         if (checkForImportCycles(history, h)) {
             return false;
         }

src/component_p.h

@@ -19,7 +19,7 @@ limitations under the License.
 #include "libcellml/component.h"
 
 #include "componententity_p.h"
-#include "utilities.h"
+#include "internaltypes.h"
 
 namespace libcellml {
 

src/componententity.cpp

@@ -21,11 +21,8 @@ limitations under the License.
 #include <vector>
 
 #include "libcellml/component.h"
-#include "libcellml/model.h"
-#include "libcellml/units.h"
 
 #include "component_p.h"
-#include "utilities.h"
 
 namespace libcellml {
 

src/entity.cpp

@@ -16,8 +16,6 @@ limitations under the License.
 
 #include "libcellml/entity.h"
 
-#include <utility>
-
 #include "entity_p.h"
 
 namespace libcellml {

src/generator.cpp

@@ -17,23 +17,20 @@ limitations under the License.
 #include "libcellml/generator.h"
 
 #include <regex>
-#include <sstream>
 
 #include "libcellml/analyserequation.h"
 #include "libcellml/analyserequationast.h"
 #include "libcellml/analysermodel.h"
 #include "libcellml/analyservariable.h"
-#include "libcellml/component.h"
+#include "libcellml/generatorvariabletracker.h"
 #include "libcellml/units.h"
 #include "libcellml/version.h"
 
 #include "analyserequation_p.h"
-#include "analysermodel_p.h"
 #include "commonutils.h"
 #include "generator_p.h"
 #include "generatorprofilesha1values.h"
 #include "generatorprofiletools.h"
-#include "generatorvariabletracker_p.h"
 #include "utilities.h"
 
 #include "libcellml/undefines.h"

src/generatorprofiletools.cpp

@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+#include "generatorprofiletools.h"
+
 #include <array>
 #include <iomanip>
 #include <sstream>
 
 #include "libcellml/generatorprofile.h"
 
-#include "generatorprofiletools.h"
-
 namespace libcellml {
 
 // The below code is used to compute the SHA-1 value of a string, based on the

src/importer.cpp

@@ -17,13 +17,10 @@ limitations under the License.
 #include "libcellml/importer.h"
 
 #include <algorithm>
-#include <cmath>
 #include <fstream>
 #include <libxml/uri.h>
 #include <sstream>
-#include <stdexcept>
 
-#include "libcellml/component.h"
 #include "libcellml/importsource.h"
 #include "libcellml/model.h"
 #include "libcellml/parser.h"

src/importsource.cpp

@@ -16,12 +16,7 @@ limitations under the License.
 
 #include "libcellml/importsource.h"
 
-#include <algorithm>
-#include <utility>
-#include <vector>
-
 #include "libcellml/importedentity.h"
-#include "libcellml/model.h"
 #include "libcellml/types.h"
 
 #include "entity_p.h"

src/logger.cpp

@@ -16,7 +16,6 @@ limitations under the License.
 
 #include "libcellml/logger.h"
 
-#include <algorithm>
 #include <vector>
 
 #include "libcellml/issue.h"

src/model.cpp

@@ -17,12 +17,7 @@ limitations under the License.
 #include "libcellml/model.h"
 
 #include <algorithm>
-#include <fstream>
-#include <map>
-#include <numeric>
-#include <sstream>
-#include <stack>
-#include <utility>
+#include <iterator>
 #include <vector>
 
 #include "libcellml/component.h"
@@ -32,7 +27,6 @@ limitations under the License.
 
 #include "commonutils.h"
 #include "component_p.h"
-#include "componententity_p.h"
 #include "internaltypes.h"
 #include "model_p.h"
 #include "units_p.h"

src/printer.cpp

@@ -16,20 +16,13 @@ limitations under the License.
 
 #include "libcellml/printer.h"
 
-#include <list>
-#include <map>
 #include <regex>
-#include <sstream>
-#include <stack>
 #include <utility>
 #include <vector>
 
-#include "libcellml/component.h"
 #include "libcellml/importsource.h"
 #include "libcellml/issue.h"
-#include "libcellml/model.h"
 #include "libcellml/reset.h"
-#include "libcellml/units.h"
 #include "libcellml/variable.h"
 
 #include "anycellmlelement_p.h"

src/reset.cpp

@@ -16,11 +16,6 @@ limitations under the License.
 
 #include "libcellml/reset.h"
 
-#include <algorithm>
-#include <vector>
-
-#include "libcellml/variable.h"
-
 #include "reset_p.h"
 #include "utilities.h"
 

src/types.cpp

@@ -18,14 +18,9 @@ limitations under the License.
 
 #include <limits>
 
-#include "libcellml/units.h"
-#include "libcellml/variable.h"
-
 #include "anycellmlelement_p.h"
 #include "internaltypes.h"
 
-#include <limits>
-
 namespace libcellml {
 
 /**

src/units.cpp

@@ -22,7 +22,6 @@ limitations under the License.
 #include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <cstdint>
 #include <cstring>
 #include <map>
 #include <numeric>

src/utilities.cpp

@@ -32,7 +32,6 @@ limitations under the License.
 #include "libcellml/component.h"
 #include "libcellml/importsource.h"
 #include "libcellml/model.h"
-#include "libcellml/namedentity.h"
 #include "libcellml/reset.h"
 #include "libcellml/units.h"
 #include "libcellml/variable.h"

src/validator.cpp

@@ -25,9 +25,7 @@ limitations under the License.
 #include <sstream>
 #include <stdexcept>
 
-#include "libcellml/component.h"
 #include "libcellml/importsource.h"
-#include "libcellml/model.h"
 #include "libcellml/reset.h"
 #include "libcellml/units.h"
 #include "libcellml/variable.h"

src/variable.cpp

@@ -19,7 +19,6 @@ limitations under the License.
 #include <algorithm>
 #include <cassert>
 #include <map>
-#include <sstream>
 #include <vector>
 
 #include "libcellml/units.h"