diff --git a/src/analyser_p.h b/src/analyser_p.h
index da773b43b..f888861de 100644
--- a/src/analyser_p.h
+++ b/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"
 
diff --git a/src/analysermodel_p.h b/src/analysermodel_p.h
index 6e3af87fe..41d3f5e9f 100644
--- a/src/analysermodel_p.h
+++ b/src/analysermodel_p.h
@@ -16,6 +16,8 @@ limitations under the License.
 
 #pragma once
 
+#include <map>
+
 #include "libcellml/analysermodel.h"
 
 namespace libcellml {
diff --git a/src/anycellmlelement_p.h b/src/anycellmlelement_p.h
index c850e8ea3..9f84ae4d0 100644
--- a/src/anycellmlelement_p.h
+++ b/src/anycellmlelement_p.h
@@ -18,6 +18,8 @@ limitations under the License.
 
 #include <any>
 
+#include "libcellml/types.h"
+
 namespace libcellml {
 
 /**
diff --git a/src/api/libcellml/analyserequation.h b/src/api/libcellml/analyserequation.h
index 46b63abbc..7fcb8d367 100644
--- a/src/api/libcellml/analyserequation.h
+++ b/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 {
diff --git a/src/api/libcellml/analyserequationast.h b/src/api/libcellml/analyserequationast.h
index 2b805708d..2467de112 100644
--- a/src/api/libcellml/analyserequationast.h
+++ b/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 {
diff --git a/src/api/libcellml/analyserexternalvariable.h b/src/api/libcellml/analyserexternalvariable.h
index 12e12f719..2f37eca12 100644
--- a/src/api/libcellml/analyserexternalvariable.h
+++ b/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 {
 
 /**
diff --git a/src/api/libcellml/analysermodel.h b/src/api/libcellml/analysermodel.h
index 51ae378d0..12806e676 100644
--- a/src/api/libcellml/analysermodel.h
+++ b/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
diff --git a/src/api/libcellml/analyservariable.h b/src/api/libcellml/analyservariable.h
index d664a8cc9..37c304e78 100644
--- a/src/api/libcellml/analyservariable.h
+++ b/src/api/libcellml/analyservariable.h
@@ -16,6 +16,8 @@ limitations under the License.
 
 #pragma once
 
+#include <vector>
+
 #include "libcellml/analyser.h"
 
 namespace libcellml {
diff --git a/src/api/libcellml/entity.h b/src/api/libcellml/entity.h
index 75302ec51..70c694add 100644
--- a/src/api/libcellml/entity.h
+++ b/src/api/libcellml/entity.h
@@ -16,7 +16,6 @@ limitations under the License.
 
 #pragma once
 
-#include <memory>
 #include <string>
 
 #include "libcellml/exportdefinitions.h"
diff --git a/src/api/libcellml/logger.h b/src/api/libcellml/logger.h
index 239020528..83964164f 100644
--- a/src/api/libcellml/logger.h
+++ b/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"
 
diff --git a/src/api/libcellml/parentedentity.h b/src/api/libcellml/parentedentity.h
index 0d7c3bf76..3aea29674 100644
--- a/src/api/libcellml/parentedentity.h
+++ b/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"
diff --git a/src/api/libcellml/types.h b/src/api/libcellml/types.h
index ca976f1ef..23362c0d8 100644
--- a/src/api/libcellml/types.h
+++ b/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"
diff --git a/src/api/libcellml/units.h b/src/api/libcellml/units.h
index db0a0e98d..35f7b21b9 100644
--- a/src/api/libcellml/units.h
+++ b/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"
diff --git a/src/component.cpp b/src/component.cpp
index 207d731e6..c2c7fe146 100644
--- a/src/component.cpp
+++ b/src/component.cpp
@@ -18,7 +18,6 @@ limitations under the License.
 
 #include <algorithm>
 #include <iterator>
-#include <numeric>
 #include <string>
 #include <vector>
 
diff --git a/src/component_p.h b/src/component_p.h
index 8fddcb349..4896bc3e1 100644
--- a/src/component_p.h
+++ b/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 {
 
diff --git a/src/componententity.cpp b/src/componententity.cpp
index 7b2c0cd6a..de8e28184 100644
--- a/src/componententity.cpp
+++ b/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 {
 
diff --git a/src/entity.cpp b/src/entity.cpp
index fd58d32b3..abd65dd9f 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -16,8 +16,6 @@ limitations under the License.
 
 #include "libcellml/entity.h"
 
-#include <utility>
-
 #include "entity_p.h"
 
 namespace libcellml {
diff --git a/src/generator.cpp b/src/generator.cpp
index 3cdd5f701..20cc41e81 100644
--- a/src/generator.cpp
+++ b/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"
diff --git a/src/generatorprofiletools.cpp b/src/generatorprofiletools.cpp
index f1efeef80..bc9fe8615 100644
--- a/src/generatorprofiletools.cpp
+++ b/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
diff --git a/src/importer.cpp b/src/importer.cpp
index de54f925f..b0e336b28 100644
--- a/src/importer.cpp
+++ b/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"
diff --git a/src/importsource.cpp b/src/importsource.cpp
index dd6b16e54..4d929fd00 100644
--- a/src/importsource.cpp
+++ b/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"
diff --git a/src/logger.cpp b/src/logger.cpp
index a4594b73f..faae97d41 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -16,7 +16,6 @@ limitations under the License.
 
 #include "libcellml/logger.h"
 
-#include <algorithm>
 #include <vector>
 
 #include "libcellml/issue.h"
diff --git a/src/model.cpp b/src/model.cpp
index 7f89305de..56e18d6ad 100644
--- a/src/model.cpp
+++ b/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"
diff --git a/src/printer.cpp b/src/printer.cpp
index db5ca8727..6a39d3a5f 100644
--- a/src/printer.cpp
+++ b/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"
diff --git a/src/reset.cpp b/src/reset.cpp
index 07339bb19..d334688d9 100644
--- a/src/reset.cpp
+++ b/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"
 
diff --git a/src/types.cpp b/src/types.cpp
index c011be60a..d04b69440 100644
--- a/src/types.cpp
+++ b/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 {
 
 /**
diff --git a/src/units.cpp b/src/units.cpp
index e91ff7113..2cddc0811 100644
--- a/src/units.cpp
+++ b/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>
diff --git a/src/utilities.cpp b/src/utilities.cpp
index 6b6fc6db8..b58939173 100644
--- a/src/utilities.cpp
+++ b/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"
diff --git a/src/validator.cpp b/src/validator.cpp
index 10cf48873..55a1db118 100644
--- a/src/validator.cpp
+++ b/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"
diff --git a/src/variable.cpp b/src/variable.cpp
index e23408d65..5644b6321 100644
--- a/src/variable.cpp
+++ b/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"