diff --git a/libcdi b/libcdi
index 2ff4ca8aac2c2a5621065b667b555c54c6979232..56d6e73eac6fc225da60f0af0ac54cc5b2797e60 160000
--- a/libcdi
+++ b/libcdi
@@ -1 +1 @@
-Subproject commit 2ff4ca8aac2c2a5621065b667b555c54c6979232
+Subproject commit 56d6e73eac6fc225da60f0af0ac54cc5b2797e60
diff --git a/src/cdo.cc b/src/cdo.cc
index 5a3bb7d3315d03e10070727a419e1198c0d2f69b..3f559df4b20d3b8384c8eaf8cc45e46ca376520e 100644
--- a/src/cdo.cc
+++ b/src/cdo.cc
@@ -46,7 +46,7 @@
 #include "cdo_getopt.h"
 #include "cdo_rlimit.h"
 #include <mpim_grid.h>
-#include <griddes.h>
+#include "griddes.h"
 #include "cdo_default_values.h"
 #include "param_conversion.h"
 #include "progress.h"
@@ -327,11 +327,11 @@ cdo_init_is_tty()
 {
   struct stat statbuf;
   fstat(0, &statbuf);
-  if (S_ISCHR(statbuf.st_mode)) cdo::stdinIsTerminal = true;
+  if (S_ISCHR(statbuf.st_mode)) { cdo::stdinIsTerminal = true; }
   fstat(1, &statbuf);
   if (S_ISCHR(statbuf.st_mode)) { cdo::stdoutIsTerminal = true; }
   fstat(2, &statbuf);
-  if (S_ISCHR(statbuf.st_mode)) cdo::stderrIsTerminal = true;
+  if (S_ISCHR(statbuf.st_mode)) { cdo::stderrIsTerminal = true; }
 }
 
 #undef IsBigendian
@@ -995,18 +995,13 @@ static void
 create_options_from_envvars()
 {
   CLIOptions::option_from_envvar("CDO_VERSION_INFO");
-
   CLIOptions::option_from_envvar("CDO_DISABLE_FILE_SUFFIX");
   CLIOptions::option_from_envvar("CDO_FILE_SUFFIX");
-
   CLIOptions::option_from_envvar("CDO_DISABLE_HISTORY")->set_category("History");
   CLIOptions::option_from_envvar("CDO_HISTORY_INFO")->set_category("History");
   CLIOptions::option_from_envvar("CDO_RESET_HISTORY")->set_category("History");
-
   CLIOptions::option_from_envvar("CDO_DOWNLOAD_PATH");
-
   CLIOptions::option_from_envvar("CDO_ICON_GRIDS");
-
   CLIOptions::option_from_envvar("CDO_TEST");
 }
 
@@ -1221,7 +1216,6 @@ setup_cli_options()
           }
         else
           {
-
             std::string info_string = "\n" + argument + ":\n";
             for (const auto &name : names) { info_string += std::string(4, ' ') + name + "\n"; }
             std::cerr << info_string + "\n";