Tidy/unused includes#2249

Draft

KevinJW wants to merge 51 commits intoAcademySoftwareFoundation:mainfrom

KevinJW:tidy/unused_includes

Contributor

KevinJW commented Jan 14, 2026

As part of trying to see if I could improve the incremental build times I started to work through what includes we use and where.

This is not complete by any stretch, I've mostly looked at an inclusion dependency graph for anything that didn't feel right, removing unneeded inclusions and adding inclusions where they are directly used by the files. I'll try get some numbers together for the next TSC.

I'll possibly also have a go at running IWYU on the repo if I have the spare time.

KevinJW added 9 commits

January 13, 2026 12:54


          Remove unused include <pystring.h>

420422d

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Clean up SectionMerger.cpp includes

0adf067

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Tidy up placement of <limits> header inclusion

b12934d

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          fstream include tidy up

d6a6a07

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Minimise <iostream> inclusions

e20712e

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Remove unused PrivateTypes includes

eab529c

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Tidy up <sstream> usage

fde9068

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Reduce usage of "OCIOZArchive.h"

4b4fdaa

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Tidy "XMLReaderUtils.h"

9cc80f8

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>

KevinJW self-assigned this

KevinJW added the Needs Discussion label

KevinJW marked this pull request as draft

January 14, 2026 12:29

KevinJW changed the title ~~DRAFT: Tidy/unused includes~~ Tidy/unused includes

KevinJW added 16 commits

January 14, 2026 12:33


          Clean up MatrixOp.h usage

f25fa3a

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Tidy up <string.h>/<cstring>

5ae0330

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          claen up includes for apps

20d5ac4

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Tidy system headers for bindings and app helpers

9b9619b

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Add a number of system includes

0d6ee63

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Start unpicking by removing unneeded OCIO internal includes

8daaae2

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          More missing includes

1f6a871

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Reduce dependency on BitDepthUtils.h , prefer cmath over math.h

0fd325c

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Fix Imath include for case sensitive OS's

747ade0

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Switch some std::endl -> "\n" (reduces need for <iostream>)

e43df6a

In a couple of cases I found we needed to include iostream simply because we used std::endl
Switching to "\n" reduces the scope of that reoccurring.
I did not replace all of them in this pass - care needs to be taken with the lack of flush() when using std::cout, etc.

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Further removal or std::endl

1e7fa00

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          remove unneccessary continuation characters

0362a9d

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          More std::endl removal

040eed5

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          More continuation character removal

4261c80

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          std::endl removal

f8885a0

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Minimise StringUtils.h usage

c05eccd

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>

KevinJW force-pushed the tidy/unused_includes branch from ef8d8de to c05eccd Compare

January 16, 2026 20:36

KevinJW added 16 commits

January 20, 2026 18:58


          Add some additional system includes

1ca6cae

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Add some further direct includes to python bindings

fc344bd

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Avoid including Python binding headers when not needed

55f7b10

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Reduce dependencies on PyUtils.h

9412bec

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Defend docstrings.h against multiple inclusion

0bcaa9a

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Ensure we get correct visibility definition for pybind11 namespace

f8a7b35

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Include docstrings directly in cpp files

383741d

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          move pybind11 numpy and functional includes from generic header

1e442d7

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Add pybind11 includes to python binding .cpp files

e675ea6

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          include cstddef to define ptrdiff_t

5f39fae

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Avoid bringing in py:: and pybind11::literals into scope via header i…

6cea328

…nclusion

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Remove namespace alias

c1fed4b

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Add missing pybind11/stl.h includes

20a80c4

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Remove pybind11/stl.h from generic header

3937fe0

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Directly include "PyOpenColorIO.h" for polymorphic_type_hook

9d03b2e

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Split PyUtils into separate Utils and bufferUtils header to reduce ex…

47f776c

…posure to pybind11/numpy.h

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>

Collaborator

remia commented Jan 24, 2026

Some numbers from clang-build-analyzer from (Intel) macbook (assuming it will be similar across platform if using clang):
build-analysis-main.txt
build-analysis-kevin.txt

KevinJW force-pushed the tidy/unused_includes branch from 90107a2 to 201fcc2 Compare

January 26, 2026 14:06


          Attemp to reduce dependencies on half.h

b5569dc

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>

KevinJW force-pushed the tidy/unused_includes branch from 201fcc2 to 8e7c2c5 Compare

January 26, 2026 14:27


          Some include what you use header suggestions arround the ACES code

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>

KevinJW force-pushed the tidy/unused_includes branch from 8e7c2c5 to 7533342 Compare

January 26, 2026 18:31

KevinJW added 6 commits

January 28, 2026 10:14


          ACES Transform: Ensure we use the mathematical functions from the std…

ac88ffe

… namespace

Without this the code behaviour depends on the prior inclusions. If we
have previously only included <cmath> then the bare sqrt() called with
a float argument will promote the float to a double and call the 'C'
function:

double sqrt(double)

If we had included <math.h> then on Linux with GCC, etc it will have

using std::sqrt;

Which now adds float sqrt(float) to the overload set, and so that gets
called.

This code and its tests assumed the call to the float behaviour, so we
enforce it by explicitly choosing from which namespace we pull the
mathematical functions.

Found when removing an include of <Imath/half.h> from a transitivly
depended on header. Removing half.h also removed an include of math.h

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Tidy Usage of Mutex and CPUInfo

d2215e7

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Add include for snprintf

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Remove some unneeded string->char*->string conversions

9a97b90

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Reduce scope of includes

0b61c18

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>


          Remove duplicate access specifier

7bef071

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>

KevinJW modified the milestone: OCIO 2.5.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Needs Discussion