diff --git a/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h b/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h index 5ed2833756..7f4365e3c8 100644 --- a/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h +++ b/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h @@ -12,10 +12,10 @@ #include "opentelemetry/plugin/hook.h" #include "opentelemetry/version.h" -#include +#include -#include #include +#include OPENTELEMETRY_BEGIN_NAMESPACE namespace plugin diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h index 3a14780d8c..acc888c8b2 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h @@ -13,7 +13,7 @@ #include #ifdef _WIN32 -# include +# include #endif OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h index 7dc2bad0ff..ddda56bb5d 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h @@ -42,7 +42,7 @@ #include #ifdef HAVE_KRABS_TESTS -// krabs.hpp requires this definition of min macro from Windows.h +// krabs.hpp requires this definition of min macro from windows.h # ifndef min # define min(a, b) (((a) < (b)) ? (a) : (b)) # endif diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h index aa23e6f81b..d0b050fcc7 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h @@ -6,7 +6,7 @@ #include "opentelemetry/version.h" #ifdef _WIN32 -# include "Windows.h" +# include "windows.h" #endif OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/exporters/etw/include/opentelemetry/exporters/etw/utils.h b/exporters/etw/include/opentelemetry/exporters/etw/utils.h index f3665efc80..a59338147e 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/utils.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/utils.h @@ -17,12 +17,12 @@ #include "opentelemetry/version.h" #ifdef _WIN32 -# include # include # include +# include # pragma comment(lib, "Advapi32.lib") # pragma comment(lib, "Rpcrt4.lib") -# include +# include # pragma comment(lib, "Ole32.Lib") #else # include diff --git a/exporters/etw/include/opentelemetry/exporters/etw/uuid.h b/exporters/etw/include/opentelemetry/exporters/etw/uuid.h index dfe749d831..243432f82f 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/uuid.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/uuid.h @@ -13,7 +13,7 @@ #include #ifdef _WIN32 -# include "Windows.h" +# include "windows.h" #endif OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/exporters/otlp/src/otlp_file_client.cc b/exporters/otlp/src/otlp_file_client.cc index 021035eb55..c1c00cd01d 100644 --- a/exporters/otlp/src/otlp_file_client.cc +++ b/exporters/otlp/src/otlp_file_client.cc @@ -43,9 +43,9 @@ # define NOMINMAX # endif -# include # include # include +# include # ifdef UNICODE # include diff --git a/ext/include/opentelemetry/ext/http/server/socket_tools.h b/ext/include/opentelemetry/ext/http/server/socket_tools.h index 317d08e847..6a568eef94 100644 --- a/ext/include/opentelemetry/ext/http/server/socket_tools.h +++ b/ext/include/opentelemetry/ext/http/server/socket_tools.h @@ -16,7 +16,7 @@ #ifdef _WIN32 -// # include +// # include # include diff --git a/sdk/src/common/fast_random_number_generator.h b/sdk/src/common/fast_random_number_generator.h index 13e6c738d1..66c9c06b63 100644 --- a/sdk/src/common/fast_random_number_generator.h +++ b/sdk/src/common/fast_random_number_generator.h @@ -25,7 +25,7 @@ namespace common * * ... * #define NOMINMAX - * #include + * #include * ... * * See: