diff --git a/jbmc/src/java_bytecode/java_bytecode_parser.cpp b/jbmc/src/java_bytecode/java_bytecode_parser.cpp
index e1cdfe600fe..9553e3a4544 100644
--- a/jbmc/src/java_bytecode/java_bytecode_parser.cpp
+++ b/jbmc/src/java_bytecode/java_bytecode_parser.cpp
@@ -890,7 +890,7 @@ void java_bytecode_parsert::rfields(classt &parsed_class)
     field.is_public=(access_flags&ACC_PUBLIC)!=0;
     field.is_protected=(access_flags&ACC_PROTECTED)!=0;
     field.is_private=(access_flags&ACC_PRIVATE)!=0;
-    size_t flags=(field.is_public?1:0)+
+    const auto flags = (field.is_public ? 1 : 0) +
       (field.is_protected?1:0)+
       (field.is_private?1:0);
     DATA_INVARIANT(flags<=1, "at most one of public, protected, private");
@@ -1686,7 +1686,7 @@ void java_bytecode_parsert::rmethod(classt &parsed_class)
   method.base_name=pool_entry(name_index).s;
   method.descriptor=id2string(pool_entry(descriptor_index).s);
 
-  size_t flags=(method.is_public?1:0)+
+  const auto flags = (method.is_public ? 1 : 0) +
     (method.is_protected?1:0)+
     (method.is_private?1:0);
   DATA_INVARIANT(flags<=1, "at most one of public, protected, private");
diff --git a/src/goto-cc/gcc_mode.cpp b/src/goto-cc/gcc_mode.cpp
index 42b09a83cb7..45be480e88e 100644
--- a/src/goto-cc/gcc_mode.cpp
+++ b/src/goto-cc/gcc_mode.cpp
@@ -529,7 +529,8 @@ int gcc_modet::doit()
      gcc_version.is_at_least(7))
     config.ansi_c.ts_18661_3_Floatn_types=true;
 
-  int gcc_float128_minor_version = config.ansi_c.arch == "x86_64" ? 3 : 5;
+  const auto gcc_float128_minor_version =
+    config.ansi_c.arch == "x86_64" ? 3u : 5u;
 
   config.ansi_c.Float128_type =
     gcc_version.flavor == gcc_versiont::flavort::GCC &&
diff --git a/src/goto-programs/elf_reader.cpp b/src/goto-programs/elf_reader.cpp
index 70d8b404977..fbc85fb33c2 100644
--- a/src/goto-programs/elf_reader.cpp
+++ b/src/goto-programs/elf_reader.cpp
@@ -33,7 +33,7 @@ elf_readert::elf_readert(std::istream &_in):in(_in)
 
   if(elf_class==ELF32)
   {
-    char ei_data=elf32_header.e_ident[5];
+    const auto ei_data = elf32_header.e_ident[5];
 
     if(ei_data==1)
       little_endian=true;
@@ -80,7 +80,7 @@ elf_readert::elf_readert(std::istream &_in):in(_in)
       reinterpret_cast<char*>(&elf64_header),
       sizeof(elf64_header));
 
-    char ei_data=elf64_header.e_ident[5];
+    const auto ei_data = elf64_header.e_ident[5];
 
     if(ei_data==1)
       little_endian=true;
diff --git a/src/solvers/flattening/bv_utils.cpp b/src/solvers/flattening/bv_utils.cpp
index 962336c1b29..aa406fd38c8 100644
--- a/src/solvers/flattening/bv_utils.cpp
+++ b/src/solvers/flattening/bv_utils.cpp
@@ -234,7 +234,7 @@ literalt bv_utilst::carry(literalt a, literalt b, literalt c)
   if(prop.has_set_to() && prop.cnf_handled_well())
   {
     // propagation possible?
-    unsigned const_count=
+    const auto const_count =
       a.is_constant() + b.is_constant() + c.is_constant();
 
     // propagation is possible if two or three inputs are constant