diff --git a/.clang-tidy b/.clang-tidy
index d43d665c..fd998f0d 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,12 +1,64 @@
 ---
+# Enable relevant check categories first.
+# Disable single checks not desired.
+# Temporarily at the end (after the single comma):
+#   Disable those checks that have not been discussed/fixed yet.
 Checks: >-
-  -*,
-  abseil-*,
-  portability-*,
+  bugprone-*,
+  cert-*,
+  clang-analyzer-*,
+  -clang-analyzer-osx.*,
+  concurrency-*,
   misc-*,
+  modernize-*,
+  performance-*,
+  portability-*,
+  readability-*,
+  -modernize-use-trailing-return-type,
+  -modernize-use-using,
+  -modernize-pass-by-value,
+  ,
+  -bugprone-branch-clone,
+  -bugprone-easily-swappable-parameters,
+  -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-misplaced-widening-cast,
+  -bugprone-narrowing-conversions,
+  -cert-dcl50-cpp,
+  -cert-err33-c,
+  -cert-err58-cpp,
+  -cert-msc30-c,
+  -cert-msc50-cpp,
+  -cert-oop54-cpp,
+  -clang-analyzer-core.CallAndMessage,
+  -clang-analyzer-core.DivideZero,
+  -clang-analyzer-core.UndefinedBinaryOperatorResult,
+  -clang-analyzer-cplusplus.NewDeleteLeaks,
+  -clang-analyzer-deadcode.DeadStores,
+  -clang-analyzer-optin.cplusplus.VirtualCall,
+  -concurrency-mt-unsafe,
   -misc-no-recursion,
   -misc-non-private-member-variables-in-classes,
   -misc-redundant-expression,
+  -modernize-avoid-c-arrays,
+  -modernize-loop-convert,
+  -modernize-use-default-member-init,
+  -modernize-use-equals-default,
+  -modernize-use-equals-delete,
+  -modernize-use-nullptr,
+  -modernize-use-override,
+  -performance-unnecessary-copy-initialization,
+  -performance-unnecessary-value-param,
+  -readability-braces-around-statements,
+  -readability-convert-member-functions-to-static,
+  -readability-else-after-return,
+  -readability-function-cognitive-complexity,
+  -readability-identifier-length,
+  -readability-implicit-bool-conversion,
+  -readability-inconsistent-declaration-parameter-name,
+  -readability-magic-numbers,
+  -readability-named-parameter,
+  -readability-redundant-member-init,
+  -readability-redundant-string-init,
 
 # All enabled checks shall be reported as error.
 WarningsAsErrors: "*"
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 88fd8acf..f2a91ef8 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -20,6 +20,9 @@ jobs:
           - clang-14
 
     steps:
+      - name: Update system
+        run: sudo apt-get update
+
       - name: Install prerequisites
         run: >-
           sudo apt-get install -y
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index 40e49758..280fd77c 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -8,6 +8,9 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
+      - name: Update system
+        run: sudo apt-get update
+
       - name: Install prerequisites
         run: >-
           sudo apt-get install -y
@@ -54,13 +57,16 @@ jobs:
 
       - name: clang-tidy
         if: always()
-        run: run-clang-tidy-14 -p build
+        run: run-clang-tidy-14 -p build -header-filter=.*
 
   build-gcc:
     name: Check source with gcc
     runs-on: ubuntu-22.04
 
     steps:
+      - name: Update system
+        run: sudo apt-get update
+
       - name: Install prerequisites
         run: >-
           sudo apt-get install -y
@@ -110,6 +116,9 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
+      - name: Update system
+        run: sudo apt-get update
+
       - name: Install prerequisites
         run: >-
           sudo apt-get install -y
diff --git a/cspell.config.yaml b/cspell.config.yaml
index b95f1684..cac07d34 100644
--- a/cspell.config.yaml
+++ b/cspell.config.yaml
@@ -10,6 +10,7 @@ language: "en-GB"
 ignorePaths:
   # Configuration files and dictionaries
   - /.git
+  - .clang-tidy
   - .gitignore
   - .mega-linter.yml
   - .vscode
@@ -182,6 +183,7 @@ words:
   - globbing
   - gsub
   - gumph
+  - howto
   - htdocs
   - ifndef
   - incl
@@ -222,6 +224,7 @@ words:
   - PDFEXE
   - pirlen
   - productbuild
+  - progname
   - psselect
   - radixes
   - readmemh
diff --git a/srec_info/main.cc b/srec_info/main.cc
index a7db7279..51a9939a 100644
--- a/srec_info/main.cc
+++ b/srec_info/main.cc
@@ -62,7 +62,7 @@ main(int argc, char **argv)
         }
         cmdline.token_next();
     }
-    if (infile.size() == 0U)
+    if (infile.empty())
         infile.push_back(cmdline.get_input());
 
     std::cout << std::hex << std::uppercase;
@@ -70,7 +70,7 @@ main(int argc, char **argv)
     //
     // Read each file and emit informative gumph.
     //
-    for (infile_t::iterator it = infile.begin(); it != infile.end(); ++it)
+    for (auto it = infile.begin(); it != infile.end(); ++it)
     {
         srecord::input::pointer ifp = *it;
         if (infile.size() > 1U)
@@ -157,12 +157,12 @@ main(int argc, char **argv)
             }
             const uint32_t lo = tmp.get_lowest();
             const uint32_t hi = tmp.get_highest();
-            const uint32_t hi_address = static_cast<uint32_t>(hi - 1U);
+            const auto hi_address = static_cast<uint32_t>(hi - 1U);
             std::cout
                 << std::setw(prec) << lo
                 << " - "
                 << std::setw(prec) << hi_address;
-            const uint32_t interval_size = static_cast<uint32_t>(hi - lo);
+            const auto interval_size = static_cast<uint32_t>(hi - lo);
             if(verbose)
             {
                 std::cout << " (" << std::setw(prec) << interval_size<< ")";
@@ -184,7 +184,7 @@ main(int argc, char **argv)
                 std::cout << std::setw(prec) << number_bytes;
             std::cout << std::endl;
 
-            const uint32_t range_size
+            const auto range_size
                 = static_cast<uint32_t>(range_highest - range_lowest);
             const double real_number_bytes
                 = (number_bytes == 0UL) ? 4294967296.0 : number_bytes;
diff --git a/srecord/CMakeLists.txt b/srecord/CMakeLists.txt
index 01b9876f..f8c1aae7 100644
--- a/srecord/CMakeLists.txt
+++ b/srecord/CMakeLists.txt
@@ -22,6 +22,7 @@ file(GLOB_RECURSE LIB_SRECORD_HDR "*.h")
 
 message(STATUS "gcrypt location ${LIB_GCRYPT}")
 add_library(lib_srecord STATIC ${LIB_SRECORD_SRC} ${LIB_SRECORD_HDR} ${LIB_GCRYPT})
+target_compile_features(lib_srecord PUBLIC cxx_std_11)
 
 # Install the library
 install(TARGETS lib_srecord
diff --git a/srecord/adler16.cc b/srecord/adler16.cc
index fab1f558..0b81b3d8 100644
--- a/srecord/adler16.cc
+++ b/srecord/adler16.cc
@@ -70,7 +70,7 @@ srecord::adler16::next(unsigned char c)
 void
 srecord::adler16::nextbuf(const void *data, size_t nbytes)
 {
-    const unsigned char *dp = (const unsigned char *)data;
+    const auto *dp = (const unsigned char *)data;
     while (nbytes > 0)
     {
         next(*dp);
diff --git a/srecord/adler32.cc b/srecord/adler32.cc
index 54edab57..45f2500b 100644
--- a/srecord/adler32.cc
+++ b/srecord/adler32.cc
@@ -70,7 +70,7 @@ srecord::adler32::next(unsigned char c)
 void
 srecord::adler32::nextbuf(const void *data, size_t nbytes)
 {
-    const unsigned char *dp = (const unsigned char *)data;
+    const auto *dp = (const unsigned char *)data;
     while (nbytes > 0)
     {
         next(*dp);
diff --git a/srecord/arglex.cc b/srecord/arglex.cc
index 66320e32..34882297 100644
--- a/srecord/arglex.cc
+++ b/srecord/arglex.cc
@@ -18,10 +18,10 @@
 
 #include <cassert>
 #include <cctype>
-#include <cstring>
+#include <cerrno>
 #include <cstdio>
 #include <cstdlib>
-#include <errno.h>
+#include <cstring>
 #include <iostream>
 #include <unistd.h>
 
@@ -65,7 +65,7 @@ srecord::arglex::arglex(int ac, char **av) :
         if (av[j][0] == '@')
             read_arguments_file(av[j] + 1);
         else
-            arguments.push_back(av[j]);
+            arguments.emplace_back(av[j]);
     }
     table_set(default_table);
 }
@@ -125,7 +125,7 @@ srecord::arglex::read_arguments_file(const char *filename)
         if (buffer[0] == '@')
             read_arguments_file(buffer + 1);
         else
-            arguments.push_back(std::string(buffer, bp - buffer));
+            arguments.emplace_back(buffer, bp - buffer);
     }
     fclose(fp);
 }
@@ -391,7 +391,7 @@ deprecated_warning(const char *deprecated_name, const char *preferred_name)
 {
     srecord::quit_default.warning
     (
-        "option \"%s\" is deprecated, please use \"%s\" instead",
+        R"(option "%s" is deprecated, please use "%s" instead)",
         deprecated_name,
         preferred_name
     );
@@ -422,7 +422,7 @@ deprecated_warning(const char *deprecated_name, const char *preferred_name)
 //
 
 int
-srecord::arglex::token_next(void)
+srecord::arglex::token_next()
 {
     const table_ty  *tp;
     const table_ty  *hit[20];
@@ -458,7 +458,7 @@ srecord::arglex::token_next(void)
             const char *eqp = strchr(arg.c_str(), '=');
             if (eqp)
             {
-                pushback.push_back(eqp + 1);
+                pushback.emplace_back(eqp + 1);
                 arg = std::string(arg.c_str(), eqp - arg.c_str());
             }
         }
@@ -497,7 +497,7 @@ srecord::arglex::token_next(void)
     partial = 0;
     for
     (
-        table_ptr_vec_t::iterator it = tables.begin();
+        auto it = tables.begin();
         it != tables.end();
         ++it
     )
@@ -582,7 +582,7 @@ srecord::arglex::token_next(void)
     case 1:
         if (partial)
         {
-            pushback.push_back(partial);
+            pushback.emplace_back(partial);
             partial = 0;
         }
         value_string_ = hit[0]->name;
@@ -607,7 +607,7 @@ srecord::arglex::check_deprecated(const std::string &actual)
 {
     for
     (
-        deprecated_options_t::const_iterator it = deprecated_options.begin();
+        auto it = deprecated_options.begin();
         it != deprecated_options.end();
         ++it
     )
@@ -647,7 +647,7 @@ srecord::arglex::token_name(int n)
     }
     for
     (
-        table_ptr_vec_t::const_iterator it = tables.begin();
+        auto it = tables.begin();
         it != tables.end();
         ++it
     )
@@ -676,7 +676,7 @@ srecord::arglex::help(const char *name)
 
 
 void
-srecord::arglex::version(void)
+srecord::arglex::version()
     const
 {
     print_version();
@@ -685,7 +685,7 @@ srecord::arglex::version(void)
 
 
 void
-srecord::arglex::license(void)
+srecord::arglex::license()
     const
 {
     help("srec_license");
@@ -693,7 +693,7 @@ srecord::arglex::license(void)
 
 
 void
-srecord::arglex::bad_argument(void)
+srecord::arglex::bad_argument()
     const
 {
     switch (token_cur())
@@ -727,7 +727,7 @@ srecord::arglex::bad_argument(void)
 
 
 int
-srecord::arglex::token_first(void)
+srecord::arglex::token_first()
 {
 #if 1
     // We probably don't need to do this all the time.
@@ -770,7 +770,7 @@ srecord::arglex::usage_tail_set(const char *s)
 
 
 const char *
-srecord::arglex::usage_tail_get(void)
+srecord::arglex::usage_tail_get()
     const
 {
     if (!usage_tail_)
@@ -780,7 +780,7 @@ srecord::arglex::usage_tail_get(void)
 
 
 void
-srecord::arglex::usage(void)
+srecord::arglex::usage()
     const
 {
     std::cerr << "Usage: " << progname_get() << " [ <option>... ] "
@@ -794,7 +794,7 @@ srecord::arglex::usage(void)
 
 
 void
-srecord::arglex::default_command_line_processing(void)
+srecord::arglex::default_command_line_processing()
 {
     bad_argument();
 }
diff --git a/srecord/arglex.h b/srecord/arglex.h
index 859b9390..c153df05 100644
--- a/srecord/arglex.h
+++ b/srecord/arglex.h
@@ -156,7 +156,7 @@ class arglex
       * The test_ambiguous method is for debugging.  It verifies that
       * all of the option names are unique.
       */
-    void test_ambiguous(void) const;
+    void test_ambiguous() const;
 
 private:
     /**
@@ -243,14 +243,14 @@ class arglex
       * It returns the type of the token; this value may also be
       * fetched using the token_cur method.
       */
-    int token_next(void);
+    int token_next();
 
     /**
       * The token_first method is used to fetch the first command
       * like token (rather than use the token_next method).  This does
       * standard "help" and "version" options.
       */
-    int token_first(void);
+    int token_first();
 
     /**
       * The value_string method is used to get the string value of
@@ -318,7 +318,7 @@ class arglex
       * The default_command_line_processing method is used to process
       * command line arguments not handled by the derived class.
       */
-    virtual void default_command_line_processing(void);
+    virtual void default_command_line_processing();
 
 private:
     /**
@@ -348,7 +348,6 @@ class arglex
       */
     void read_arguments_file(const char *filename);
 
-private:
     typedef std::list<std::string> deprecated_options_t;
 
     /**
diff --git a/srecord/arglex/test_ambiguous.cc b/srecord/arglex/test_ambiguous.cc
index 5bb543d6..5909ee2f 100644
--- a/srecord/arglex/test_ambiguous.cc
+++ b/srecord/arglex/test_ambiguous.cc
@@ -23,13 +23,13 @@
 
 
 void
-srecord::arglex::test_ambiguous(void)
+srecord::arglex::test_ambiguous()
     const
 {
     int number_of_errors = 0;
     for
     (
-        table_ptr_vec_t::const_iterator it1 = tables.begin();
+        auto it1 = tables.begin();
         it1 != tables.end();
         ++it1
     )
@@ -40,7 +40,7 @@ srecord::arglex::test_ambiguous(void)
 
             for
             (
-                table_ptr_vec_t::const_iterator it2 = tables.begin();
+                auto it2 = tables.begin();
                 it2 != tables.end();
                 ++it2
             )
diff --git a/srecord/arglex/tool.cc b/srecord/arglex/tool.cc
index 49c51e15..a6fb1315 100644
--- a/srecord/arglex/tool.cc
+++ b/srecord/arglex/tool.cc
@@ -261,7 +261,7 @@ srecord::arglex_tool::~arglex_tool()
 
 
 bool
-srecord::arglex_tool::can_get_number(void)
+srecord::arglex_tool::can_get_number()
     const
 {
     switch (token_cur())
@@ -352,7 +352,7 @@ srecord::arglex_tool::get_address_nbytes_width(const char *name,
 
 
 void
-srecord::arglex_tool::default_command_line_processing(void)
+srecord::arglex_tool::default_command_line_processing()
 {
     switch (token_cur())
     {
diff --git a/srecord/arglex/tool.h b/srecord/arglex/tool.h
index 25199d2a..16f7e8b6 100644
--- a/srecord/arglex/tool.h
+++ b/srecord/arglex/tool.h
@@ -228,7 +228,7 @@ class arglex_tool:
       * line) a fatal error will be issued and the method call will
       * not return.
       */
-    input::pointer get_input(void);
+    input::pointer get_input();
 
     /**
       * The get_output method is used to parse an output specification
@@ -238,7 +238,7 @@ class arglex_tool:
       * line) a fatal error will be issued and the method call will
       * not return.
       */
-    output::pointer get_output(void);
+    output::pointer get_output();
 
     /**
       * The get_number method is used to parse a numeric value from the
@@ -263,7 +263,7 @@ class arglex_tool:
       * The can_get_number method is used to determine if it is possible
       * to parse a number from the next token on the command line.
       */
-    bool can_get_number(void) const;
+    bool can_get_number() const;
 
     /**
       * The get_interval method is used to parse an interval
@@ -299,10 +299,10 @@ class arglex_tool:
     std::string get_string(const char *caption);
 
     // See base class for documentation.
-    void default_command_line_processing(void);
+    void default_command_line_processing();
 
-    defcon_t get_redundant_bytes(void) const { return redundant_bytes; }
-    defcon_t get_contradictory_bytes(void) const { return contradictory_bytes; }
+    defcon_t get_redundant_bytes() const { return redundant_bytes; }
+    defcon_t get_contradictory_bytes() const { return contradictory_bytes; }
 
 private:
     /**
@@ -422,7 +422,7 @@ class arglex_tool:
       * of the current token.
       */
     endian_t
-    get_endian_by_token(void)
+    get_endian_by_token()
         const
     {
         return get_endian_by_token(token_cur());
@@ -443,7 +443,7 @@ class arglex_tool:
       * or not the current token is inclusive or exclusive.
       */
     bool
-    get_inclusive_by_token(void)
+    get_inclusive_by_token()
         const
     {
         return get_inclusive_by_token(token_cur());
diff --git a/srecord/arglex/tool/get_string.cc b/srecord/arglex/tool/get_string.cc
index 29c51df6..34836c59 100644
--- a/srecord/arglex/tool/get_string.cc
+++ b/srecord/arglex/tool/get_string.cc
@@ -41,6 +41,6 @@ srecord::arglex_tool::get_string(const char *caption)
             token_name(token_cur())
         );
         // NOTREACHED
-        return std::string();
+        return {};
     }
 }
diff --git a/srecord/arglex/tool/input.cc b/srecord/arglex/tool/input.cc
index 6dd1e926..90d45930 100644
--- a/srecord/arglex/tool/input.cc
+++ b/srecord/arglex/tool/input.cc
@@ -197,7 +197,7 @@ srecord::arglex_tool::get_inclusive_by_token(int tok)
 
 
 srecord::input::pointer
-srecord::arglex_tool::get_simple_input(void)
+srecord::arglex_tool::get_simple_input()
 {
     std::string fn = "-";
     input::pointer ifp;
@@ -598,7 +598,8 @@ srecord::arglex_tool::get_input()
                 endian_t end = get_endian_by_token();
                 token_next();
                 unsigned long address;
-                int nbytes, width;
+                int nbytes;
+                int width;
                 get_address_nbytes_width(name, address, nbytes, width);
                 ifp =
                     input_filter_checksum_bitnot::create
@@ -619,7 +620,8 @@ srecord::arglex_tool::get_input()
                 endian_t end = get_endian_by_token();
                 token_next();
                 unsigned long address;
-                int nbytes, width;
+                int nbytes;
+                int width;
                 get_address_nbytes_width(name, address, nbytes, width);
                 ifp =
                     input_filter_checksum_negative::create
@@ -640,7 +642,8 @@ srecord::arglex_tool::get_input()
                 endian_t end = get_endian_by_token();
                 token_next();
                 unsigned long address;
-                int nbytes, width;
+                int nbytes;
+                int width;
                 get_address_nbytes_width(name, address, nbytes, width);
                 ifp =
                     input_filter_checksum_positive::create
@@ -807,7 +810,8 @@ srecord::arglex_tool::get_input()
                 bool inclusive = get_inclusive_by_token();
                 token_next();
                 unsigned long address;
-                int nbytes, width;
+                int nbytes;
+                int width;
                 get_address_nbytes_width(name, address, nbytes, width);
                 ifp =
                     input_filter_interval_length::create
diff --git a/srecord/arglex/tool/output.cc b/srecord/arglex/tool/output.cc
index 6146ae17..1413d6e1 100644
--- a/srecord/arglex/tool/output.cc
+++ b/srecord/arglex/tool/output.cc
@@ -39,9 +39,8 @@
 #include <srecord/output/file/intel.h>
 #include <srecord/output/file/intel16.h>
 #include <srecord/output/file/logisim.h>
-#include <srecord/output/file/mif.h>
 #include <srecord/output/file/mem.h>
-#include <srecord/output/file/coe.h>
+#include <srecord/output/file/mif.h>
 #include <srecord/output/file/mips_flash.h>
 #include <srecord/output/file/mos_tech.h>
 #include <srecord/output/file/motorola.h>
@@ -54,8 +53,8 @@
 #include <srecord/output/file/spasm.h>
 #include <srecord/output/file/spectrum.h>
 #include <srecord/output/file/stewie.h>
-#include <srecord/output/file/tektronix_extended.h>
 #include <srecord/output/file/tektronix.h>
+#include <srecord/output/file/tektronix_extended.h>
 #include <srecord/output/file/ti_tagged.h>
 #include <srecord/output/file/ti_tagged_16.h>
 #include <srecord/output/file/ti_txt.h>
diff --git a/srecord/crc16.cc b/srecord/crc16.cc
index 076abb48..b860a686 100644
--- a/srecord/crc16.cc
+++ b/srecord/crc16.cc
@@ -67,7 +67,7 @@ static unsigned short const xmodem_seed = 0;
 
 
 void
-srecord::crc16::calculate_table(void)
+srecord::crc16::calculate_table()
 {
     if (polynomial == 0)
         polynomial = polynomial_ccitt;
@@ -279,7 +279,7 @@ srecord::crc16::next(unsigned char ch)
 void
 srecord::crc16::nextbuf(const void *data, size_t nbytes)
 {
-    unsigned char *dp = (unsigned char *)data;
+    auto *dp = (unsigned char *)data;
     while (nbytes > 0)
     {
         state = updcrc(*dp++, state);
@@ -289,7 +289,7 @@ srecord::crc16::nextbuf(const void *data, size_t nbytes)
 
 
 unsigned short
-srecord::crc16::get(void)
+srecord::crc16::get()
     const
 {
 #if (IMPL < IMPL_CH11)
@@ -307,7 +307,7 @@ srecord::crc16::get(void)
 
 
 void
-srecord::crc16::print_table(void)
+srecord::crc16::print_table()
     const
 {
     printf("/*\n");
diff --git a/srecord/crc16.h b/srecord/crc16.h
index e0bea3d1..2a09be6a 100644
--- a/srecord/crc16.h
+++ b/srecord/crc16.h
@@ -23,7 +23,7 @@
 #ifndef SRECORD_CRC16_H
 #define SRECORD_CRC16_H
 
-#include <stddef.h>
+#include <cstddef>
 
 namespace srecord
 {
@@ -145,7 +145,7 @@ class crc16
       * The print_table method may be used to print the table being used.
       * This is principally for debugging the table generation process.
       */
-    void print_table(void) const;
+    void print_table() const;
 
 private:
     /**
@@ -186,7 +186,7 @@ class crc16
       * The calculate_table method is called by the constructor to fill
       * in the #table instance variable.
       */
-    void calculate_table(void);
+    void calculate_table();
 
     /**
       * The updcrc method is to add another byte of data to the running
diff --git a/srecord/crc32.cc b/srecord/crc32.cc
index 100fe1cb..de0caa01 100644
--- a/srecord/crc32.cc
+++ b/srecord/crc32.cc
@@ -159,7 +159,7 @@ srecord::crc32::next(unsigned char x)
 void
 srecord::crc32::nextbuf(const void *data, size_t nbytes)
 {
-    const unsigned char *dp = (const unsigned char *)data;
+    const auto *dp = (const unsigned char *)data;
     while (nbytes > 0)
     {
         state = UPDC32(*dp, state);
diff --git a/srecord/crc32.h b/srecord/crc32.h
index bfcf3518..2acb9267 100644
--- a/srecord/crc32.h
+++ b/srecord/crc32.h
@@ -20,7 +20,7 @@
 #ifndef SRECORD_CRC32_H
 #define SRECORD_CRC32_H
 
-#include <stddef.h>
+#include <cstddef>
 
 namespace srecord
 {
diff --git a/srecord/defcon.cc b/srecord/defcon.cc
index d407be8f..c0a30f21 100644
--- a/srecord/defcon.cc
+++ b/srecord/defcon.cc
@@ -65,8 +65,8 @@ static const table_t table[] =
 static int
 compare(const void *va, const void *vb)
 {
-    const table_t *a = (const table_t *)va;
-    const table_t *b = (const table_t *)vb;
+    const auto *a = (const table_t *)va;
+    const auto *b = (const table_t *)vb;
     return strcmp(a->name, b->name);
 }
 
@@ -75,7 +75,7 @@ int
 srecord::defcon_from_text(const char *text)
 {
     table_t key = { text, defcon_ignore };
-    table_t *tp =
+    auto *tp =
         (table_t *)
         bsearch(&key, table, SIZEOF(table), sizeof(table_t), compare);
     if (!tp)
diff --git a/srecord/fletcher16.cc b/srecord/fletcher16.cc
index 97f79842..8ac4e624 100644
--- a/srecord/fletcher16.cc
+++ b/srecord/fletcher16.cc
@@ -118,7 +118,7 @@ srecord::fletcher16::nextbuf(const void *vdata, size_t nbytes)
     //   overflow in 16 bits. Any smaller value is also permissible; 16
     //   may be convenient in many cases.
     //
-    const unsigned char *data = (const unsigned char *)vdata;
+    const auto *data = (const unsigned char *)vdata;
     size_t len = nbytes;
     while (len)
     {
diff --git a/srecord/fletcher32.cc b/srecord/fletcher32.cc
index 878212c6..df58d927 100644
--- a/srecord/fletcher32.cc
+++ b/srecord/fletcher32.cc
@@ -88,7 +88,7 @@ srecord::fletcher32::nextbuf(const void *vdata, size_t nbytes)
     // overflow.  Any smaller value is also permissible; 256 may be
     // convenient in many cases.
     //
-    const unsigned char *data = (const unsigned char *)vdata;
+    const auto *data = (const unsigned char *)vdata;
     size_t len = nbytes;
     while (len)
     {
diff --git a/srecord/fletcher32.h b/srecord/fletcher32.h
index 2f313c12..b28fc82a 100644
--- a/srecord/fletcher32.h
+++ b/srecord/fletcher32.h
@@ -19,7 +19,7 @@
 #ifndef SRECORD_FLETCHER32_H
 #define SRECORD_FLETCHER32_H
 
-#include <stddef.h>
+#include <cstddef>
 
 namespace srecord
 {
diff --git a/srecord/input.cc b/srecord/input.cc
index 27b06e56..d4a2d7eb 100644
--- a/srecord/input.cc
+++ b/srecord/input.cc
@@ -17,9 +17,9 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-#include <errno.h>
-#include <iostream>
+#include <cerrno>
 #include <cstring>
+#include <iostream>
 
 #include <srecord/input.h>
 #include <srecord/record.h>
diff --git a/srecord/input.h b/srecord/input.h
index f6c83332..0cba99a0 100644
--- a/srecord/input.h
+++ b/srecord/input.h
@@ -19,9 +19,9 @@
 #ifndef SRECORD_INPUT_H
 #define SRECORD_INPUT_H
 
-#include <string>
-#include <stdarg.h>
+#include <cstdarg>
 #include <memory>
+#include <string>
 
 #include <srecord/format_printf.h>
 
@@ -103,7 +103,7 @@ class input
       * The filename method is used to get the name of the input file
       * being processed.  Derived classes must supply this method.
       */
-    virtual std::string filename(void) const = 0;
+    virtual std::string filename() const = 0;
 
     /**
       * The filename_and_line method is used to get the name
@@ -111,14 +111,14 @@ class input
       * implementation simply calls the filename method and returns
       * that.  Text formats should be cleverer.
       */
-    virtual std::string filename_and_line(void) const;
+    virtual std::string filename_and_line() const;
 
     /**
       * The get_file_format_name method is used to find out the name
       * of the file format being read.  Derived classes must supply
       * this method.
       */
-    virtual const char *get_file_format_name(void) const = 0;
+    virtual const char *get_file_format_name() const = 0;
 
     /**
       * The set_quit method is used to set the disposition of the
@@ -132,13 +132,13 @@ class input
       * The reset_quit method is used to cause the disposition of
       * the error messages, and the "exit" back to the default.
       */
-    void reset_quit(void);
+    void reset_quit();
 
     /**
       * The disable_checksum_validation method is used to have this
       * input stream ignore checksum errors.
       */
-    virtual void disable_checksum_validation(void) = 0;
+    virtual void disable_checksum_validation() = 0;
 
     /**
       * The command_line method is used by arglex_srec::get_input
diff --git a/srecord/input/file.cc b/srecord/input/file.cc
index c9573e9d..9908e191 100644
--- a/srecord/input/file.cc
+++ b/srecord/input/file.cc
@@ -39,7 +39,7 @@ srecord::input_file::input_file() :
 
 
 bool
-srecord::input_file::is_binary(void)
+srecord::input_file::is_binary()
     const
 {
     return false;
@@ -71,7 +71,7 @@ srecord::input_file::input_file(const std::string &a_file_name) :
 
 
 void *
-srecord::input_file::get_fp(void)
+srecord::input_file::get_fp()
 {
     if (!vfp)
     {
@@ -103,7 +103,7 @@ srecord::input_file::~input_file()
 
 
 std::string
-srecord::input_file::filename(void)
+srecord::input_file::filename()
     const
 {
     return file_name;
@@ -111,7 +111,7 @@ srecord::input_file::filename(void)
 
 
 std::string
-srecord::input_file::filename_and_line(void)
+srecord::input_file::filename_and_line()
     const
 {
     if (!vfp)
@@ -126,7 +126,7 @@ srecord::input_file::filename_and_line(void)
 
 
 int
-srecord::input_file::get_char(void)
+srecord::input_file::get_char()
 {
     FILE *fp = (FILE *)get_fp();
     if (prev_was_newline)
@@ -184,7 +184,7 @@ srecord::input_file::get_char_undo(int c)
 
 
 int
-srecord::input_file::peek_char(void)
+srecord::input_file::peek_char()
 {
     FILE *fp = (FILE *)get_fp();
     int c = getc(fp);
@@ -220,7 +220,7 @@ srecord::input_file::get_nibble_value(int c)
 
 
 int
-srecord::input_file::get_nibble(void)
+srecord::input_file::get_nibble()
 {
     int c = get_char();
     int n = get_nibble_value(c);
@@ -231,7 +231,7 @@ srecord::input_file::get_nibble(void)
 
 
 int
-srecord::input_file::get_byte(void)
+srecord::input_file::get_byte()
 {
     int c1 = get_nibble();
     int c2 = get_nibble();
@@ -242,7 +242,7 @@ srecord::input_file::get_byte(void)
 
 
 unsigned
-srecord::input_file::get_word_be(void)
+srecord::input_file::get_word_be()
 {
     int b1 = get_byte();
     int b2 = get_byte();
@@ -251,7 +251,7 @@ srecord::input_file::get_word_be(void)
 
 
 unsigned
-srecord::input_file::get_word_le(void)
+srecord::input_file::get_word_le()
 {
     int b1 = get_byte();
     int b2 = get_byte();
@@ -260,7 +260,7 @@ srecord::input_file::get_word_le(void)
 
 
 unsigned long
-srecord::input_file::get_3bytes_be(void)
+srecord::input_file::get_3bytes_be()
 {
     unsigned long b1 = get_byte();
     unsigned long b2 = get_byte();
@@ -270,7 +270,7 @@ srecord::input_file::get_3bytes_be(void)
 
 
 unsigned long
-srecord::input_file::get_3bytes_le(void)
+srecord::input_file::get_3bytes_le()
 {
     unsigned long b1 = get_byte();
     unsigned long b2 = get_byte();
@@ -280,7 +280,7 @@ srecord::input_file::get_3bytes_le(void)
 
 
 unsigned long
-srecord::input_file::get_4bytes_be(void)
+srecord::input_file::get_4bytes_be()
 {
     unsigned long b1 = get_byte();
     unsigned long b2 = get_byte();
@@ -291,7 +291,7 @@ srecord::input_file::get_4bytes_be(void)
 
 
 unsigned long
-srecord::input_file::get_4bytes_le(void)
+srecord::input_file::get_4bytes_le()
 {
     unsigned long b1 = get_byte();
     unsigned long b2 = get_byte();
@@ -302,7 +302,7 @@ srecord::input_file::get_4bytes_le(void)
 
 
 int
-srecord::input_file::checksum_get(void)
+srecord::input_file::checksum_get()
     const
 {
     return (checksum & 0xFF);
@@ -310,7 +310,7 @@ srecord::input_file::checksum_get(void)
 
 
 int
-srecord::input_file::checksum_get16(void)
+srecord::input_file::checksum_get16()
     const
 {
     return (checksum & 0xFFFF);
@@ -318,7 +318,7 @@ srecord::input_file::checksum_get16(void)
 
 
 void
-srecord::input_file::checksum_reset(void)
+srecord::input_file::checksum_reset()
 {
     checksum = 0;
 }
@@ -332,7 +332,7 @@ srecord::input_file::checksum_add(unsigned char n)
 
 
 void
-srecord::input_file::seek_to_end(void)
+srecord::input_file::seek_to_end()
 {
     FILE *fp = (FILE *)get_fp();
     fseek(fp, 0L, SEEK_END);
@@ -340,7 +340,7 @@ srecord::input_file::seek_to_end(void)
 
 
 void
-srecord::input_file::disable_checksum_validation(void)
+srecord::input_file::disable_checksum_validation()
 {
     ignore_checksums = true;
 }
diff --git a/srecord/input/file.h b/srecord/input/file.h
index e13e0b3f..c24ae7a8 100644
--- a/srecord/input/file.h
+++ b/srecord/input/file.h
@@ -59,25 +59,24 @@ class input_file:
       * ignore checksums flag.  This is usually the result of an
       * --ignore-checksums command line option.
       */
-    static void ignore_all_checksums(void) { ignore_checksums_default = true; }
+    static void ignore_all_checksums() { ignore_checksums_default = true; }
 
     /**
       * The format_option_number method is used to obtain the option number,
       * which can then be turned into text via the arglex::token_name method.
       */
-    virtual int format_option_number(void) const = 0;
+    virtual int format_option_number() const = 0;
 
 protected:
     // See base class for documentation.
-    virtual std::string filename(void) const;
+    virtual std::string filename() const;
 
     // See base class for documentation.
-    virtual std::string filename_and_line(void) const;
+    virtual std::string filename_and_line() const;
 
     // See base class for documentation.
-    void disable_checksum_validation(void);
+    void disable_checksum_validation();
 
-protected:
     /**
       * The constructor.  The input will be taken from the named file
       * (or the standard input if the filename is "-").
@@ -99,7 +98,7 @@ class input_file:
       * filename_and_line method may report the current file location.
       * This makes for more informative error messages.
       */
-    virtual int get_char(void);
+    virtual int get_char();
 
     /**
       * The get_char_undo method is used to return a character to
@@ -113,7 +112,7 @@ class input_file:
       * of input, without actually consuming it (a later get_char
       * or peak_char method will still see it).
       */
-    int peek_char(void);
+    int peek_char();
 
     /**
       * The get_nibble_value class method is used to translate a
@@ -134,7 +133,7 @@ class input_file:
       * are not hexadecimal digits will result in a fatal error,
       * and the method call will not return.
       */
-    virtual int get_nibble(void);
+    virtual int get_nibble();
 
     /**
       * The get_byte method is used to fetch a byte value from the
@@ -150,14 +149,14 @@ class input_file:
       * it if they have a special case.  Over-ride with caution,
       * as it affects many other methods.
       */
-    virtual int get_byte(void);
+    virtual int get_byte();
 
     /**
       * The get_word_be method is used to fetch a 16-bit value from the
       * input.  The get_byte method is called twice, and the two byte
       * values are assembled big-endian (most significant byte first).
       */
-    unsigned get_word_be(void);
+    unsigned get_word_be();
 
     /**
       * The get_word_le method is used to fetch a 16-bit value from
@@ -165,7 +164,7 @@ class input_file:
       * byte values are assembled little-endian (least significant byte
       * first).
       */
-    unsigned get_word_le(void);
+    unsigned get_word_le();
 
     /**
       * The get_3bytes_be method is used to fetch a 24-bit value from
@@ -173,7 +172,7 @@ class input_file:
       * and the three byte values are assembles big-endian (most
       * significant byte first).
       */
-    unsigned long get_3bytes_be(void);
+    unsigned long get_3bytes_be();
 
     /**
       * The get_3bytes_le method is used to fetch a 24-bit value from
@@ -181,7 +180,7 @@ class input_file:
       * three byte values are assembled little-endian (least significant
       * byte first).
       */
-    unsigned long get_3bytes_le(void);
+    unsigned long get_3bytes_le();
 
     /**
       * The get_4bytes_be method is used to fetch a 32-bit value from
@@ -189,7 +188,7 @@ class input_file:
       * and the four byte values are assembled big-endian (most
       * significant byte first).
       */
-    unsigned long get_4bytes_be(void);
+    unsigned long get_4bytes_be();
 
     /**
       * The get_4bytes_le method is used to fetch a 32-bit value from
@@ -197,7 +196,7 @@ class input_file:
       * four byte values are assembled little-endian (least significant
       * byte first).
       */
-    unsigned long get_4bytes_le(void);
+    unsigned long get_4bytes_le();
 
     /**
       * The checksum_get method is used to get the current value of
@@ -205,7 +204,7 @@ class input_file:
       * usually called by the get_byte method).  Only the lower 8
       * bits of the sum are returned.
       */
-    int checksum_get(void) const;
+    int checksum_get() const;
 
     /**
       * The checksum_get16 method is used to get the current value of
@@ -213,7 +212,7 @@ class input_file:
       * usually called by the get_byte method).  Only the lower 16
       * bits of the sum are returned.
       */
-    int checksum_get16(void) const;
+    int checksum_get16() const;
 
     /**
       * The checksum_add method is used to add another 8-bit value
@@ -225,20 +224,20 @@ class input_file:
       * The checksum_rest method is used to set the running checksum
       * to zero.
       */
-    void checksum_reset(void);
+    void checksum_reset();
 
     /**
       * The seek_to_end method is used to move the input position
       * to the end of the file.
       */
-    void seek_to_end(void);
+    void seek_to_end();
 
     /**
       * The is_binary method is used to to determine whether or not
       * a file format is binary (true) of text (false).  The default
       * implementation always returns false (text).
       */
-    virtual bool is_binary(void) const;
+    virtual bool is_binary() const;
 
 private:
     /**
@@ -293,7 +292,7 @@ class input_file:
       * @returns
       *     bool; true if need to check checksums, false to ignore checksums.
       */
-    bool use_checksums(void) const { return !ignore_checksums; }
+    bool use_checksums() const { return !ignore_checksums; }
 
 private:
     /**
@@ -318,7 +317,7 @@ class input_file:
       * If the file has not been opened yet, it will be opened by
       * this method.
       */
-    void *get_fp(void);
+    void *get_fp();
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/input/file/aomf.cc b/srecord/input/file/aomf.cc
index c1b83bd4..5d454ca5 100644
--- a/srecord/input/file/aomf.cc
+++ b/srecord/input/file/aomf.cc
@@ -115,8 +115,7 @@ o96name(int x)
 
 srecord::input_file_aomf::~input_file_aomf()
 {
-    if (current_buffer)
-        delete [] current_buffer;
+    delete [] current_buffer;
 }
 
 
@@ -165,7 +164,7 @@ srecord::input_file_aomf::slurp()
     --length; // includes checksum byte
     if (length > current_maximum)
     {
-        if (current_buffer)
+
             delete [] current_buffer;
         while (current_maximum < length)
             current_maximum = current_maximum * 2 + 64;
@@ -286,7 +285,7 @@ srecord::input_file_aomf::read(srecord::record &record)
 
 
 bool
-srecord::input_file_aomf::is_binary(void)
+srecord::input_file_aomf::is_binary()
     const
 {
     return true;
@@ -302,7 +301,7 @@ srecord::input_file_aomf::get_file_format_name()
 
 
 int
-srecord::input_file_aomf::format_option_number(void)
+srecord::input_file_aomf::format_option_number()
     const
 {
     return arglex_tool::token_aomf;
diff --git a/srecord/input/file/aomf.h b/srecord/input/file/aomf.h
index a4687c4a..e94aeb8f 100644
--- a/srecord/input/file/aomf.h
+++ b/srecord/input/file/aomf.h
@@ -64,13 +64,13 @@ class input_file_aomf:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -78,7 +78,7 @@ class input_file_aomf:
       * update the checksum.  We over-ride the base implementation,
       * because we use raw bytes rather than two hex digits.
       */
-    int get_byte(void);
+    int get_byte();
 
     /**
       * The current_buffer instance variable is used to remember the
@@ -131,7 +131,7 @@ class input_file_aomf:
       * The slurp method is used to fill the current_buffer array,
       * and set the current_length.
       */
-    int slurp(void);
+    int slurp();
 
     /**
       * The copy constructor.  Do not use.
diff --git a/srecord/input/file/ascii_hex.cc b/srecord/input/file/ascii_hex.cc
index 7b4ff4e3..e9f0a5d0 100644
--- a/srecord/input/file/ascii_hex.cc
+++ b/srecord/input/file/ascii_hex.cc
@@ -188,7 +188,7 @@ srecord::input_file_ascii_hex::get_file_format_name()
 
 
 int
-srecord::input_file_ascii_hex::format_option_number(void)
+srecord::input_file_ascii_hex::format_option_number()
     const
 {
     return arglex_tool::token_ascii_hex;
diff --git a/srecord/input/file/ascii_hex.h b/srecord/input/file/ascii_hex.h
index da8f98fc..830570f8 100644
--- a/srecord/input/file/ascii_hex.h
+++ b/srecord/input/file/ascii_hex.h
@@ -55,7 +55,7 @@ class input_file_ascii_hex:
     const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/atmel_generic.cc b/srecord/input/file/atmel_generic.cc
index 58ffb5da..27620ed0 100644
--- a/srecord/input/file/atmel_generic.cc
+++ b/srecord/input/file/atmel_generic.cc
@@ -110,7 +110,7 @@ srecord::input_file_atmel_generic::get_file_format_name()
 
 
 int
-srecord::input_file_atmel_generic::format_option_number(void)
+srecord::input_file_atmel_generic::format_option_number()
     const
 {
     return
diff --git a/srecord/input/file/atmel_generic.h b/srecord/input/file/atmel_generic.h
index 341755f4..be1074bf 100644
--- a/srecord/input/file/atmel_generic.h
+++ b/srecord/input/file/atmel_generic.h
@@ -70,7 +70,7 @@ class input_file_atmel_generic:
     const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/binary.cc b/srecord/input/file/binary.cc
index 2075bda6..6b227002 100644
--- a/srecord/input/file/binary.cc
+++ b/srecord/input/file/binary.cc
@@ -78,7 +78,7 @@ srecord::input_file_binary::read(srecord::record &record)
 
 
 bool
-srecord::input_file_binary::is_binary(void)
+srecord::input_file_binary::is_binary()
     const
 {
     return true;
@@ -94,7 +94,7 @@ srecord::input_file_binary::get_file_format_name()
 
 
 int
-srecord::input_file_binary::format_option_number(void)
+srecord::input_file_binary::format_option_number()
     const
 {
     return arglex_tool::token_binary;
diff --git a/srecord/input/file/binary.h b/srecord/input/file/binary.h
index 21cf585f..106c94cb 100644
--- a/srecord/input/file/binary.h
+++ b/srecord/input/file/binary.h
@@ -55,7 +55,7 @@ class input_file_binary:
     const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -73,7 +73,7 @@ class input_file_binary:
     unsigned long address;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/input/file/brecord.cc b/srecord/input/file/brecord.cc
index 6a3c957d..fffbe452 100644
--- a/srecord/input/file/brecord.cc
+++ b/srecord/input/file/brecord.cc
@@ -86,7 +86,7 @@ srecord::input_file_brecord::read(record &result)
 
 
 const char *
-srecord::input_file_brecord::get_file_format_name(void)
+srecord::input_file_brecord::get_file_format_name()
     const
 {
     return "Motorola MC68EZ328 bootstrap b-record";
@@ -94,7 +94,7 @@ srecord::input_file_brecord::get_file_format_name(void)
 
 
 int
-srecord::input_file_brecord::format_option_number(void)
+srecord::input_file_brecord::format_option_number()
     const
 {
     return arglex_tool::token_brecord;
diff --git a/srecord/input/file/brecord.h b/srecord/input/file/brecord.h
index 864f4695..83428f26 100644
--- a/srecord/input/file/brecord.h
+++ b/srecord/input/file/brecord.h
@@ -52,10 +52,10 @@ class input_file_brecord:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/cosmac.cc b/srecord/input/file/cosmac.cc
index 1000cb92..911ec5a7 100644
--- a/srecord/input/file/cosmac.cc
+++ b/srecord/input/file/cosmac.cc
@@ -149,7 +149,7 @@ srecord::input_file_cosmac::get_file_format_name()
 
 
 int
-srecord::input_file_cosmac::format_option_number(void)
+srecord::input_file_cosmac::format_option_number()
     const
 {
     return arglex_tool::token_cosmac;
diff --git a/srecord/input/file/cosmac.h b/srecord/input/file/cosmac.h
index c75d50f9..44fedb9d 100644
--- a/srecord/input/file/cosmac.h
+++ b/srecord/input/file/cosmac.h
@@ -52,10 +52,10 @@ class input_file_cosmac:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/dec_binary.cc b/srecord/input/file/dec_binary.cc
index 7a498d2c..60d31aec 100644
--- a/srecord/input/file/dec_binary.cc
+++ b/srecord/input/file/dec_binary.cc
@@ -147,7 +147,7 @@ srecord::input_file_dec_binary::read(srecord::record &record)
 
 
 bool
-srecord::input_file_dec_binary::is_binary(void)
+srecord::input_file_dec_binary::is_binary()
     const
 {
     return true;
@@ -163,7 +163,7 @@ srecord::input_file_dec_binary::get_file_format_name()
 
 
 int
-srecord::input_file_dec_binary::format_option_number(void)
+srecord::input_file_dec_binary::format_option_number()
     const
 {
     return arglex_tool::token_dec_binary;
diff --git a/srecord/input/file/dec_binary.h b/srecord/input/file/dec_binary.h
index 463b9437..e541a8c4 100644
--- a/srecord/input/file/dec_binary.h
+++ b/srecord/input/file/dec_binary.h
@@ -53,13 +53,13 @@ class input_file_dec_binary:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/emon52.cc b/srecord/input/file/emon52.cc
index c876e1c7..85ab2924 100644
--- a/srecord/input/file/emon52.cc
+++ b/srecord/input/file/emon52.cc
@@ -41,7 +41,7 @@ srecord::input_file_emon52::create(const std::string &a_file_name)
 
 
 void
-srecord::input_file_emon52::skip_white_space(void)
+srecord::input_file_emon52::skip_white_space()
 {
     for (;;)
     {
@@ -96,7 +96,7 @@ srecord::input_file_emon52::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_emon52::get_file_format_name(void)
+srecord::input_file_emon52::get_file_format_name()
     const
 {
     return "Elektor Monitor (EMON52)";
@@ -104,7 +104,7 @@ srecord::input_file_emon52::get_file_format_name(void)
 
 
 int
-srecord::input_file_emon52::format_option_number(void)
+srecord::input_file_emon52::format_option_number()
     const
 {
     return arglex_tool::token_emon52;
diff --git a/srecord/input/file/emon52.h b/srecord/input/file/emon52.h
index 7ce09c55..0aacf22b 100644
--- a/srecord/input/file/emon52.h
+++ b/srecord/input/file/emon52.h
@@ -52,10 +52,10 @@ class input_file_emon52:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -72,7 +72,7 @@ class input_file_emon52:
       * The format requires spaces in some locations, this method
       * skips the space of present.
       */
-    void skip_white_space(void);
+    void skip_white_space();
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/input/file/fairchild.cc b/srecord/input/file/fairchild.cc
index 868bd388..ae7ffafe 100644
--- a/srecord/input/file/fairchild.cc
+++ b/srecord/input/file/fairchild.cc
@@ -146,7 +146,7 @@ srecord::input_file_fairchild::get_file_format_name()
 
 
 int
-srecord::input_file_fairchild::format_option_number(void)
+srecord::input_file_fairchild::format_option_number()
     const
 {
     return arglex_tool::token_fairchild;
diff --git a/srecord/input/file/fairchild.h b/srecord/input/file/fairchild.h
index 5c625953..4affbf5e 100644
--- a/srecord/input/file/fairchild.h
+++ b/srecord/input/file/fairchild.h
@@ -52,10 +52,10 @@ class input_file_fairchild:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -71,14 +71,14 @@ class input_file_fairchild:
       * We override the one in the base class because the checksum is
       * nibble-based, not byte-based.
       */
-    int get_nibble(void);
+    int get_nibble();
 
     /**
       * The get_byte method gets a two hex-digit from input and assembles
       * them (big-endian) into a byte.  We override the one in the base
       * class because the checksum is nibble-based, not byte-based.
       */
-    int get_byte(void);
+    int get_byte();
 
     /**
       * The header_seen instance variable is used to member whether the
diff --git a/srecord/input/file/fastload.cc b/srecord/input/file/fastload.cc
index 181f951a..a1433c3e 100644
--- a/srecord/input/file/fastload.cc
+++ b/srecord/input/file/fastload.cc
@@ -46,7 +46,7 @@ srecord::input_file_fastload::create(const std::string &a_file_name)
 
 
 int
-srecord::input_file_fastload::get_digit(void)
+srecord::input_file_fastload::get_digit()
 {
     int c = get_char();
     switch (c)
@@ -144,7 +144,7 @@ srecord::input_file_fastload::get_number(int min_digits, int max_digits)
 
 
 void
-srecord::input_file_fastload::expect_white_space(void)
+srecord::input_file_fastload::expect_white_space()
 {
     switch (peek_char())
     {
@@ -309,7 +309,7 @@ srecord::input_file_fastload::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_fastload::get_file_format_name(void)
+srecord::input_file_fastload::get_file_format_name()
     const
 {
     return "LSI Logic Fast Load";
@@ -317,7 +317,7 @@ srecord::input_file_fastload::get_file_format_name(void)
 
 
 int
-srecord::input_file_fastload::format_option_number(void)
+srecord::input_file_fastload::format_option_number()
     const
 {
     return arglex_tool::token_fast_load;
diff --git a/srecord/input/file/fastload.h b/srecord/input/file/fastload.h
index b89e7c97..4fdc61b9 100644
--- a/srecord/input/file/fastload.h
+++ b/srecord/input/file/fastload.h
@@ -51,10 +51,10 @@ class input_file_fastload:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -76,7 +76,7 @@ class input_file_fastload:
       * Get a single base-64 digit.  Returns 0..63 for a valid digit.
       * Fatal error if not a valid base-64 digit.
       */
-    int get_digit(void);
+    int get_digit();
 
     /**
       * The get_number method is used to get a base-64 number.
@@ -103,7 +103,7 @@ class input_file_fastload:
       * space follows the various commands.  It doesn't consume any
       * input, since it uses peek_char to do the checking.
       */
-    void expect_white_space(void);
+    void expect_white_space();
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/input/file/formatted_binary.cc b/srecord/input/file/formatted_binary.cc
index ca4e28c9..4f307701 100644
--- a/srecord/input/file/formatted_binary.cc
+++ b/srecord/input/file/formatted_binary.cc
@@ -163,7 +163,7 @@ srecord::input_file_formatted_binary::read(record &result)
 
 
 bool
-srecord::input_file_formatted_binary::is_binary(void)
+srecord::input_file_formatted_binary::is_binary()
     const
 {
     return true;
@@ -171,7 +171,7 @@ srecord::input_file_formatted_binary::is_binary(void)
 
 
 const char *
-srecord::input_file_formatted_binary::get_file_format_name(void)
+srecord::input_file_formatted_binary::get_file_format_name()
     const
 {
     return "Formatted Binary";
@@ -179,7 +179,7 @@ srecord::input_file_formatted_binary::get_file_format_name(void)
 
 
 int
-srecord::input_file_formatted_binary::format_option_number(void)
+srecord::input_file_formatted_binary::format_option_number()
     const
 {
     return arglex_tool::token_formatted_binary;
diff --git a/srecord/input/file/formatted_binary.h b/srecord/input/file/formatted_binary.h
index f63f83df..b0df594f 100644
--- a/srecord/input/file/formatted_binary.h
+++ b/srecord/input/file/formatted_binary.h
@@ -52,13 +52,13 @@ class input_file_formatted_binary:
     bool read (record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/four_packed_code.cc b/srecord/input/file/four_packed_code.cc
index fa455654..27cc4d83 100644
--- a/srecord/input/file/four_packed_code.cc
+++ b/srecord/input/file/four_packed_code.cc
@@ -45,7 +45,7 @@ srecord::input_file_four_packed_code::create(const std::string &a_file_name)
 
 
 int
-srecord::input_file_four_packed_code::get_digit(void)
+srecord::input_file_four_packed_code::get_digit()
 {
     int c = get_char();
     switch (c)
@@ -143,7 +143,7 @@ srecord::input_file_four_packed_code::get_digit(void)
 
 
 int
-srecord::input_file_four_packed_code::get_byte(void)
+srecord::input_file_four_packed_code::get_byte()
 {
     if (get_byte_pos >= 4)
         get_byte_pos = 0;
@@ -263,7 +263,7 @@ srecord::input_file_four_packed_code::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_four_packed_code::get_file_format_name(void)
+srecord::input_file_four_packed_code::get_file_format_name()
     const
 {
     return "Four Packed Code (FPC)";
@@ -271,7 +271,7 @@ srecord::input_file_four_packed_code::get_file_format_name(void)
 
 
 int
-srecord::input_file_four_packed_code::format_option_number(void)
+srecord::input_file_four_packed_code::format_option_number()
     const
 {
     return arglex_tool::token_four_packed_code;
diff --git a/srecord/input/file/four_packed_code.h b/srecord/input/file/four_packed_code.h
index 023b5f7d..d7ae2585 100644
--- a/srecord/input/file/four_packed_code.h
+++ b/srecord/input/file/four_packed_code.h
@@ -53,10 +53,10 @@ class input_file_four_packed_code:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -81,13 +81,13 @@ class input_file_four_packed_code:
       * bytes) at a time.  The usual get_word (etc) continue to work
       * without additional modifications.
       */
-    int get_byte(void);
+    int get_byte();
 
     /**
       * The get_digit method is used to fetch one base85 digit from
       * the input.
       */
-    int get_digit(void);
+    int get_digit();
 
     /**
       * The get_byte_pos instance variable is used by the get_byte
diff --git a/srecord/input/file/guess.cc b/srecord/input/file/guess.cc
index 40ab0164..432a1e24 100644
--- a/srecord/input/file/guess.cc
+++ b/srecord/input/file/guess.cc
@@ -58,6 +58,7 @@
 #include <srecord/input/file/vmem.h>
 #include <srecord/input/file/wilson.h>
 #include <srecord/record.h>
+#include <srecord/sizeof.h>
 
 
 typedef srecord::input_file::pointer (*func_p)(const std::string &file_name);
@@ -102,9 +103,6 @@ static func_p table[] =
     srecord::input_file_hexdump::create,
 };
 
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
-#define ENDOF(a) ((a) + SIZEOF(a))
-
 
 srecord::input_file::pointer
 srecord::input_file::guess(const std::string &fn, arglex &cmdline)
diff --git a/srecord/input/file/hexdump.cc b/srecord/input/file/hexdump.cc
index e2667cab..9b6a2825 100644
--- a/srecord/input/file/hexdump.cc
+++ b/srecord/input/file/hexdump.cc
@@ -42,7 +42,7 @@ srecord::input_file_hexdump::create(const std::string &filename)
 
 
 srecord::input_file_hexdump::token_t
-srecord::input_file_hexdump::get_next_token(void)
+srecord::input_file_hexdump::get_next_token()
 {
     for (;;)
     {
@@ -89,7 +89,7 @@ srecord::input_file_hexdump::get_next_token(void)
 
 
 bool
-srecord::input_file_hexdump::discard_rest_of_line(void)
+srecord::input_file_hexdump::discard_rest_of_line()
 {
     for (;;)
     {
@@ -199,7 +199,7 @@ srecord::input_file_hexdump::read(record &result)
 
 
 const char *
-srecord::input_file_hexdump::get_file_format_name(void)
+srecord::input_file_hexdump::get_file_format_name()
     const
 {
     return "hexdump";
@@ -207,7 +207,7 @@ srecord::input_file_hexdump::get_file_format_name(void)
 
 
 int
-srecord::input_file_hexdump::format_option_number(void)
+srecord::input_file_hexdump::format_option_number()
     const
 {
     return arglex_tool::token_hexdump;
diff --git a/srecord/input/file/hexdump.h b/srecord/input/file/hexdump.h
index 0e0665ab..e81795c5 100644
--- a/srecord/input/file/hexdump.h
+++ b/srecord/input/file/hexdump.h
@@ -50,10 +50,10 @@ class input_file_hexdump:
     bool read(class record &rec);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -79,13 +79,13 @@ class input_file_hexdump:
       *
       * It will set the #current_token_value instance variable for token_byte
       */
-    token_t get_next_token(void);
+    token_t get_next_token();
 
     /**
       * The discard_rest_of_line method is used to
       * discard all characters until the next end of line character.
       */
-    bool discard_rest_of_line(void);
+    bool discard_rest_of_line();
 
     /**
       * The address instance variable is used to remember the current
diff --git a/srecord/input/file/hp64k.cc b/srecord/input/file/hp64k.cc
index 71d70535..764919ec 100644
--- a/srecord/input/file/hp64k.cc
+++ b/srecord/input/file/hp64k.cc
@@ -90,7 +90,7 @@ srecord::input_file_hp64k::read_u16be(uint16_t *dest)
         return false;
     tmp = tmp | (c & 0xFF);
     *dest = tmp;
-    return 1;
+    return true;
 }
 
 //in this implementation, read_datarec is called at the "recsize" position,
@@ -98,8 +98,10 @@ srecord::input_file_hp64k::read_u16be(uint16_t *dest)
 bool
 srecord::input_file_hp64k::read_datarec(record &result)
 {
-    uint16_t recsize, datasize;
-    uint16_t load_l, load_h;
+    uint16_t recsize;
+    uint16_t datasize;
+    uint16_t load_l;
+    uint16_t load_h;
     size_t tmp_addr;
 
     if (!read_u16be(&recsize))
@@ -197,7 +199,11 @@ srecord::input_file_hp64k::read_hdr(record &result)
 bool
 srecord::input_file_hp64k::read_pir(record &result)
 {
-    uint16_t pirlen, width, base, xfer_l, xfer_h;
+    uint16_t pirlen;
+    uint16_t width;
+    uint16_t base;
+    uint16_t xfer_l;
+    uint16_t xfer_h;
     uint32_t xfer;
 
     if (!read_u16be(&pirlen))
@@ -239,7 +245,7 @@ srecord::input_file_hp64k::read(record &record)
     case need_hdr:
         if (!read_hdr(record))
         {
-            return 0;
+            return false;
         }
         state = need_pir;
         break;
@@ -247,7 +253,7 @@ srecord::input_file_hp64k::read(record &record)
     case need_pir:
         if (!read_pir(record))
         {
-            return 0;
+            return false;
         }
         state = data;
         break;
@@ -268,14 +274,14 @@ srecord::input_file_hp64k::read(record &record)
 }
 
 bool
-srecord::input_file_hp64k::is_binary(void)
+srecord::input_file_hp64k::is_binary()
     const
 {
     return true;
 }
 
 const char *
-srecord::input_file_hp64k::get_file_format_name(void)
+srecord::input_file_hp64k::get_file_format_name()
     const
 {
     return "HP64000 Absolute";
@@ -283,7 +289,7 @@ srecord::input_file_hp64k::get_file_format_name(void)
 
 
 int
-srecord::input_file_hp64k::format_option_number(void)
+srecord::input_file_hp64k::format_option_number()
     const
 {
     return arglex_tool::token_hp64k;
diff --git a/srecord/input/file/hp64k.h b/srecord/input/file/hp64k.h
index 3fe2c9f1..7c328b0b 100644
--- a/srecord/input/file/hp64k.h
+++ b/srecord/input/file/hp64k.h
@@ -53,13 +53,13 @@ class input_file_hp64k:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
     void command_line(arglex_tool *cmdln);
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -71,7 +71,7 @@ class input_file_hp64k:
     input_file_hp64k(const std::string &file_name);
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     /**
      * Number of parsed data records
diff --git a/srecord/input/file/idt.cc b/srecord/input/file/idt.cc
index 1b16756f..629f0287 100644
--- a/srecord/input/file/idt.cc
+++ b/srecord/input/file/idt.cc
@@ -44,7 +44,7 @@ srecord::input_file_idt::create(const std::string &a_file_name)
 
 
 void
-srecord::input_file_idt::record_format_error(void)
+srecord::input_file_idt::record_format_error()
 {
     fatal_error("record format error");
 }
@@ -242,7 +242,7 @@ srecord::input_file_idt::read(record &record)
 
 
 bool
-srecord::input_file_idt::is_binary(void)
+srecord::input_file_idt::is_binary()
     const
 {
     return true;
@@ -258,7 +258,7 @@ srecord::input_file_idt::get_file_format_name()
 
 
 int
-srecord::input_file_idt::format_option_number(void)
+srecord::input_file_idt::format_option_number()
     const
 {
     return arglex_tool::token_idt;
diff --git a/srecord/input/file/idt.h b/srecord/input/file/idt.h
index 6ddbf13c..a8c65c65 100644
--- a/srecord/input/file/idt.h
+++ b/srecord/input/file/idt.h
@@ -52,13 +52,13 @@ class input_file_idt:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -91,7 +91,7 @@ class input_file_idt:
       * The record_format_error is a wrapper around #fatal_error to
       * complain abut format errors.
       */
-    void record_format_error(void);
+    void record_format_error();
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/input/file/intel.cc b/srecord/input/file/intel.cc
index 096cc958..1e460709 100644
--- a/srecord/input/file/intel.cc
+++ b/srecord/input/file/intel.cc
@@ -23,8 +23,7 @@
 
 srecord::input_file_intel::~input_file_intel()
 {
-    if (pushback)
-        delete pushback;
+    delete pushback;
 }
 
 
@@ -423,7 +422,7 @@ srecord::input_file_intel::get_file_format_name()
 
 
 int
-srecord::input_file_intel::format_option_number(void)
+srecord::input_file_intel::format_option_number()
     const
 {
     return arglex_tool::token_intel;
diff --git a/srecord/input/file/intel.h b/srecord/input/file/intel.h
index d0134ff4..623d0586 100644
--- a/srecord/input/file/intel.h
+++ b/srecord/input/file/intel.h
@@ -52,10 +52,10 @@ class input_file_intel:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/intel16.cc b/srecord/input/file/intel16.cc
index 6b6c7bec..10c91c65 100644
--- a/srecord/input/file/intel16.cc
+++ b/srecord/input/file/intel16.cc
@@ -359,7 +359,7 @@ srecord::input_file_intel16::get_file_format_name()
 
 
 int
-srecord::input_file_intel16::format_option_number(void)
+srecord::input_file_intel16::format_option_number()
     const
 {
     return arglex_tool::token_intel16;
diff --git a/srecord/input/file/intel16.h b/srecord/input/file/intel16.h
index c2d6526e..5bfb11c6 100644
--- a/srecord/input/file/intel16.h
+++ b/srecord/input/file/intel16.h
@@ -53,10 +53,10 @@ class input_file_intel16:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/logisim.cc b/srecord/input/file/logisim.cc
index 9112d88e..4152bae5 100644
--- a/srecord/input/file/logisim.cc
+++ b/srecord/input/file/logisim.cc
@@ -61,7 +61,7 @@ quote_char(int c)
 
 
 void
-srecord::input_file_logisim::read_inner_one(void)
+srecord::input_file_logisim::read_inner_one()
 {
     char buffer[512];
     char *bp = buffer;
@@ -86,14 +86,14 @@ srecord::input_file_logisim::read_inner_one(void)
         break;
     }
     *bp = '\0';
-    if (strcmp(buffer, "v2.0 raw"))
+    if (strcmp(buffer, "v2.0 raw") != 0)
         fatal_error("bad magic number");
     state = state_line_two;
 }
 
 
 void
-srecord::input_file_logisim::read_inner_two(void)
+srecord::input_file_logisim::read_inner_two()
 {
     bool warned = false;
     for (;;)
@@ -129,7 +129,7 @@ srecord::input_file_logisim::read_inner_two(void)
 
 
 void
-srecord::input_file_logisim::read_inner_job(void)
+srecord::input_file_logisim::read_inner_job()
 {
     char buffer[200];
     char *bp = buffer;
@@ -253,7 +253,7 @@ srecord::input_file_logisim::read(class record &rec)
             size_t max_data_size = record::maximum_data_length(address);
             size_t data_size =
                 ((size_t)job.count > max_data_size ? max_data_size : job.count);
-            auto data = new record::data_t[data_size];
+            auto *data = new record::data_t[data_size];
             memset(data, job.value, data_size);
             rec = record(record::type_data, job.address, data, data_size);
             job.address += data_size;
@@ -274,7 +274,7 @@ srecord::input_file_logisim::read(class record &rec)
 
 
 const char *
-srecord::input_file_logisim::get_file_format_name(void)
+srecord::input_file_logisim::get_file_format_name()
     const
 {
     return "Logisim";
@@ -282,7 +282,7 @@ srecord::input_file_logisim::get_file_format_name(void)
 
 
 int
-srecord::input_file_logisim::format_option_number(void)
+srecord::input_file_logisim::format_option_number()
     const
 {
     return srecord::arglex_tool::token_logisim;
@@ -290,7 +290,7 @@ srecord::input_file_logisim::format_option_number(void)
 
 
 std::string
-srecord::input_file_logisim::datum_t::representation(void)
+srecord::input_file_logisim::datum_t::representation()
     const
 {
     char buffer[200];
diff --git a/srecord/input/file/logisim.h b/srecord/input/file/logisim.h
index 23eb9676..7d0326e1 100644
--- a/srecord/input/file/logisim.h
+++ b/srecord/input/file/logisim.h
@@ -19,7 +19,7 @@
 #ifndef SRECORD_INPUT_FILE_LOGISIM_H
 #define SRECORD_INPUT_FILE_LOGISIM_H
 
-#include <inttypes.h>
+#include <cinttypes>
 #include <list>
 
 #include <srecord/record.h>
@@ -100,10 +100,10 @@ class input_file_logisim:
     bool read(srecord::record &rec);
 
     // See base class for documentation
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation
-    int format_option_number(void) const;
+    int format_option_number() const;
 
     /**
       * The constructor.
@@ -122,15 +122,15 @@ class input_file_logisim:
         uint32_t address;
         long count;
         uint32_t value;
-        std::string representation(void) const;
+        std::string representation() const;
     };
 
     std::list<datum_t> jobs;
 
     bool read_inner(record &rec);
-    void read_inner_one(void);
-    void read_inner_two(void);
-    void read_inner_job(void);
+    void read_inner_one();
+    void read_inner_two();
+    void read_inner_job();
 
     /**
       * The default constructor.
diff --git a/srecord/input/file/mif.cc b/srecord/input/file/mif.cc
index e9e36d37..95f6fb74 100644
--- a/srecord/input/file/mif.cc
+++ b/srecord/input/file/mif.cc
@@ -47,7 +47,7 @@ srecord::input_file_mif::create(const std::string &a_file_name)
 
 
 srecord::input_file_mif::token_t
-srecord::input_file_mif::lex_addr(void)
+srecord::input_file_mif::lex_addr()
 {
     lex_radix = lex_addr_radix;
     token_t result = lex();
@@ -57,7 +57,7 @@ srecord::input_file_mif::lex_addr(void)
 
 
 srecord::input_file_mif::token_t
-srecord::input_file_mif::lex_data(void)
+srecord::input_file_mif::lex_data()
 {
     lex_radix = lex_data_radix;
     token_t result = lex();
@@ -67,7 +67,7 @@ srecord::input_file_mif::lex_data(void)
 
 
 srecord::input_file_mif::token_t
-srecord::input_file_mif::lex(void)
+srecord::input_file_mif::lex()
 {
     for (;;)
     {
@@ -230,7 +230,7 @@ srecord::input_file_mif::syntax_error(const char *text)
 
 
 void
-srecord::input_file_mif::get_equals(void)
+srecord::input_file_mif::get_equals()
 {
     if (lex() != token_equals)
         syntax_error("equals (=) expected");
@@ -238,7 +238,7 @@ srecord::input_file_mif::get_equals(void)
 
 
 long
-srecord::input_file_mif::get_number(void)
+srecord::input_file_mif::get_number()
 {
     if (lex() != token_number)
         syntax_error("decimal number expected");
@@ -247,7 +247,7 @@ srecord::input_file_mif::get_number(void)
 
 
 void
-srecord::input_file_mif::get_semicolon(void)
+srecord::input_file_mif::get_semicolon()
 {
     if (lex() != token_semicolon)
         syntax_error("semicolon (;) expected");
@@ -255,7 +255,7 @@ srecord::input_file_mif::get_semicolon(void)
 
 
 void
-srecord::input_file_mif::get_colon(void)
+srecord::input_file_mif::get_colon()
 {
     if (lex() != token_colon)
         syntax_error("colon (:) expected");
@@ -263,7 +263,7 @@ srecord::input_file_mif::get_colon(void)
 
 
 int
-srecord::input_file_mif::get_radix(void)
+srecord::input_file_mif::get_radix()
 {
     switch (lex())
     {
@@ -458,7 +458,7 @@ srecord::input_file_mif::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_mif::get_file_format_name(void)
+srecord::input_file_mif::get_file_format_name()
     const
 {
     return "Memory Initialization File (MIF, Altera)";
@@ -466,7 +466,7 @@ srecord::input_file_mif::get_file_format_name(void)
 
 
 int
-srecord::input_file_mif::format_option_number(void)
+srecord::input_file_mif::format_option_number()
     const
 {
     return arglex_tool::token_memory_initialization_file;
diff --git a/srecord/input/file/mif.h b/srecord/input/file/mif.h
index f2ecaa8a..fd869997 100644
--- a/srecord/input/file/mif.h
+++ b/srecord/input/file/mif.h
@@ -52,10 +52,10 @@ class input_file_mif:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -135,7 +135,7 @@ class input_file_mif:
       * The lex method is used to obtain the next lexical token from the
       * input stream.
       */
-    token_t lex(void);
+    token_t lex();
 
     /**
       * The token_value instance variable is used to remember the
@@ -147,13 +147,13 @@ class input_file_mif:
       * The lex_addr method is used to obtain the next lexical token
       * from the input stream, using the address radix.
       */
-    token_t lex_addr(void);
+    token_t lex_addr();
 
     /**
       * The lex_data method is used to obtain the next lexical token
       * from the input stream, using the data radix.
       */
-    token_t lex_data(void);
+    token_t lex_data();
 
     /**
       * The syntax_error method is used to report parse errors when
@@ -164,11 +164,11 @@ class input_file_mif:
       */
     void syntax_error(const char *text);
 
-    void get_equals(void);
-    long get_number(void);
-    void get_semicolon(void);
-    int get_radix(void);
-    void get_colon(void);
+    void get_equals();
+    long get_number();
+    void get_semicolon();
+    int get_radix();
+    void get_colon();
 
     unsigned width;
     unsigned width_in_bytes;
diff --git a/srecord/input/file/mips_flash.cc b/srecord/input/file/mips_flash.cc
index 241f1449..62cd8224 100644
--- a/srecord/input/file/mips_flash.cc
+++ b/srecord/input/file/mips_flash.cc
@@ -56,7 +56,7 @@ srecord::input_file_mips_flash::create_le(const std::string &a_file_name)
 
 
 void
-srecord::input_file_mips_flash::tokenizer(void)
+srecord::input_file_mips_flash::tokenizer()
 {
     for (;;)
     {
@@ -205,7 +205,7 @@ srecord::input_file_mips_flash::read(record &result)
 
 
 const char *
-srecord::input_file_mips_flash::get_file_format_name(void)
+srecord::input_file_mips_flash::get_file_format_name()
     const
 {
     return
@@ -220,7 +220,7 @@ srecord::input_file_mips_flash::get_file_format_name(void)
 
 
 int
-srecord::input_file_mips_flash::format_option_number(void)
+srecord::input_file_mips_flash::format_option_number()
     const
 {
     return
diff --git a/srecord/input/file/mips_flash.h b/srecord/input/file/mips_flash.h
index 2793d177..e2d52384 100644
--- a/srecord/input/file/mips_flash.h
+++ b/srecord/input/file/mips_flash.h
@@ -65,10 +65,10 @@ class input_file_mips_flash:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -112,7 +112,7 @@ class input_file_mips_flash:
       * it returns.  If it finds an error it will issue a #fatal_error
       * message and not return.
       */
-    void tokenizer(void);
+    void tokenizer();
 
     enum token_t
     {
diff --git a/srecord/input/file/mos_tech.cc b/srecord/input/file/mos_tech.cc
index 1efc302c..6be2f24c 100644
--- a/srecord/input/file/mos_tech.cc
+++ b/srecord/input/file/mos_tech.cc
@@ -151,7 +151,7 @@ srecord::input_file_mos_tech::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_mos_tech::get_file_format_name(void)
+srecord::input_file_mos_tech::get_file_format_name()
     const
 {
     return "MOS Technology";
@@ -159,7 +159,7 @@ srecord::input_file_mos_tech::get_file_format_name(void)
 
 
 int
-srecord::input_file_mos_tech::format_option_number(void)
+srecord::input_file_mos_tech::format_option_number()
     const
 {
     return arglex_tool::token_mos_tech;
diff --git a/srecord/input/file/mos_tech.h b/srecord/input/file/mos_tech.h
index adfff55c..77c66830 100644
--- a/srecord/input/file/mos_tech.h
+++ b/srecord/input/file/mos_tech.h
@@ -51,10 +51,10 @@ class input_file_mos_tech:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/motorola.cc b/srecord/input/file/motorola.cc
index 53a75d62..2d392c12 100644
--- a/srecord/input/file/motorola.cc
+++ b/srecord/input/file/motorola.cc
@@ -334,7 +334,7 @@ srecord::input_file_motorola::read(record &record)
 
 
 const char *
-srecord::input_file_motorola::get_file_format_name(void)
+srecord::input_file_motorola::get_file_format_name()
     const
 {
     return "Motorola S-Record";
@@ -342,7 +342,7 @@ srecord::input_file_motorola::get_file_format_name(void)
 
 
 int
-srecord::input_file_motorola::format_option_number(void)
+srecord::input_file_motorola::format_option_number()
     const
 {
     return arglex_tool::token_motorola;
diff --git a/srecord/input/file/motorola.h b/srecord/input/file/motorola.h
index a076cec8..c201d5d0 100644
--- a/srecord/input/file/motorola.h
+++ b/srecord/input/file/motorola.h
@@ -52,13 +52,13 @@ class input_file_motorola:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
     void command_line(arglex_tool *cmdln);
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/msbin.cc b/srecord/input/file/msbin.cc
index eddd4cea..536795e3 100644
--- a/srecord/input/file/msbin.cc
+++ b/srecord/input/file/msbin.cc
@@ -79,7 +79,7 @@ srecord::input_file_msbin::create(const std::string &a_file_name)
 
 
 uint32_t
-srecord::input_file_msbin::read_dword_le(void)
+srecord::input_file_msbin::read_dword_le()
 {
     unsigned char c[sizeof(uint32_t)];
 
@@ -98,7 +98,7 @@ srecord::input_file_msbin::read_dword_le(void)
 
 
 void
-srecord::input_file_msbin::read_file_header(void)
+srecord::input_file_msbin::read_file_header()
 {
     // Optional magic
     static const unsigned char Magic[7] =
@@ -118,7 +118,7 @@ srecord::input_file_msbin::read_file_header(void)
 
     static_assert(sizeof(buff) >= sizeof(Magic),
         "Just to be sure that the buffer is big enough.");
-    if (memcmp(Magic, buff, sizeof(Magic)))
+    if (memcmp(Magic, buff, sizeof(Magic)) != 0)
     {
         // Ok, there's no magic in the header. But it's optional anyway.
 
@@ -304,7 +304,7 @@ srecord::input_file_msbin::read(record &result)
 
 
 bool
-srecord::input_file_msbin::is_binary(void)
+srecord::input_file_msbin::is_binary()
     const
 {
     return true;
@@ -312,7 +312,7 @@ srecord::input_file_msbin::is_binary(void)
 
 
 const char *
-srecord::input_file_msbin::get_file_format_name(void)
+srecord::input_file_msbin::get_file_format_name()
     const
 {
     return "Windows CE Binary Image Data Format";
@@ -320,7 +320,7 @@ srecord::input_file_msbin::get_file_format_name(void)
 
 
 int
-srecord::input_file_msbin::format_option_number(void)
+srecord::input_file_msbin::format_option_number()
     const
 {
     return arglex_tool::token_msbin;
diff --git a/srecord/input/file/msbin.h b/srecord/input/file/msbin.h
index a5f88b71..596820b7 100644
--- a/srecord/input/file/msbin.h
+++ b/srecord/input/file/msbin.h
@@ -22,7 +22,7 @@
 #ifndef SRECORD_INPUT_FILE_MSBIN_H
 #define SRECORD_INPUT_FILE_MSBIN_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <srecord/input/file.h>
 #include <srecord/record.h>
 
@@ -60,10 +60,10 @@ class input_file_msbin:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -155,7 +155,7 @@ class input_file_msbin:
       * The read_file_header method is used to read the (optional) magic
       * and the file header.
       */
-    void read_file_header(void);
+    void read_file_header();
 
     // Just to be sure we can fit uint32_t in address_t.
     static_assert(sizeof(record::address_t) >= sizeof(uint32_t),
@@ -165,7 +165,7 @@ class input_file_msbin:
       * The read_dword_le method is used to read a little endian double
       * word from the input.
       */
-    uint32_t read_dword_le(void);
+    uint32_t read_dword_le();
 
     /**
       * The checksum method is used to calculate the checksum of a given
@@ -182,7 +182,7 @@ class input_file_msbin:
     static uint32_t checksum(const unsigned char *data, size_t len);
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/input/file/needham.cc b/srecord/input/file/needham.cc
index d8a1b2bf..275eee3b 100644
--- a/srecord/input/file/needham.cc
+++ b/srecord/input/file/needham.cc
@@ -110,7 +110,7 @@ srecord::input_file_needham::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_needham::get_file_format_name(void)
+srecord::input_file_needham::get_file_format_name()
     const
 {
     return "Needham";
@@ -118,7 +118,7 @@ srecord::input_file_needham::get_file_format_name(void)
 
 
 int
-srecord::input_file_needham::format_option_number(void)
+srecord::input_file_needham::format_option_number()
     const
 {
     return arglex_tool::token_needham_hex;
diff --git a/srecord/input/file/needham.h b/srecord/input/file/needham.h
index 2928b5c8..53847b95 100644
--- a/srecord/input/file/needham.h
+++ b/srecord/input/file/needham.h
@@ -52,10 +52,10 @@ class input_file_needham:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/os65v.cc b/srecord/input/file/os65v.cc
index bd4b0d30..06a46ba5 100644
--- a/srecord/input/file/os65v.cc
+++ b/srecord/input/file/os65v.cc
@@ -168,7 +168,7 @@ srecord::input_file_os65v::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_os65v::get_file_format_name(void)
+srecord::input_file_os65v::get_file_format_name()
     const
 {
     return "Ohio Scientific";
@@ -176,7 +176,7 @@ srecord::input_file_os65v::get_file_format_name(void)
 
 
 int
-srecord::input_file_os65v::format_option_number(void)
+srecord::input_file_os65v::format_option_number()
     const
 {
     return arglex_tool::token_ohio_scientific;
diff --git a/srecord/input/file/os65v.h b/srecord/input/file/os65v.h
index cf47d415..9a83b34f 100644
--- a/srecord/input/file/os65v.h
+++ b/srecord/input/file/os65v.h
@@ -53,10 +53,10 @@ class input_file_os65v:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/ppb.cc b/srecord/input/file/ppb.cc
index a34126a4..41729d2c 100644
--- a/srecord/input/file/ppb.cc
+++ b/srecord/input/file/ppb.cc
@@ -32,7 +32,7 @@ srecord::input_file_ppb::input_file_ppb(const std::string &filename) :
     input_file(filename),
     address(0),
     data_seen(false),
-    packet_address(-1uL),
+    packet_address(-1UL),
     packet_length(0),
     packet_used(0)
 {
@@ -47,7 +47,7 @@ srecord::input_file_ppb::create(const std::string &filename)
 
 
 bool
-srecord::input_file_ppb::get_packet(void)
+srecord::input_file_ppb::get_packet()
 {
     int c;
 
@@ -160,14 +160,14 @@ srecord::input_file_ppb::read(record &result)
 
 
 void
-srecord::input_file_ppb::packet_format_error(void)
+srecord::input_file_ppb::packet_format_error()
 {
     fatal_error("packet not formatted correctly");
 }
 
 
 bool
-srecord::input_file_ppb::is_binary(void)
+srecord::input_file_ppb::is_binary()
     const
 {
     return true;
@@ -175,7 +175,7 @@ srecord::input_file_ppb::is_binary(void)
 
 
 const char *
-srecord::input_file_ppb::get_file_format_name(void)
+srecord::input_file_ppb::get_file_format_name()
     const
 {
     return "Stag Prom Programmer binary (PPB)";
@@ -183,7 +183,7 @@ srecord::input_file_ppb::get_file_format_name(void)
 
 
 int
-srecord::input_file_ppb::format_option_number(void)
+srecord::input_file_ppb::format_option_number()
     const
 {
     return arglex_tool::token_ppb;
diff --git a/srecord/input/file/ppb.h b/srecord/input/file/ppb.h
index c0bc7f55..94f1f238 100644
--- a/srecord/input/file/ppb.h
+++ b/srecord/input/file/ppb.h
@@ -51,13 +51,13 @@ class input_file_ppb:
     bool read(class record &rec);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -112,13 +112,13 @@ class input_file_ppb:
       * the #packet and #packet_length and #packet_address and
       * #packet_used instance variables.
       */
-    bool get_packet(void);
+    bool get_packet();
 
     /**
       * The packet_format_error method is used to issue a #fatal_error
       * message when a packet is malformed.
       */
-    void packet_format_error(void);
+    void packet_format_error();
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/input/file/ppx.cc b/srecord/input/file/ppx.cc
index e10dbd0e..b0fb371c 100644
--- a/srecord/input/file/ppx.cc
+++ b/srecord/input/file/ppx.cc
@@ -49,7 +49,7 @@ srecord::input_file_ppx::create(const std::string &filename)
 
 
 void
-srecord::input_file_ppx::get_next_token(void)
+srecord::input_file_ppx::get_next_token()
 {
     for (;;)
     {
@@ -129,7 +129,7 @@ srecord::input_file_ppx::get_next_token(void)
 
 
 void
-srecord::input_file_ppx::syntax_error(void)
+srecord::input_file_ppx::syntax_error()
 {
     fatal_error("syntax error");
 }
@@ -311,7 +311,7 @@ srecord::input_file_ppx::read(record &result)
 
 
 const char *
-srecord::input_file_ppx::get_file_format_name(void)
+srecord::input_file_ppx::get_file_format_name()
     const
 {
     return "Stag Prom Programmer hexadecimal (PPX)";
@@ -319,7 +319,7 @@ srecord::input_file_ppx::get_file_format_name(void)
 
 
 int
-srecord::input_file_ppx::format_option_number(void)
+srecord::input_file_ppx::format_option_number()
     const
 {
     return arglex_tool::token_ppx;
diff --git a/srecord/input/file/ppx.h b/srecord/input/file/ppx.h
index c16fc37c..3d634aba 100644
--- a/srecord/input/file/ppx.h
+++ b/srecord/input/file/ppx.h
@@ -51,10 +51,10 @@ class input_file_ppx:
     bool read(class record &rec);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -102,7 +102,7 @@ class input_file_ppx:
       * It will set the #token_value instance variable for token_byte
       * and token_address
       */
-    void get_next_token(void);
+    void get_next_token();
 
     /**
       * The address instance variable is used to remember the current
@@ -123,7 +123,7 @@ class input_file_ppx:
       * The syntax_error method is a convenience wrapper around
       * #fatal_error to complain about syntax errors.
       */
-    void syntax_error(void);
+    void syntax_error();
 
     /**
       * The dsum instance variable is used to remember the simple sum of
diff --git a/srecord/input/file/signetics.cc b/srecord/input/file/signetics.cc
index 6d36ac57..b0c0a919 100644
--- a/srecord/input/file/signetics.cc
+++ b/srecord/input/file/signetics.cc
@@ -141,7 +141,7 @@ srecord::input_file_signetics::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_signetics::get_file_format_name(void)
+srecord::input_file_signetics::get_file_format_name()
     const
 {
     return "Signetics";
@@ -149,7 +149,7 @@ srecord::input_file_signetics::get_file_format_name(void)
 
 
 int
-srecord::input_file_signetics::format_option_number(void)
+srecord::input_file_signetics::format_option_number()
     const
 {
     return arglex_tool::token_signetics;
diff --git a/srecord/input/file/signetics.h b/srecord/input/file/signetics.h
index 6abaee08..f7089842 100644
--- a/srecord/input/file/signetics.h
+++ b/srecord/input/file/signetics.h
@@ -52,10 +52,10 @@ class input_file_signetics:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
     /**
       * See base class for documentation.  We over-ride this method
diff --git a/srecord/input/file/spasm.cc b/srecord/input/file/spasm.cc
index 0b45abe4..7147975d 100644
--- a/srecord/input/file/spasm.cc
+++ b/srecord/input/file/spasm.cc
@@ -104,7 +104,7 @@ srecord::input_file_spasm::read(record &result)
 
 
 const char *
-srecord::input_file_spasm::get_file_format_name(void)
+srecord::input_file_spasm::get_file_format_name()
     const
 {
     return
@@ -119,7 +119,7 @@ srecord::input_file_spasm::get_file_format_name(void)
 
 
 int
-srecord::input_file_spasm::format_option_number(void)
+srecord::input_file_spasm::format_option_number()
     const
 {
     return
diff --git a/srecord/input/file/spasm.h b/srecord/input/file/spasm.h
index 0b6ea841..b3b82e37 100644
--- a/srecord/input/file/spasm.h
+++ b/srecord/input/file/spasm.h
@@ -67,10 +67,10 @@ class input_file_spasm:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/spectrum.cc b/srecord/input/file/spectrum.cc
index e70df0e6..1883e971 100644
--- a/srecord/input/file/spectrum.cc
+++ b/srecord/input/file/spectrum.cc
@@ -186,7 +186,7 @@ srecord::input_file_spectrum::get_file_format_name ()
 
 
 int
-srecord::input_file_spectrum::format_option_number(void)
+srecord::input_file_spectrum::format_option_number()
     const
 {
     return arglex_tool::token_spectrum;
diff --git a/srecord/input/file/spectrum.h b/srecord/input/file/spectrum.h
index 4a15a992..d6e9b11b 100644
--- a/srecord/input/file/spectrum.h
+++ b/srecord/input/file/spectrum.h
@@ -52,10 +52,10 @@ class input_file_spectrum:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -88,13 +88,13 @@ class input_file_spectrum:
       * The get_decimal method is used to get a decimal number from
       * the input.  It must have at least one digit.
       */
-    int get_decimal(void);
+    int get_decimal();
 
     /**
       * The get_binary method is used to get a binary number from
       * the input.  It must have at least one digit.
       */
-    int get_binary(void);
+    int get_binary();
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/input/file/stewie.cc b/srecord/input/file/stewie.cc
index 2908dc74..13c61417 100644
--- a/srecord/input/file/stewie.cc
+++ b/srecord/input/file/stewie.cc
@@ -258,7 +258,7 @@ srecord::input_file_stewie::read(record &result)
 
 
 bool
-srecord::input_file_stewie::is_binary(void)
+srecord::input_file_stewie::is_binary()
     const
 {
     return true;
@@ -274,7 +274,7 @@ srecord::input_file_stewie::get_file_format_name()
 
 
 int
-srecord::input_file_stewie::format_option_number(void)
+srecord::input_file_stewie::format_option_number()
     const
 {
     return arglex_tool::token_stewie;
diff --git a/srecord/input/file/stewie.h b/srecord/input/file/stewie.h
index ed9337c7..c96eda74 100644
--- a/srecord/input/file/stewie.h
+++ b/srecord/input/file/stewie.h
@@ -53,16 +53,16 @@ class input_file_stewie:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     // See base class for documentation.
-    int get_byte(void);
+    int get_byte();
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/tektronix.cc b/srecord/input/file/tektronix.cc
index 469007a2..4e209197 100644
--- a/srecord/input/file/tektronix.cc
+++ b/srecord/input/file/tektronix.cc
@@ -47,7 +47,7 @@ srecord::input_file_tektronix::create(const std::string &a_file_name)
 
 
 int
-srecord::input_file_tektronix::get_nibble(void)
+srecord::input_file_tektronix::get_nibble()
 {
     int n = srecord::input_file::get_nibble();
     checksum_add(n);
@@ -56,7 +56,7 @@ srecord::input_file_tektronix::get_nibble(void)
 
 
 int
-srecord::input_file_tektronix::get_byte(void)
+srecord::input_file_tektronix::get_byte()
 {
     // this differs from the srecord::input_file method only in that we
     // don't add to the checksum.
@@ -208,7 +208,7 @@ srecord::input_file_tektronix::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_tektronix::get_file_format_name(void)
+srecord::input_file_tektronix::get_file_format_name()
     const
 {
     return "Tektronix (16-bit)";
@@ -216,7 +216,7 @@ srecord::input_file_tektronix::get_file_format_name(void)
 
 
 int
-srecord::input_file_tektronix::format_option_number(void)
+srecord::input_file_tektronix::format_option_number()
     const
 {
     return arglex_tool::token_tektronix;
diff --git a/srecord/input/file/tektronix.h b/srecord/input/file/tektronix.h
index e4eb3fbc..2fbb6675 100644
--- a/srecord/input/file/tektronix.h
+++ b/srecord/input/file/tektronix.h
@@ -52,10 +52,10 @@ class input_file_tektronix:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -71,14 +71,14 @@ class input_file_tektronix:
       * We override the one in the base class because the checksum is
       * nibble-based, not byte-based.
       */
-    int get_nibble(void);
+    int get_nibble();
 
     /**
       * The get_byte method gets a two hex-digit from input and assembles
       * them (big-endian) into a byte.  We override the one in the base
       * class because the checksum is nibble-based, not byte-based.
       */
-    int get_byte(void);
+    int get_byte();
 
     /**
       * The read_inner method is used to read a single record from
diff --git a/srecord/input/file/tektronix_extended.cc b/srecord/input/file/tektronix_extended.cc
index 5bdbb6e0..56b48649 100644
--- a/srecord/input/file/tektronix_extended.cc
+++ b/srecord/input/file/tektronix_extended.cc
@@ -46,7 +46,7 @@ srecord::input_file_tektronix_extended::create(const std::string &a_file_name)
 
 
 int
-srecord::input_file_tektronix_extended::get_nibble(void)
+srecord::input_file_tektronix_extended::get_nibble()
 {
     int n = inherited::get_nibble();
     nibble_sum += n;
@@ -241,7 +241,7 @@ srecord::input_file_tektronix_extended::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_tektronix_extended::get_file_format_name(void)
+srecord::input_file_tektronix_extended::get_file_format_name()
     const
 {
     return "Tektronix Extended";
@@ -249,7 +249,7 @@ srecord::input_file_tektronix_extended::get_file_format_name(void)
 
 
 int
-srecord::input_file_tektronix_extended::format_option_number(void)
+srecord::input_file_tektronix_extended::format_option_number()
     const
 {
     return arglex_tool::token_tektronix_extended;
diff --git a/srecord/input/file/tektronix_extended.h b/srecord/input/file/tektronix_extended.h
index 2dda12ee..018908c5 100644
--- a/srecord/input/file/tektronix_extended.h
+++ b/srecord/input/file/tektronix_extended.h
@@ -55,13 +55,13 @@ class input_file_tektronix_extended:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
     // See base class for documentation.
-    int get_nibble(void);
+    int get_nibble();
 
 private:
     /**
diff --git a/srecord/input/file/ti_tagged.cc b/srecord/input/file/ti_tagged.cc
index 2c0bcd9d..2d7f59c5 100644
--- a/srecord/input/file/ti_tagged.cc
+++ b/srecord/input/file/ti_tagged.cc
@@ -46,7 +46,7 @@ srecord::input_file_ti_tagged::create(const std::string &a_file_name)
 
 
 int
-srecord::input_file_ti_tagged::get_char(void)
+srecord::input_file_ti_tagged::get_char()
 {
     int c = inherited::get_char();
     if (c < 0 || c == '\n')
@@ -157,7 +157,7 @@ srecord::input_file_ti_tagged::read(record &result)
                 }
                 n -= 5;
                 int max = 250;
-                unsigned char *buffer = new unsigned char [max];
+                auto *buffer = new unsigned char [max];
                 for (int j = 0; j < n; ++j)
                 {
                     c = get_char();
@@ -178,7 +178,7 @@ srecord::input_file_ti_tagged::read(record &result)
 
 
 const char *
-srecord::input_file_ti_tagged::get_file_format_name(void)
+srecord::input_file_ti_tagged::get_file_format_name()
     const
 {
     return "Texas Instruments Tagged (SDSMAC)";
@@ -186,7 +186,7 @@ srecord::input_file_ti_tagged::get_file_format_name(void)
 
 
 int
-srecord::input_file_ti_tagged::format_option_number(void)
+srecord::input_file_ti_tagged::format_option_number()
     const
 {
     return arglex_tool::token_ti_tagged;
diff --git a/srecord/input/file/ti_tagged.h b/srecord/input/file/ti_tagged.h
index da5411a8..a39ce47a 100644
--- a/srecord/input/file/ti_tagged.h
+++ b/srecord/input/file/ti_tagged.h
@@ -52,10 +52,10 @@ class input_file_ti_tagged:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -71,9 +71,8 @@ class input_file_ti_tagged:
       * We override bacsie the checksum is character based, not byte
       * based.
       */
-    int get_char(void);
+    int get_char();
 
-private:
     typedef input_file inherited;
 
     /**
diff --git a/srecord/input/file/ti_tagged_16.cc b/srecord/input/file/ti_tagged_16.cc
index c63466cb..ea4b0510 100644
--- a/srecord/input/file/ti_tagged_16.cc
+++ b/srecord/input/file/ti_tagged_16.cc
@@ -46,7 +46,7 @@ srecord::input_file_ti_tagged_16::create(const std::string &a_file_name)
 
 
 int
-srecord::input_file_ti_tagged_16::get_char(void)
+srecord::input_file_ti_tagged_16::get_char()
 {
     int c = inherited::get_char();
     if (c < 0 || c == '\n')
@@ -157,7 +157,7 @@ srecord::input_file_ti_tagged_16::read(record &result)
                 }
                 n -= 5;
                 int max = 250;
-                unsigned char *buffer = new unsigned char [max];
+                auto *buffer = new unsigned char [max];
                 for (int j = 0; j < n; ++j)
                 {
                     c = get_char();
@@ -178,7 +178,7 @@ srecord::input_file_ti_tagged_16::read(record &result)
 
 
 const char *
-srecord::input_file_ti_tagged_16::get_file_format_name(void)
+srecord::input_file_ti_tagged_16::get_file_format_name()
     const
 {
     return "Texas Instruments SDSMAC (320)";
@@ -186,7 +186,7 @@ srecord::input_file_ti_tagged_16::get_file_format_name(void)
 
 
 int
-srecord::input_file_ti_tagged_16::format_option_number(void)
+srecord::input_file_ti_tagged_16::format_option_number()
     const
 {
     return arglex_tool::token_ti_tagged_16;
diff --git a/srecord/input/file/ti_tagged_16.h b/srecord/input/file/ti_tagged_16.h
index 950eaa8b..b0936e6d 100644
--- a/srecord/input/file/ti_tagged_16.h
+++ b/srecord/input/file/ti_tagged_16.h
@@ -52,17 +52,17 @@ class input_file_ti_tagged_16:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     /**
       * The get_char method is used to get a character from the input.
       * We override because the checksum is character based, not byte
       * based.
       */
-    int get_char(void);
+    int get_char();
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/ti_txt.cc b/srecord/input/file/ti_txt.cc
index 8822d2a1..48532778 100644
--- a/srecord/input/file/ti_txt.cc
+++ b/srecord/input/file/ti_txt.cc
@@ -47,7 +47,7 @@ srecord::input_file_ti_txt::create(const std::string &a_file_name)
 
 
 void
-srecord::input_file_ti_txt::get_next_token(void)
+srecord::input_file_ti_txt::get_next_token()
 {
     token_value = 0;
     for (;;)
@@ -193,7 +193,7 @@ srecord::input_file_ti_txt::read(record &result)
 
 
 const char *
-srecord::input_file_ti_txt::get_file_format_name(void)
+srecord::input_file_ti_txt::get_file_format_name()
     const
 {
     return "ti-txt (MSP430)";
@@ -201,7 +201,7 @@ srecord::input_file_ti_txt::get_file_format_name(void)
 
 
 int
-srecord::input_file_ti_txt::format_option_number(void)
+srecord::input_file_ti_txt::format_option_number()
     const
 {
     return arglex_tool::token_ti_txt;
diff --git a/srecord/input/file/ti_txt.h b/srecord/input/file/ti_txt.h
index 5f3e7323..cabbe21c 100644
--- a/srecord/input/file/ti_txt.h
+++ b/srecord/input/file/ti_txt.h
@@ -52,10 +52,10 @@ class input_file_ti_txt:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -119,7 +119,7 @@ class input_file_ti_txt:
       * the next symbol.  All the digits of a hexadecimal number are
       * considered a single symbol.
       */
-    void get_next_token(void);
+    void get_next_token();
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/input/file/trs80.cc b/srecord/input/file/trs80.cc
index cf19148d..24b14423 100644
--- a/srecord/input/file/trs80.cc
+++ b/srecord/input/file/trs80.cc
@@ -53,7 +53,7 @@ srecord::input_file_trs80::create(const std::string &a_file_name)
 
 
 int
-srecord::input_file_trs80::get_byte(void)
+srecord::input_file_trs80::get_byte()
 {
     int c = get_char();
     if (c < 0)
@@ -192,7 +192,7 @@ srecord::input_file_trs80::read(srecord::record &result)
 
 
 bool
-srecord::input_file_trs80::is_binary(void)
+srecord::input_file_trs80::is_binary()
     const
 {
     return true;
@@ -200,7 +200,7 @@ srecord::input_file_trs80::is_binary(void)
 
 
 const char *
-srecord::input_file_trs80::get_file_format_name(void)
+srecord::input_file_trs80::get_file_format_name()
     const
 {
     return "TRS80";
@@ -208,7 +208,7 @@ srecord::input_file_trs80::get_file_format_name(void)
 
 
 int
-srecord::input_file_trs80::format_option_number(void)
+srecord::input_file_trs80::format_option_number()
     const
 {
     return arglex_tool::token_trs80;
diff --git a/srecord/input/file/trs80.h b/srecord/input/file/trs80.h
index 0bbe452e..9f64b923 100644
--- a/srecord/input/file/trs80.h
+++ b/srecord/input/file/trs80.h
@@ -56,13 +56,13 @@ class input_file_trs80:
     bool read(record &result);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
@@ -91,7 +91,7 @@ class input_file_trs80:
       * update the checksum.  We over-ride the base implementation,
       * because we use raw bytes rather than two hex digits.
       */
-    int get_byte(void);
+    int get_byte();
 
     /**
       * The pending instance variable is used to remember the second
diff --git a/srecord/input/file/vmem.cc b/srecord/input/file/vmem.cc
index dc7b90ea..adc6c168 100644
--- a/srecord/input/file/vmem.cc
+++ b/srecord/input/file/vmem.cc
@@ -154,7 +154,7 @@ srecord::input_file_vmem::read(srecord::record &record)
 
 
 const char *
-srecord::input_file_vmem::get_file_format_name(void)
+srecord::input_file_vmem::get_file_format_name()
     const
 {
     return "Verilog VMEM";
@@ -162,7 +162,7 @@ srecord::input_file_vmem::get_file_format_name(void)
 
 
 int
-srecord::input_file_vmem::format_option_number(void)
+srecord::input_file_vmem::format_option_number()
     const
 {
     return arglex_tool::token_vmem;
diff --git a/srecord/input/file/vmem.h b/srecord/input/file/vmem.h
index d11191aa..e9bba765 100644
--- a/srecord/input/file/vmem.h
+++ b/srecord/input/file/vmem.h
@@ -52,10 +52,10 @@ class input_file_vmem:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
 private:
     /**
diff --git a/srecord/input/file/wilson.cc b/srecord/input/file/wilson.cc
index 33b53fc6..00a222e2 100644
--- a/srecord/input/file/wilson.cc
+++ b/srecord/input/file/wilson.cc
@@ -43,7 +43,7 @@ srecord::input_file_wilson::create(const std::string &a_file_name)
 
 
 int
-srecord::input_file_wilson::get_byte(void)
+srecord::input_file_wilson::get_byte()
 {
     int n = -1;
     int c = get_char();
@@ -212,7 +212,7 @@ srecord::input_file_wilson::read(record &record)
 
 
 bool
-srecord::input_file_wilson::is_binary(void)
+srecord::input_file_wilson::is_binary()
     const
 {
     return true;
@@ -220,7 +220,7 @@ srecord::input_file_wilson::is_binary(void)
 
 
 const char *
-srecord::input_file_wilson::get_file_format_name(void)
+srecord::input_file_wilson::get_file_format_name()
     const
 {
     return "Wilson (anyone know this format's real name?)";
@@ -228,7 +228,7 @@ srecord::input_file_wilson::get_file_format_name(void)
 
 
 int
-srecord::input_file_wilson::format_option_number(void)
+srecord::input_file_wilson::format_option_number()
     const
 {
     return arglex_tool::token_wilson;
diff --git a/srecord/input/file/wilson.h b/srecord/input/file/wilson.h
index 27ded24f..0a58e3b9 100644
--- a/srecord/input/file/wilson.h
+++ b/srecord/input/file/wilson.h
@@ -54,20 +54,20 @@ class input_file_wilson:
     bool read(record &record);
 
     // See base class for documentation.
-    const char *get_file_format_name(void) const;
+    const char *get_file_format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
     // See base class for documentation.
-    int format_option_number(void) const;
+    int format_option_number() const;
 
     /**
       * The get_byte method is used to get a byte of input.  We override
       * because the byte encoding is one character of input sometimes,
       * and two characters of input at other times.
       */
-    virtual int get_byte(void);
+    virtual int get_byte();
 
 private:
     /**
@@ -78,7 +78,6 @@ class input_file_wilson:
       */
     input_file_wilson(const std::string &file_name);
 
-private:
     /**
       * The read_inner method is used to read a record from the input.
       * The #read method is a wrapper around this method.
diff --git a/srecord/input/filter/checksum.h b/srecord/input/filter/checksum.h
index a897e9e4..c3dad8ad 100644
--- a/srecord/input/filter/checksum.h
+++ b/srecord/input/filter/checksum.h
@@ -103,7 +103,7 @@ class input_filter_checksum:
       * The calculate method is used to calculate the checksum to be
       * written into the output, based on the "sum" instance variable.
       */
-    virtual sum_t calculate(void) = 0;
+    virtual sum_t calculate() = 0;
 
     /**
       * The generate method is used to generate the final data record,
diff --git a/srecord/input/filter/message.cc b/srecord/input/filter/message.cc
index 3e7f8b40..a1c3c9ef 100644
--- a/srecord/input/filter/message.cc
+++ b/srecord/input/filter/message.cc
@@ -40,7 +40,7 @@ srecord::input_filter_message::input_filter_message(
 
 
 unsigned
-srecord::input_filter_message::get_minimum_alignment(void)
+srecord::input_filter_message::get_minimum_alignment()
     const
 {
     return 0;
diff --git a/srecord/input/filter/message.h b/srecord/input/filter/message.h
index 850f7f36..37629893 100644
--- a/srecord/input/filter/message.h
+++ b/srecord/input/filter/message.h
@@ -78,7 +78,7 @@ class input_filter_message:
       * The get_minimum_alignment method is used to obtain the minimum
       * require dbyte alignment.  Returns 0 if irrelevant.
       */
-    virtual unsigned get_minimum_alignment(void) const;
+    virtual unsigned get_minimum_alignment() const;
 
 private:
     /**
diff --git a/srecord/input/filter/message/gcrypt.h b/srecord/input/filter/message/gcrypt.h
index d56f6642..19d6e8c8 100644
--- a/srecord/input/filter/message/gcrypt.h
+++ b/srecord/input/filter/message/gcrypt.h
@@ -60,7 +60,7 @@ class input_filter_message_gcrypt:
     input_filter_message_gcrypt(const input::pointer &deeper,
         unsigned long address, int algo, bool hmac);
 
-private:
+
     /**
       * The create class method is used to create a new dynamically
       * allocated instance of this class.
diff --git a/srecord/input/filter/message/stm32.cc b/srecord/input/filter/message/stm32.cc
index 84bd02e0..a1d49257 100644
--- a/srecord/input/filter/message/stm32.cc
+++ b/srecord/input/filter/message/stm32.cc
@@ -88,7 +88,7 @@ srecord::input_filter_message_stm32::process(const memory &input,
 
 
 const char *
-srecord::input_filter_message_stm32::get_algorithm_name(void)
+srecord::input_filter_message_stm32::get_algorithm_name()
     const
 {
     return "STM32";
@@ -96,7 +96,7 @@ srecord::input_filter_message_stm32::get_algorithm_name(void)
 
 
 unsigned
-srecord::input_filter_message_stm32::get_minimum_alignment(void)
+srecord::input_filter_message_stm32::get_minimum_alignment()
     const
 {
     return 4;
diff --git a/srecord/input/filter/message/stm32.h b/srecord/input/filter/message/stm32.h
index c2b56139..30cf295f 100644
--- a/srecord/input/filter/message/stm32.h
+++ b/srecord/input/filter/message/stm32.h
@@ -86,10 +86,10 @@ class input_filter_message_stm32:
     void process(const memory &input, record &output);
 
     // See base class for documentation.
-    const char *get_algorithm_name(void) const;
+    const char *get_algorithm_name() const;
 
     // See base class for documentation.
-    unsigned get_minimum_alignment(void) const;
+    unsigned get_minimum_alignment() const;
 
 private:
     /**
diff --git a/srecord/input/generator.cc b/srecord/input/generator.cc
index 60f77a8d..6a289687 100644
--- a/srecord/input/generator.cc
+++ b/srecord/input/generator.cc
@@ -112,7 +112,7 @@ srecord::input_generator::create(srecord::arglex_tool *cmdln)
                     length
                 );
             }
-            unsigned long over = (1uL << (8u * length)) - 1;
+            unsigned long over = (1UL << (8U * length)) - 1;
             if (length < 4 && datum > over)
             {
                 cmdln->fatal_error
@@ -152,7 +152,7 @@ srecord::input_generator::create(srecord::arglex_tool *cmdln)
                     length
                 );
             }
-            unsigned long over = (1uL << (8u * length)) - 1;
+            unsigned long over = (1UL << (8U * length)) - 1;
             if (length < 4 && datum > over)
             {
                 cmdln->fatal_error
@@ -199,7 +199,7 @@ srecord::input_generator::create(srecord::arglex_tool *cmdln)
             cmdln->token_next();
             size_t length = 0;
             size_t maxlen = 16;
-            unsigned char *data = new unsigned char [maxlen];
+            auto *data = new unsigned char [maxlen];
             for (;;)
             {
                 //
@@ -214,7 +214,7 @@ srecord::input_generator::create(srecord::arglex_tool *cmdln)
                 if (length >= maxlen)
                 {
                     size_t new_maxlen = maxlen * 2 + 16;
-                    unsigned char *new_data = new unsigned char [new_maxlen];
+                    auto *new_data = new unsigned char [new_maxlen];
                     memcpy(new_data, data, length);
                     delete [] data;
                     data = new_data;
diff --git a/srecord/input/generator/repeat.cc b/srecord/input/generator/repeat.cc
index 8999458d..c9e2205e 100644
--- a/srecord/input/generator/repeat.cc
+++ b/srecord/input/generator/repeat.cc
@@ -27,7 +27,7 @@ srecord::input_generator_repeat::~input_generator_repeat()
 
 
 srecord::input_generator_repeat::input_generator_repeat(
-        const interval &a_range, unsigned char *a_data, size_t a_length) :
+        const interval &a_range, const unsigned char *a_data, size_t a_length) :
     srecord::input_generator(a_range),
     address(a_range.get_lowest()),
     data(0),
diff --git a/srecord/input/generator/repeat.h b/srecord/input/generator/repeat.h
index b0e14102..af31e01c 100644
--- a/srecord/input/generator/repeat.h
+++ b/srecord/input/generator/repeat.h
@@ -49,7 +49,7 @@ class input_generator_repeat:
       * @param length
       *     The length of the array of data to be repeated.
       */
-    input_generator_repeat(const interval &range, unsigned char *data,
+    input_generator_repeat(const interval &range, const unsigned char *data,
         size_t length);
 
 public:
diff --git a/srecord/interval.cc b/srecord/interval.cc
index 277864fb..1f7c90db 100644
--- a/srecord/interval.cc
+++ b/srecord/interval.cc
@@ -287,7 +287,7 @@ srecord::interval::append(data_t datum)
     if (length >= size)
     {
         size = size * 2 + 8;
-        data_t *tmp = new data_t[size + 1];
+        auto *tmp = new data_t[size + 1];
         if (data)
         {
             for (size_t k = 0; k < length; ++k)
diff --git a/srecord/interval.h b/srecord/interval.h
index 51426995..5602e8b8 100644
--- a/srecord/interval.h
+++ b/srecord/interval.h
@@ -21,7 +21,7 @@
 #define SRECORD_INTERVAL_H
 
 #include <cstddef>
-#include <stdint.h>
+#include <cstdint>
 #include <iostream>
 
 namespace srecord
diff --git a/srecord/interval/flatten.cc b/srecord/interval/flatten.cc
index 6b97940b..238a7ed8 100644
--- a/srecord/interval/flatten.cc
+++ b/srecord/interval/flatten.cc
@@ -26,5 +26,5 @@ srecord::interval::flatten()
 {
     if (length <= 2)
         return *this;
-    return interval(get_lowest(), get_highest());
+    return {get_lowest(), get_highest()};
 }
diff --git a/srecord/memory.cc b/srecord/memory.cc
index 29cbdcd3..293b9c32 100644
--- a/srecord/memory.cc
+++ b/srecord/memory.cc
@@ -72,7 +72,7 @@ srecord::memory::~memory()
 
 
 void
-srecord::memory::clear(void)
+srecord::memory::clear()
 {
     delete header;
     header = 0;
@@ -80,8 +80,7 @@ srecord::memory::clear(void)
     execution_start_address = 0;
     for (int j = 0; j < nchunks; ++j)
         delete chunk[j];
-    if (chunk)
-        delete [] chunk;
+    delete [] chunk;
     nchunks = 0;
     nchunks_max = 0;
     chunk = 0;
@@ -154,8 +153,7 @@ srecord::memory::find(unsigned long address)
     if (nchunks >= nchunks_max)
     {
         nchunks_max = nchunks_max * 2 + 4;
-        srecord::memory_chunk **tmp =
-            new srecord::memory_chunk * [nchunks_max];
+        auto **tmp = new srecord::memory_chunk * [nchunks_max];
         for (int j = 0; j < nchunks; ++j)
             tmp[j] = chunk[j];
         delete [] chunk;
@@ -247,7 +245,7 @@ srecord::memory::get_lower_bound()
 
 
 unsigned long
-srecord::memory::get_upper_bound(void)
+srecord::memory::get_upper_bound()
     const
 {
     if (nchunks == 0)
@@ -445,7 +443,7 @@ srecord::memory::find_next_data(unsigned long &address, void *data,
 
 
 srecord::record *
-srecord::memory::get_header(void)
+srecord::memory::get_header()
     const
 {
     return header;
@@ -474,7 +472,7 @@ srecord::memory::set_header(const std::string &text)
 
 
 srecord::record *
-srecord::memory::get_execution_start_address(void)
+srecord::memory::get_execution_start_address()
     const
 {
     return execution_start_address;
@@ -497,7 +495,7 @@ srecord::memory::set_execution_start_address(unsigned long addr)
 
 
 bool
-srecord::memory::has_holes(void)
+srecord::memory::has_holes()
     const
 {
     srecord::memory_walker_continuity::pointer sniffer =
diff --git a/srecord/memory.h b/srecord/memory.h
index f5568551..bbb9c5ea 100644
--- a/srecord/memory.h
+++ b/srecord/memory.h
@@ -157,7 +157,7 @@ class memory
       * header record set by either the reader() or set_header()
       * methods.  If neither has set a header, a NULL is returned.
       */
-    record *get_header(void) const;
+    record *get_header() const;
 
     /**
       * The set_header method may be used to set the header command.
@@ -175,7 +175,7 @@ class memory
       * reader() or set_execution_start_address() methods.  If neither
       * has set an execution start address, NULL is returned.
       */
-    record *get_execution_start_address(void) const;
+    record *get_execution_start_address() const;
 
     /**
       * The set_execution_start_address method may be used to set the
@@ -192,7 +192,7 @@ class memory
       *     one hole), false if the memory data is continuous (has no
       *     holes).
       */
-    bool has_holes(void) const;
+    bool has_holes() const;
 
     /**
       * The get_lower_bound method is used to obtain the lower bound
@@ -225,7 +225,7 @@ class memory
       * image has no data in it.
       */
     bool
-    empty(void)
+    empty()
         const
     {
         return (nchunks == 0);
@@ -301,7 +301,7 @@ class memory
       * The clear method is used to discard all data, as if when
       * the instance was first constructed. Also used by the destructor.
       */
-    void clear(void);
+    void clear();
 
     /**
       * The copy method is used to copy the chunks from the `src' into
diff --git a/srecord/memory/chunk.h b/srecord/memory/chunk.h
index 4f0cb367..c3821d87 100644
--- a/srecord/memory/chunk.h
+++ b/srecord/memory/chunk.h
@@ -19,7 +19,7 @@
 #ifndef SRECORD_MEMORY_CHUNK_H
 #define SRECORD_MEMORY_CHUNK_H
 
-#include <stddef.h>
+#include <cstddef>
 
 #include <srecord/memory/walker.h>
 
diff --git a/srecord/memory/walker.cc b/srecord/memory/walker.cc
index 789eb828..536d9887 100644
--- a/srecord/memory/walker.cc
+++ b/srecord/memory/walker.cc
@@ -53,7 +53,7 @@ srecord::memory_walker::observe_start_address(const srecord::record *)
 
 
 void
-srecord::memory_walker::observe_end(void)
+srecord::memory_walker::observe_end()
 {
     // Do nothing.
 }
diff --git a/srecord/memory/walker.h b/srecord/memory/walker.h
index a3a57e9f..e77c1a46 100644
--- a/srecord/memory/walker.h
+++ b/srecord/memory/walker.h
@@ -59,7 +59,7 @@ class memory_walker
       * The observe_end method is called once all of the data blocks
       * have been passed to the observer via the observe() method.
       */
-    virtual void observe_end(void);
+    virtual void observe_end();
 
     /**
       * The notify_upper_bound method is used to notify the walker of
diff --git a/srecord/memory/walker/alignment.cc b/srecord/memory/walker/alignment.cc
index 740b23f0..ea0f42cc 100644
--- a/srecord/memory/walker/alignment.cc
+++ b/srecord/memory/walker/alignment.cc
@@ -44,7 +44,7 @@ srecord::memory_walker_alignment::create(unsigned a_multiple)
 
 
 bool
-srecord::memory_walker_alignment::is_well_aligned(void)
+srecord::memory_walker_alignment::is_well_aligned()
     const
 {
     return well_aligned;
@@ -75,7 +75,7 @@ srecord::memory_walker_alignment::observe(unsigned long address, const void *,
 
 
 void
-srecord::memory_walker_alignment::observe_end(void)
+srecord::memory_walker_alignment::observe_end()
 {
     // Check last end.
     if (data_seen && current_address % multiple != 0)
diff --git a/srecord/memory/walker/alignment.h b/srecord/memory/walker/alignment.h
index de377d46..00935c7b 100644
--- a/srecord/memory/walker/alignment.h
+++ b/srecord/memory/walker/alignment.h
@@ -56,14 +56,14 @@ class memory_walker_alignment:
       * @returns
       *     true if the data has no holes, false if there are holes
       */
-    bool is_well_aligned(void) const;
+    bool is_well_aligned() const;
 
 protected:
     // See base class for documentation.
     void observe(unsigned long, const void *, int);
 
     // See base class for documentation.
-    void observe_end(void);
+    void observe_end();
 
 private:
     /**
diff --git a/srecord/memory/walker/compare.cc b/srecord/memory/walker/compare.cc
index 688a3a0e..228aafc6 100644
--- a/srecord/memory/walker/compare.cc
+++ b/srecord/memory/walker/compare.cc
@@ -51,7 +51,7 @@ srecord::memory_walker_compare::observe(unsigned long addr, const void *p,
     interval wrongTemp;
     interval unsetTemp;
 
-    unsigned char *data = (unsigned char *)p;
+    auto *data = (unsigned char *)p;
     for (int j = 0; j < len; ++j)
     {
         if (other.set_p(addr + j))
diff --git a/srecord/memory/walker/fletcher16.cc b/srecord/memory/walker/fletcher16.cc
index b21d61d5..a355dde6 100644
--- a/srecord/memory/walker/fletcher16.cc
+++ b/srecord/memory/walker/fletcher16.cc
@@ -54,7 +54,7 @@ srecord::memory_walker_fletcher16::observe(unsigned long, const void *data,
 
 
 unsigned
-srecord::memory_walker_fletcher16::get(void)
+srecord::memory_walker_fletcher16::get()
     const
 {
     return checksum.get();
diff --git a/srecord/memory/walker/fletcher16.h b/srecord/memory/walker/fletcher16.h
index e8a4533b..dc16d632 100644
--- a/srecord/memory/walker/fletcher16.h
+++ b/srecord/memory/walker/fletcher16.h
@@ -86,7 +86,7 @@ class memory_walker_fletcher16:
       * The get method is used to get the Fletcher-16 checksum once all memory
       * chunks have been processed by calls to our #observe method.
       */
-    unsigned get(void) const;
+    unsigned get() const;
 
 protected:
     // See base class for documentation.
diff --git a/srecord/memory/walker/stm32.cc b/srecord/memory/walker/stm32.cc
index 242553a7..d4b3bf21 100644
--- a/srecord/memory/walker/stm32.cc
+++ b/srecord/memory/walker/stm32.cc
@@ -44,7 +44,7 @@ srecord::memory_walker_stm32::memory_walker_stm32()
 
 
 srecord::memory_walker_stm32::pointer
-srecord::memory_walker_stm32::create(void)
+srecord::memory_walker_stm32::create()
 {
     return pointer(new srecord::memory_walker_stm32());
 }
@@ -59,7 +59,7 @@ srecord::memory_walker_stm32::observe(unsigned long, const void *data,
 
 
 unsigned
-srecord::memory_walker_stm32::get(void)
+srecord::memory_walker_stm32::get()
     const
 {
     return checksum.get();
diff --git a/srecord/memory/walker/stm32.h b/srecord/memory/walker/stm32.h
index bbded68e..70b83017 100644
--- a/srecord/memory/walker/stm32.h
+++ b/srecord/memory/walker/stm32.h
@@ -57,14 +57,14 @@ class memory_walker_stm32:
       * The create class method is used to create new dynamically
       * allocated instances of this class.
       */
-    static pointer create(void);
+    static pointer create();
 
     /**
       * The get method is used to get the CRC32 (STM32) checksum once
       * all memory chunks have been processed by calls to our observe
       * method.
       */
-    unsigned get(void) const;
+    unsigned get() const;
 
 protected:
     // See base class for documentation.
diff --git a/srecord/output.cc b/srecord/output.cc
index 31d064a4..e0ef1e58 100644
--- a/srecord/output.cc
+++ b/srecord/output.cc
@@ -140,8 +140,7 @@ void
 srecord::output::write_data(unsigned long address, const void *data,
     size_t length)
 {
-    const srecord::record::data_t *data_p =
-        (const srecord::record::data_t *)data;
+    const auto *data_p = (const srecord::record::data_t *)data;
     size_t block_size = preferred_block_size_get();
     while (length > 0)
     {
diff --git a/srecord/output.h b/srecord/output.h
index cd6ed692..03ffb7f5 100644
--- a/srecord/output.h
+++ b/srecord/output.h
@@ -105,7 +105,7 @@ class output
       * always, influenced by the line_length_set method.  Derived
       * classes must implement this method.
       */
-    virtual int preferred_block_size_get(void) const = 0;
+    virtual int preferred_block_size_get() const = 0;
 
     /**
       * The preferred_block_size_set method is to set a specific
@@ -172,13 +172,13 @@ class output
       * output file.  It is used for the various error messages.
       * Derived classes must implement this method.
       */
-    virtual const std::string filename(void) const = 0;
+    virtual std::string filename() const = 0;
 
     /**
       * The format_name method is used to obtain the name of this output
       * format.
       */
-    virtual const char *format_name(void) const = 0;
+    virtual const char *format_name() const = 0;
 
     /**
       * The notify_upper_bound method is used to notify the output class
diff --git a/srecord/output/file.cc b/srecord/output/file.cc
index 6171c81d..d4ea6601 100644
--- a/srecord/output/file.cc
+++ b/srecord/output/file.cc
@@ -88,7 +88,7 @@ srecord::output_file::output_file(const std::string &a_file_name) :
 
 
 bool
-srecord::output_file::is_binary(void)
+srecord::output_file::is_binary()
     const
 {
     return false;
@@ -96,7 +96,7 @@ srecord::output_file::is_binary(void)
 
 
 void *
-srecord::output_file::get_fp(void)
+srecord::output_file::get_fp()
 {
     if (!vfp)
     {
@@ -126,7 +126,7 @@ srecord::output_file::get_fp(void)
 }
 
 
-const std::string
+std::string
 srecord::output_file::filename()
     const
 {
@@ -262,21 +262,21 @@ srecord::output_file::put_4bytes_le(unsigned long n)
 
 
 int
-srecord::output_file::checksum_get(void)
+srecord::output_file::checksum_get() const
 {
     return (checksum & 0xFF);
 }
 
 
 int
-srecord::output_file::checksum_get16(void)
+srecord::output_file::checksum_get16() const
 {
     return (checksum & 0xFFFF);
 }
 
 
 void
-srecord::output_file::checksum_reset(void)
+srecord::output_file::checksum_reset()
 {
     checksum = 0;
 }
@@ -311,7 +311,7 @@ srecord::output_file::seek_to(unsigned long address)
     errno = 0;
     if (fseek(fp, address, 0) < 0)
     {
-        if (errno == EINVAL && address >= 0x80000000uL)
+        if (errno == EINVAL && address >= 0x80000000UL)
         {
             warning
             (
@@ -322,7 +322,7 @@ srecord::output_file::seek_to(unsigned long address)
                 "to create a %3.1fGB file.  See the manual for a "
                 "description of the --offset filter, remembering that "
                 "you can give negative offsets.",
-                ((double)address / (double)(1uL << 30))
+                ((double)address / (double)(1UL << 30))
             );
         }
         fatal_error_errno("seek 0x%lX", address);
@@ -428,7 +428,7 @@ srecord::output_file::enable_by_name(const std::string &name, bool yesno)
 
 
 void
-srecord::output_file::set_is_regular(void)
+srecord::output_file::set_is_regular()
 {
     FILE *fp = (FILE *)vfp;
     struct stat st;
@@ -500,9 +500,9 @@ srecord::output_file::data_address_too_large(const srecord::record &record,
             prec,
             hi,
             prec,
-            0uL,
+            0UL,
             prec,
-            (1uL << nbits) - 1
+            (1UL << nbits) - 1
         );
     }
     fatal_error("data address (0x%lX..0x%lX) too large", lo, hi);
diff --git a/srecord/output/file.h b/srecord/output/file.h
index 44de6bd7..532db996 100644
--- a/srecord/output/file.h
+++ b/srecord/output/file.h
@@ -55,7 +55,7 @@ class output_file:
     output_file(const std::string &file_name);
 
     // See base class for documentation.
-    virtual const std::string filename(void) const;
+    virtual std::string filename() const;
 
     /**
       * The enable_header class method is used to enable or disable
@@ -206,7 +206,7 @@ class output_file:
       * The checksum_reset method is used to set the running checksum to
       * zero.
       */
-    void checksum_reset(void);
+    void checksum_reset();
 
     /**
       * The checksum_add method is used to add another 8-bit value to
@@ -224,7 +224,7 @@ class output_file:
       * called by the #put_byte method).  Only the lower 8 bits of the
       * sum are returned.
       */
-    int checksum_get(void);
+    int checksum_get() const;
 
     /**
       * The checksum_get16 method is used to get the current value of
@@ -232,7 +232,7 @@ class output_file:
       * usually called by the #put_byte method).  Only the lower 16
       * bits of the sum are returned.
       */
-    int checksum_get16(void);
+    int checksum_get16() const;
 
     /**
       * The seek_to method is used to move the output position to the
@@ -331,7 +331,7 @@ class output_file:
       * The line_termination_guess class method is used to figure out
       * the line termination style of the host environment.
       */
-    static line_termination_t line_termination_guess(void);
+    static line_termination_t line_termination_guess();
 
 private:
     /**
@@ -417,7 +417,7 @@ class output_file:
       * to establish whether the output file is a regular file or a
       * special file (like a pipe).
       */
-    void set_is_regular(void);
+    void set_is_regular();
 
     /**
       * The get_fp method is used to get the stdio file pointer
@@ -428,14 +428,14 @@ class output_file:
       * If the file has not been opened yet, it will be opened by this
       * method.
       */
-    void *get_fp(void);
+    void *get_fp();
 
     /**
       * The is_binary method is used to to determine whether or not
       * a file format is binary (true) of text (false).  The default
       * implementation always returns false (text).
       */
-    virtual bool is_binary(void) const;
+    virtual bool is_binary() const;
 
     /**
       * The copy constructor.  Do not use.
diff --git a/srecord/output/file/aomf.cc b/srecord/output/file/aomf.cc
index 7a5f3b4f..4bbac9b2 100644
--- a/srecord/output/file/aomf.cc
+++ b/srecord/output/file/aomf.cc
@@ -84,7 +84,7 @@ srecord::output_file_aomf::content_record(unsigned long address,
     const unsigned char *data, size_t len)
 {
     const size_t maxlen = 4 * srecord::record::max_data_length;
-    auto buffer = new unsigned char[maxlen + 3];
+    auto *buffer = new unsigned char[maxlen + 3];
 
     while (len > 0)
     {
diff --git a/srecord/output/file/aomf.h b/srecord/output/file/aomf.h
index a8b49e99..bc6700c2 100644
--- a/srecord/output/file/aomf.h
+++ b/srecord/output/file/aomf.h
@@ -67,7 +67,7 @@ class output_file_aomf:
     bool preferred_block_size_set(int nbytes);
 
     // See base class for documentation.
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     void line_length_set(int);
@@ -76,7 +76,7 @@ class output_file_aomf:
     void address_length_set(int);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
 private:
     /**
diff --git a/srecord/output/file/binary.cc b/srecord/output/file/binary.cc
index 98a3b36e..8cba5003 100644
--- a/srecord/output/file/binary.cc
+++ b/srecord/output/file/binary.cc
@@ -103,7 +103,7 @@ srecord::output_file_binary::format_name()
 
 
 bool
-srecord::output_file_binary::is_binary(void)
+srecord::output_file_binary::is_binary()
     const
 {
     return true;
diff --git a/srecord/output/file/binary.h b/srecord/output/file/binary.h
index 5e55d64b..d9848588 100644
--- a/srecord/output/file/binary.h
+++ b/srecord/output/file/binary.h
@@ -78,7 +78,7 @@ class output_file_binary:
     const char *format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
 private:
     /**
diff --git a/srecord/output/file/c.cc b/srecord/output/file/c.cc
index aa1093db..b40a967d 100644
--- a/srecord/output/file/c.cc
+++ b/srecord/output/file/c.cc
@@ -637,7 +637,7 @@ srecord::output_file_c::emit_word(unsigned int n)
 
 
 std::string
-srecord::output_file_c::format_address(unsigned long addr)
+srecord::output_file_c::format_address(unsigned long addr) const
 {
     char buffer[30];
     if (hex_style)
diff --git a/srecord/output/file/c.h b/srecord/output/file/c.h
index 8b7ca2b1..faab28fe 100644
--- a/srecord/output/file/c.h
+++ b/srecord/output/file/c.h
@@ -213,7 +213,7 @@ class output_file_c:
       * @param addr
       *     The address to be formatted
       */
-    std::string format_address(unsigned long addr);
+    std::string format_address(unsigned long addr) const;
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/output/file/coe.cc b/srecord/output/file/coe.cc
index 402e410b..743269ac 100644
--- a/srecord/output/file/coe.cc
+++ b/srecord/output/file/coe.cc
@@ -114,7 +114,7 @@ srecord::output_file_coe::notify_upper_bound(unsigned long addr)
 
 
 void
-srecord::output_file_coe::emit_header(void)
+srecord::output_file_coe::emit_header()
 {
     if (header_done)
         return;
@@ -279,7 +279,7 @@ srecord::output_file_coe::preferred_block_size_set(int nbytes)
 
 
 int
-srecord::output_file_coe::preferred_block_size_get(void)
+srecord::output_file_coe::preferred_block_size_get()
     const
 {
     return pref_blk_sz;
@@ -287,7 +287,7 @@ srecord::output_file_coe::preferred_block_size_get(void)
 
 
 const char *
-srecord::output_file_coe::format_name(void)
+srecord::output_file_coe::format_name()
     const
 {
     return "Coefficient (.COE) Files (Xilinx)";
diff --git a/srecord/output/file/coe.h b/srecord/output/file/coe.h
index 3086833a..b94c56c3 100644
--- a/srecord/output/file/coe.h
+++ b/srecord/output/file/coe.h
@@ -69,7 +69,7 @@ class output_file_coe:
     void address_length_set(int);
 
     // See base class for documentation
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
@@ -78,7 +78,7 @@ class output_file_coe:
     void command_line(arglex_tool *cmdln);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
     // See base class for documentation.
     void notify_upper_bound(unsigned long addr);
@@ -138,7 +138,7 @@ class output_file_coe:
       * The emit_header method is used to emit the file header,
       * if necessary.
       */
-    void emit_header(void);
+    void emit_header();
 
     /**
       * The GotData instance variable is used to remember whether or not
diff --git a/srecord/output/file/cosmac.cc b/srecord/output/file/cosmac.cc
index cac654d8..dd1803f7 100644
--- a/srecord/output/file/cosmac.cc
+++ b/srecord/output/file/cosmac.cc
@@ -57,9 +57,9 @@ srecord::output_file_cosmac::write(const srecord::record &record)
         break;
 
     case srecord::record::type_data:
-        if (record.get_address() >= (1uL << 24) && address_length < 8)
+        if (record.get_address() >= (1UL << 24) && address_length < 8)
             address_length = 8;
-        else if (record.get_address() >= (1uL << 16) && address_length < 6)
+        else if (record.get_address() >= (1UL << 16) && address_length < 6)
             address_length = 6;
 
         if (header_required)
diff --git a/srecord/output/file/dec_binary.cc b/srecord/output/file/dec_binary.cc
index c3005194..8c3950c8 100644
--- a/srecord/output/file/dec_binary.cc
+++ b/srecord/output/file/dec_binary.cc
@@ -192,7 +192,7 @@ srecord::output_file_dec_binary::format_name()
 
 
 bool
-srecord::output_file_dec_binary::is_binary(void)
+srecord::output_file_dec_binary::is_binary()
     const
 {
     return true;
diff --git a/srecord/output/file/dec_binary.h b/srecord/output/file/dec_binary.h
index 5bab6a6a..fd680f3d 100644
--- a/srecord/output/file/dec_binary.h
+++ b/srecord/output/file/dec_binary.h
@@ -80,7 +80,7 @@ class output_file_dec_binary:
     const char *format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
 private:
     /**
diff --git a/srecord/output/file/fairchild.cc b/srecord/output/file/fairchild.cc
index 3872d9de..c00ce243 100644
--- a/srecord/output/file/fairchild.cc
+++ b/srecord/output/file/fairchild.cc
@@ -30,7 +30,7 @@ srecord::output_file_fairchild::output_file_fairchild(
     const std::string &a_file_name
 ) :
     srecord::output_file(a_file_name),
-    address(~0uL)
+    address(~0UL)
 {
 }
 
diff --git a/srecord/output/file/fastload.cc b/srecord/output/file/fastload.cc
index 8637e1f4..40891c19 100644
--- a/srecord/output/file/fastload.cc
+++ b/srecord/output/file/fastload.cc
@@ -43,7 +43,7 @@ srecord::output_file_fastload::output_file_fastload(
 ) :
     srecord::output_file(a_filename),
     line_length(0),
-    address(~0uL),
+    address(~0UL),
     column(0),
     bytes_since_checksum(0),
     max_since_checksum(0),
diff --git a/srecord/output/file/formatted_binary.cc b/srecord/output/file/formatted_binary.cc
index a7db1667..3349b40e 100644
--- a/srecord/output/file/formatted_binary.cc
+++ b/srecord/output/file/formatted_binary.cc
@@ -72,7 +72,7 @@ srecord::output_file_formatted_binary::write(const srecord::record &record)
         // assert(upper bound != 0);
         if (upper_bound == 0)
             fatal_error("must call srecord::output::notify_upper_bound first");
-        if (upper_bound < (1uL << 16))
+        if (upper_bound < (1UL << 16))
         {
             put_char(0x08); //     *
             put_char(0x1C); //    ***
@@ -184,7 +184,7 @@ srecord::output_file_formatted_binary::format_name()
 
 
 bool
-srecord::output_file_formatted_binary::is_binary(void)
+srecord::output_file_formatted_binary::is_binary()
     const
 {
     return true;
diff --git a/srecord/output/file/formatted_binary.h b/srecord/output/file/formatted_binary.h
index df23d485..691a71e3 100644
--- a/srecord/output/file/formatted_binary.h
+++ b/srecord/output/file/formatted_binary.h
@@ -81,7 +81,7 @@ class output_file_formatted_binary:
     const char *format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
 private:
     /**
diff --git a/srecord/output/file/hexdump.cc b/srecord/output/file/hexdump.cc
index fe098d75..a5e25755 100644
--- a/srecord/output/file/hexdump.cc
+++ b/srecord/output/file/hexdump.cc
@@ -60,7 +60,7 @@ srecord::output_file_hexdump::command_line(srecord::arglex_tool *)
 
 
 void
-srecord::output_file_hexdump::row_cache_print(void)
+srecord::output_file_hexdump::row_cache_print()
 {
     if (row_cache_address == (unsigned long)(-1))
         return;
@@ -162,7 +162,7 @@ srecord::output_file_hexdump::write(const srecord::record &record)
 
 
 int
-srecord::output_file_hexdump::columns_to_line_length(int cols)
+srecord::output_file_hexdump::columns_to_line_length(int cols) const
 {
     // 0000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  #................
     //      ^  ^  ^  ^  ^  ^  ^  ^  ^  ^  ^  ^  ^  ^  ^  ^  ^^
@@ -206,7 +206,7 @@ srecord::output_file_hexdump::address_length_set(int)
 
 
 int
-srecord::output_file_hexdump::preferred_block_size_get(void)
+srecord::output_file_hexdump::preferred_block_size_get()
     const
 {
     //
@@ -217,7 +217,7 @@ srecord::output_file_hexdump::preferred_block_size_get(void)
 
 
 const char *
-srecord::output_file_hexdump::format_name(void)
+srecord::output_file_hexdump::format_name()
     const
 {
     return "hexdump";
diff --git a/srecord/output/file/hexdump.h b/srecord/output/file/hexdump.h
index be76e9c5..4956f2fc 100644
--- a/srecord/output/file/hexdump.h
+++ b/srecord/output/file/hexdump.h
@@ -70,7 +70,7 @@ class output_file_hexdump:
     void address_length_set(int);
 
     // See base class for documentation.
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
@@ -79,7 +79,7 @@ class output_file_hexdump:
     void command_line(arglex_tool *cmdln);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
 private:
     /**
@@ -133,12 +133,12 @@ class output_file_hexdump:
       * The row_cache_print method is used to print the row cache to the
       * file and then erase the cache in preparation for another row.
       */
-    void row_cache_print(void);
+    void row_cache_print();
 
     /**
       * The columns_to_line_length method is used to
       */
-    int columns_to_line_length(int cols);
+    int columns_to_line_length(int cols) const;
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/output/file/idt.cc b/srecord/output/file/idt.cc
index f32cba28..a1623711 100644
--- a/srecord/output/file/idt.cc
+++ b/srecord/output/file/idt.cc
@@ -91,7 +91,7 @@ srecord::output_file_idt::write_inner(int tag, unsigned long address,
 
 
 void
-srecord::output_file_idt::write_data_count(void)
+srecord::output_file_idt::write_data_count()
 {
     if (data_count_written)
         return;
@@ -130,7 +130,7 @@ srecord::output_file_idt::write(const srecord::record &record)
         break;
 
     case srecord::record::type_data:
-        if (addr < (1uL << 16) && address_length <= 2)
+        if (addr < (1UL << 16) && address_length <= 2)
         {
             write_inner
             (
@@ -220,7 +220,7 @@ srecord::output_file_idt::preferred_block_size_set(int nbytes)
 
 
 int
-srecord::output_file_idt::preferred_block_size_get(void)
+srecord::output_file_idt::preferred_block_size_get()
     const
 {
     return pref_block_size;
@@ -228,7 +228,7 @@ srecord::output_file_idt::preferred_block_size_get(void)
 
 
 const char *
-srecord::output_file_idt::format_name(void)
+srecord::output_file_idt::format_name()
     const
 {
     return "IDT System Integration Manager binary";
@@ -236,7 +236,7 @@ srecord::output_file_idt::format_name(void)
 
 
 bool
-srecord::output_file_idt::is_binary(void)
+srecord::output_file_idt::is_binary()
     const
 {
     return true;
diff --git a/srecord/output/file/idt.h b/srecord/output/file/idt.h
index ef2ba53d..85e519e2 100644
--- a/srecord/output/file/idt.h
+++ b/srecord/output/file/idt.h
@@ -62,16 +62,16 @@ class output_file_idt:
     void address_length_set(int nbytes);
 
     // See base class for documentation.
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
 private:
     /**
@@ -116,7 +116,7 @@ class output_file_idt:
       * The write_data_count method is used to write out a data count
       * record, if one is required.
       */
-    void write_data_count(void);
+    void write_data_count();
 
     /**
       * The write_inner method is used to write a line of output.
diff --git a/srecord/output/file/intel.cc b/srecord/output/file/intel.cc
index 644b3fb4..b159e9fc 100644
--- a/srecord/output/file/intel.cc
+++ b/srecord/output/file/intel.cc
@@ -68,7 +68,7 @@ srecord::output_file_intel::write_inner(int tag, unsigned long address,
     put_byte(tmp[0]);
     put_byte(tmp[1]);
     put_byte(tag);
-    const unsigned char *data_p = (const unsigned char *)data;
+    const auto *data_p = (const unsigned char *)data;
     for (int j = 0; j < data_nbytes; ++j)
         put_byte(data_p[j]);
     put_byte(-checksum_get());
diff --git a/srecord/output/file/intel.h b/srecord/output/file/intel.h
index 620942cb..652b6dec 100644
--- a/srecord/output/file/intel.h
+++ b/srecord/output/file/intel.h
@@ -70,13 +70,13 @@ class output_file_intel:
     void address_length_set(int);
 
     // See base class for documentation.
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
 private:
     /**
diff --git a/srecord/output/file/intel16.cc b/srecord/output/file/intel16.cc
index 37018be5..6ec2101d 100644
--- a/srecord/output/file/intel16.cc
+++ b/srecord/output/file/intel16.cc
@@ -69,7 +69,7 @@ srecord::output_file_intel16::write_inner(int tag, unsigned long address,
     put_byte(tmp[0]);
     put_byte(tmp[1]);
     put_byte(tag);
-    const unsigned char *data_p = (const unsigned char *)data;
+    const auto *data_p = (const unsigned char *)data;
     for (int j = 0; j < data_nbytes; ++j)
     {
         // Note: bytes are ordered HI,LO so we invert
diff --git a/srecord/output/file/logisim.cc b/srecord/output/file/logisim.cc
index e7b91aaa..29ec9bf1 100644
--- a/srecord/output/file/logisim.cc
+++ b/srecord/output/file/logisim.cc
@@ -161,7 +161,7 @@ srecord::output_file_logisim::preferred_block_size_set(int nbytes)
 
 
 int
-srecord::output_file_logisim::preferred_block_size_get(void)
+srecord::output_file_logisim::preferred_block_size_get()
     const
 {
     //
@@ -172,7 +172,7 @@ srecord::output_file_logisim::preferred_block_size_get(void)
 
 
 const char *
-srecord::output_file_logisim::format_name(void)
+srecord::output_file_logisim::format_name()
     const
 {
     return "Logisim";
diff --git a/srecord/output/file/logisim.h b/srecord/output/file/logisim.h
index 080a76c4..4000cbe7 100644
--- a/srecord/output/file/logisim.h
+++ b/srecord/output/file/logisim.h
@@ -56,13 +56,13 @@ class output_file_logisim:
     void address_length_set(int);
 
     // See base class for documentation.
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
 private:
     /**
diff --git a/srecord/output/file/mem.cc b/srecord/output/file/mem.cc
index 37e3bea7..08e62b98 100644
--- a/srecord/output/file/mem.cc
+++ b/srecord/output/file/mem.cc
@@ -103,7 +103,7 @@ srecord::output_file_mem::notify_upper_bound(unsigned long addr)
 
 
 void
-srecord::output_file_mem::emit_header(void)
+srecord::output_file_mem::emit_header()
 {
     if (header_done)
         return;
@@ -297,7 +297,7 @@ srecord::output_file_mem::preferred_block_size_set(int nbytes)
 
 
 int
-srecord::output_file_mem::preferred_block_size_get(void)
+srecord::output_file_mem::preferred_block_size_get()
     const
 {
     return pref_blk_sz;
@@ -305,7 +305,7 @@ srecord::output_file_mem::preferred_block_size_get(void)
 
 
 const char *
-srecord::output_file_mem::format_name(void)
+srecord::output_file_mem::format_name()
     const
 {
     return "Lattice Memory Initialization Format (.mem)";
diff --git a/srecord/output/file/mem.h b/srecord/output/file/mem.h
index 30536fb3..3423e6c3 100644
--- a/srecord/output/file/mem.h
+++ b/srecord/output/file/mem.h
@@ -69,7 +69,7 @@ class output_file_mem:
     void address_length_set(int);
 
     // See base class for documentation
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
@@ -78,7 +78,7 @@ class output_file_mem:
     void command_line(arglex_tool *cmdln);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
     // See base class for documentation.
     void notify_upper_bound(unsigned long addr);
@@ -138,7 +138,7 @@ class output_file_mem:
       * The emit_header method is used to emit the file header,
       * if necessary.
       */
-    void emit_header(void);
+    void emit_header();
 
     /**
       * The default constructor.  Do not use.
diff --git a/srecord/output/file/mips_flash.cc b/srecord/output/file/mips_flash.cc
index 94de95bf..fb60f7fc 100644
--- a/srecord/output/file/mips_flash.cc
+++ b/srecord/output/file/mips_flash.cc
@@ -176,7 +176,7 @@ srecord::output_file_mips_flash::write(const srecord::record &record)
 
 
 void
-srecord::output_file_mips_flash::buffer_flush_newline(void)
+srecord::output_file_mips_flash::buffer_flush_newline()
 {
     buffer_flush();
     if (column)
@@ -188,7 +188,7 @@ srecord::output_file_mips_flash::buffer_flush_newline(void)
 
 
 void
-srecord::output_file_mips_flash::buffer_flush(void)
+srecord::output_file_mips_flash::buffer_flush()
 {
     if (!buffer_length)
         return;
@@ -247,7 +247,7 @@ srecord::output_file_mips_flash::address_length_set(int)
 
 
 int
-srecord::output_file_mips_flash::preferred_block_size_get(void)
+srecord::output_file_mips_flash::preferred_block_size_get()
     const
 {
     //
@@ -267,7 +267,7 @@ srecord::output_file_mips_flash::preferred_block_size_set(int n)
 
 
 const char *
-srecord::output_file_mips_flash::format_name(void)
+srecord::output_file_mips_flash::format_name()
     const
 {
     return
diff --git a/srecord/output/file/mips_flash.h b/srecord/output/file/mips_flash.h
index fadb923e..c88ddf37 100644
--- a/srecord/output/file/mips_flash.h
+++ b/srecord/output/file/mips_flash.h
@@ -68,13 +68,13 @@ class output_file_mips_flash:
     void address_length_set(int);
 
     // See base class for documentation.
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
 private:
     /**
@@ -138,14 +138,14 @@ class output_file_mips_flash:
       * bytes of data in the #buffer array to the file.  The
       * #buffer_length has been reset to zero on return.
       */
-    void buffer_flush(void);
+    void buffer_flush();
 
     /**
       * The buffer_flush_newline method is used to write the data,
       * using the #buffer_flush method, and then issue a newline if the
       * output is not at the beginning of a new line.
       */
-    void buffer_flush_newline(void);
+    void buffer_flush_newline();
 
     /**
       * The line_length instance variable is used to remember the
diff --git a/srecord/output/file/motorola.h b/srecord/output/file/motorola.h
index 10d291b5..d9fe6e27 100644
--- a/srecord/output/file/motorola.h
+++ b/srecord/output/file/motorola.h
@@ -74,7 +74,7 @@ class output_file_motorola:
     void address_length_set(int);
 
     // See base class for documentation.
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
@@ -83,7 +83,7 @@ class output_file_motorola:
     void command_line(arglex_tool *cmdln);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
 private:
     /**
@@ -131,7 +131,7 @@ class output_file_motorola:
       * The write_data_count method is used to write out a data count
       * record, if one is required.
       */
-    void write_data_count(void);
+    void write_data_count();
 
     /**
       * The write_inner method is used to write a line of output.
diff --git a/srecord/output/file/msbin.cc b/srecord/output/file/msbin.cc
index 591c2a8e..34ef6a2f 100644
--- a/srecord/output/file/msbin.cc
+++ b/srecord/output/file/msbin.cc
@@ -20,6 +20,7 @@
 //
 
 #include <cassert>
+#include <memory>
 
 #include <srecord/output/file/msbin.h>
 
@@ -212,7 +213,7 @@ srecord::output_file_msbin::append_pending_record(const record &r)
             flush_pending_records(&r);
         }
         else
-            pending_records.push_back(std::shared_ptr<record>(new record(r)));
+            pending_records.push_back(std::make_shared<record>(r));
     }
     else
     {
@@ -226,7 +227,7 @@ srecord::output_file_msbin::append_pending_record(const record &r)
             flush_pending_records(&r);
         }
         else
-            pending_records.push_back(std::shared_ptr<record>(new record(r)));
+            pending_records.push_back(std::make_shared<record>(r));
     }
 }
 
@@ -321,7 +322,7 @@ srecord::output_file_msbin::format_name()
 
 
 bool
-srecord::output_file_msbin::is_binary(void)
+srecord::output_file_msbin::is_binary()
     const
 {
     return true;
diff --git a/srecord/output/file/msbin.h b/srecord/output/file/msbin.h
index a7ffeec1..92241705 100644
--- a/srecord/output/file/msbin.h
+++ b/srecord/output/file/msbin.h
@@ -22,7 +22,7 @@
 #ifndef SRECORD_OUTPUT_FILE_MSBIN_H
 #define SRECORD_OUTPUT_FILE_MSBIN_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <srecord/output/file.h>
 #include <srecord/record.h>
 #include <vector>
@@ -89,7 +89,7 @@ class output_file_msbin:
     void notify_upper_bound(unsigned long addr);
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
 private:
     /**
diff --git a/srecord/output/file/os65v.cc b/srecord/output/file/os65v.cc
index b850da69..5944aedb 100644
--- a/srecord/output/file/os65v.cc
+++ b/srecord/output/file/os65v.cc
@@ -173,7 +173,7 @@ srecord::output_file_os65v::preferred_block_size_get()
 
 
 const char *
-srecord::output_file_os65v::mode(void)
+srecord::output_file_os65v::mode()
     const
 {
     return "wb";
diff --git a/srecord/output/file/os65v.h b/srecord/output/file/os65v.h
index 94bc6a14..cdd5de8c 100644
--- a/srecord/output/file/os65v.h
+++ b/srecord/output/file/os65v.h
@@ -76,7 +76,7 @@ class output_file_os65v:
     bool preferred_block_size_set(int nbytes);
 
     // See base class for documentation
-    const char *mode(void) const;
+    const char *mode() const;
 
     // See base class for documentation.
     const char *format_name() const;
diff --git a/srecord/output/file/ppb.cc b/srecord/output/file/ppb.cc
index a036fe3f..dc5f9208 100644
--- a/srecord/output/file/ppb.cc
+++ b/srecord/output/file/ppb.cc
@@ -36,7 +36,7 @@ srecord::output_file_ppb::output_file_ppb(
     const std::string &a_file_name
 ) :
     srecord::output_file(a_file_name),
-    address(-1uL),
+    address(-1UL),
     buffer_length(0),
     seen_some_data(false)
 {
@@ -111,7 +111,7 @@ srecord::output_file_ppb::address_length_set(int)
 
 
 int
-srecord::output_file_ppb::preferred_block_size_get(void)
+srecord::output_file_ppb::preferred_block_size_get()
     const
 {
     // Use the largest we can get.
@@ -120,7 +120,7 @@ srecord::output_file_ppb::preferred_block_size_get(void)
 
 
 const char *
-srecord::output_file_ppb::format_name(void)
+srecord::output_file_ppb::format_name()
     const
 {
     return "Stag Prom Programmer Binary";
@@ -175,7 +175,7 @@ srecord::output_file_ppb::packet(unsigned long address,
 
 
 void
-srecord::output_file_ppb::buffer_flush(void)
+srecord::output_file_ppb::buffer_flush()
 {
     if (buffer_length > 0)
     {
@@ -186,7 +186,7 @@ srecord::output_file_ppb::buffer_flush(void)
 
 
 bool
-srecord::output_file_ppb::is_binary(void)
+srecord::output_file_ppb::is_binary()
     const
 {
     return true;
diff --git a/srecord/output/file/ppb.h b/srecord/output/file/ppb.h
index 9f7babbf..8fc23cc8 100644
--- a/srecord/output/file/ppb.h
+++ b/srecord/output/file/ppb.h
@@ -56,16 +56,16 @@ class output_file_ppb:
     void address_length_set(int);
 
     // See base class for documentation.
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
 private:
     /**
@@ -106,7 +106,7 @@ class output_file_ppb:
       * The buffer_flush method is used to write out the #buffer_length
       * bytes in the #buffer instance variable.
       */
-    void buffer_flush(void);
+    void buffer_flush();
 
     /**
       * The packet method is used to write out the #buffer as an
diff --git a/srecord/output/file/ppx.cc b/srecord/output/file/ppx.cc
index 2e1bc3e3..9df9148f 100644
--- a/srecord/output/file/ppx.cc
+++ b/srecord/output/file/ppx.cc
@@ -89,7 +89,7 @@ srecord::output_file_ppx::write(const srecord::record &record)
             unsigned char data = record.get_data(j);
             unsigned long data_address = record.get_address() + j;
 
-            if (data_address >= (1uL << 16))
+            if (data_address >= (1UL << 16))
                 data_address_too_large(record, 16);
 
             if (data_address != address)
@@ -156,7 +156,7 @@ srecord::output_file_ppx::address_length_set(int)
 
 
 int
-srecord::output_file_ppx::preferred_block_size_get(void)
+srecord::output_file_ppx::preferred_block_size_get()
     const
 {
     //
@@ -167,7 +167,7 @@ srecord::output_file_ppx::preferred_block_size_get(void)
 
 
 const char *
-srecord::output_file_ppx::format_name(void)
+srecord::output_file_ppx::format_name()
     const
 {
     return "Stag Prom Programmer Hexadecimal";
diff --git a/srecord/output/file/ppx.h b/srecord/output/file/ppx.h
index 2fb334bd..6b783af0 100644
--- a/srecord/output/file/ppx.h
+++ b/srecord/output/file/ppx.h
@@ -56,13 +56,13 @@ class output_file_ppx:
     void address_length_set(int);
 
     // See base class for documentation.
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
 
     // See base class for documentation.
-    const char *format_name(void) const;
+    const char *format_name() const;
 
 private:
     /**
diff --git a/srecord/output/file/tektronix.cc b/srecord/output/file/tektronix.cc
index 3cd5a407..e38f374d 100644
--- a/srecord/output/file/tektronix.cc
+++ b/srecord/output/file/tektronix.cc
@@ -85,7 +85,7 @@ srecord::output_file_tektronix::write_inner(unsigned long address,
     if (data_nbytes)
     {
         checksum_reset();
-        const unsigned char *data_p = (const unsigned char *)data;
+        const auto *data_p = (const unsigned char *)data;
         for (int j = 0; j < data_nbytes; ++j)
             put_byte(data_p[j]);
         put_byte(checksum_get());
diff --git a/srecord/output/file/tektronix_extended.cc b/srecord/output/file/tektronix_extended.cc
index 670f48e5..6994ea6c 100644
--- a/srecord/output/file/tektronix_extended.cc
+++ b/srecord/output/file/tektronix_extended.cc
@@ -72,7 +72,7 @@ srecord::output_file_tektronix_extended::write_inner(int tag,
     int j;
     for (j = 0; j < 2 * addr_nbytes; ++j)
         csum += buf[pos++] = (addr >> (4 * (2*addr_nbytes-1 - j))) & 15;
-    const unsigned char *data = (const unsigned char *)data_p;
+    const auto *data = (const unsigned char *)data_p;
     for (j = 0; j < data_nbytes; ++j)
     {
         csum += buf[pos++] = (data[j] >> 4) & 15;
@@ -98,9 +98,9 @@ srecord::output_file_tektronix_extended::write_inner(int tag,
 static int
 addr_width(unsigned long n)
 {
-    if (n < (1uL << 16))
+    if (n < (1UL << 16))
         return 2;
-    if (n < (1uL << 24))
+    if (n < (1UL << 24))
         return 3;
     return 4;
 }
diff --git a/srecord/output/file/trs80.cc b/srecord/output/file/trs80.cc
index c7014ef4..a6fa7aec 100644
--- a/srecord/output/file/trs80.cc
+++ b/srecord/output/file/trs80.cc
@@ -158,7 +158,7 @@ srecord::output_file_trs80::format_name()
 
 
 bool
-srecord::output_file_trs80::is_binary(void)
+srecord::output_file_trs80::is_binary()
     const
 {
     return true;
diff --git a/srecord/output/file/trs80.h b/srecord/output/file/trs80.h
index 0b79e4ec..ee327590 100644
--- a/srecord/output/file/trs80.h
+++ b/srecord/output/file/trs80.h
@@ -82,7 +82,7 @@ class output_file_trs80:
     const char *format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
 private:
     /**
diff --git a/srecord/output/file/vhdl.cc b/srecord/output/file/vhdl.cc
index dbc02089..1ca72914 100644
--- a/srecord/output/file/vhdl.cc
+++ b/srecord/output/file/vhdl.cc
@@ -61,7 +61,7 @@ srecord::output_file_vhdl::command_line(srecord::arglex_tool *cmdln)
 
         if (a1 > 0)
         {
-            unsigned a2 = (unsigned)a1;
+            auto a2 = (unsigned)a1;
             if (a2 > sizeof(unsigned long))
                 a2 = sizeof(unsigned long);
             bytes_per_word = a2;
diff --git a/srecord/output/file/vmem.cc b/srecord/output/file/vmem.cc
index fb611175..ded8672e 100644
--- a/srecord/output/file/vmem.cc
+++ b/srecord/output/file/vmem.cc
@@ -94,7 +94,7 @@ calc_width_shift(int x)
 static unsigned
 calc_width_mask(int x)
 {
-    return ((1uL << calc_width_shift(x)) - 1uL);
+    return ((1UL << calc_width_shift(x)) - 1UL);
 }
 
 
@@ -127,7 +127,7 @@ srecord::output_file_vmem::command_line(srecord::arglex_tool *cmdln)
         cmdln->token_next();
 
         width_shift = calc_width_shift(n);
-        bytes_per_word = 1u << width_shift;
+        bytes_per_word = 1U << width_shift;
         width_mask = calc_width_mask(n);
 
         //
@@ -185,7 +185,7 @@ srecord::output_file_vmem::write(const srecord::record &record)
         ||
             (record.get_length() & width_mask)
         )
-            fatal_alignment_error(1u << width_shift);
+            fatal_alignment_error(1U << width_shift);
 
         //
         // If we need to advance the address, it has to be at the start
diff --git a/srecord/output/file/wilson.cc b/srecord/output/file/wilson.cc
index 99ccf693..86b2b953 100644
--- a/srecord/output/file/wilson.cc
+++ b/srecord/output/file/wilson.cc
@@ -227,7 +227,7 @@ srecord::output_file_wilson::format_name()
 
 
 bool
-srecord::output_file_wilson::is_binary(void)
+srecord::output_file_wilson::is_binary()
     const
 {
     return true;
diff --git a/srecord/output/file/wilson.h b/srecord/output/file/wilson.h
index b62392cb..2195e4c8 100644
--- a/srecord/output/file/wilson.h
+++ b/srecord/output/file/wilson.h
@@ -88,7 +88,7 @@ class output_file_wilson:
     const char *format_name() const;
 
     // See base class for documentation.
-    bool is_binary(void) const;
+    bool is_binary() const;
 
 private:
     /**
diff --git a/srecord/output/filter.cc b/srecord/output/filter.cc
index 0d3d4d2d..b60a503c 100644
--- a/srecord/output/filter.cc
+++ b/srecord/output/filter.cc
@@ -52,7 +52,7 @@ srecord::output_filter::address_length_set(int n)
 
 
 int
-srecord::output_filter::preferred_block_size_get(void)
+srecord::output_filter::preferred_block_size_get()
     const
 {
     return deeper->preferred_block_size_get();
@@ -66,8 +66,8 @@ srecord::output_filter::preferred_block_size_set(int nbytes)
 }
 
 
-const std::string
-srecord::output_filter::filename(void)
+std::string
+srecord::output_filter::filename()
     const
 {
     return deeper->filename();
diff --git a/srecord/output/filter.h b/srecord/output/filter.h
index 1ed17f8b..32b52515 100644
--- a/srecord/output/filter.h
+++ b/srecord/output/filter.h
@@ -63,7 +63,7 @@ class output_filter:
     bool preferred_block_size_set(int nbytes);
 
     // See base class for documentation.
-    const std::string filename() const;
+    std::string filename() const;
 
     // See base class for documentation.
     const char *format_name() const;
diff --git a/srecord/output/filter/reblock.cc b/srecord/output/filter/reblock.cc
index da96b939..ed9d1382 100644
--- a/srecord/output/filter/reblock.cc
+++ b/srecord/output/filter/reblock.cc
@@ -64,7 +64,7 @@ srecord::output_filter_reblock::create(const output::pointer &a_deeper,
 
 
 void
-srecord::output_filter_reblock::track_block_size(void)
+srecord::output_filter_reblock::track_block_size()
 {
     block_size = output_filter::preferred_block_size_get();
 }
@@ -87,7 +87,7 @@ srecord::output_filter_reblock::address_length_set(int n)
 
 
 int
-srecord::output_filter_reblock::preferred_block_size_get(void)
+srecord::output_filter_reblock::preferred_block_size_get()
     const
 {
     return record::max_data_length;
diff --git a/srecord/output/filter/reblock.h b/srecord/output/filter/reblock.h
index d8acf83d..3921ca07 100644
--- a/srecord/output/filter/reblock.h
+++ b/srecord/output/filter/reblock.h
@@ -66,7 +66,7 @@ class output_filter_reblock:
     void address_length_set(int);
 
     // See base class for documentation.
-    int preferred_block_size_get(void) const;
+    int preferred_block_size_get() const;
 
     // See base class for documentation.
     bool preferred_block_size_set(int nbytes);
@@ -137,7 +137,7 @@ class output_filter_reblock:
       * deeper->preferred_bock_size_get whenever that value could have
       * changed.
       */
-    void track_block_size(void);
+    void track_block_size();
 
     /**
       * The flush_buffer method is used to write the accumulated
diff --git a/srecord/quit.h b/srecord/quit.h
index f2829d8d..973f2c90 100644
--- a/srecord/quit.h
+++ b/srecord/quit.h
@@ -19,7 +19,7 @@
 #ifndef SRECORD_QUIT_H
 #define SRECORD_QUIT_H
 
-#include <stdarg.h>
+#include <cstdarg>
 #include <srecord/format_printf.h>
 
 namespace srecord
diff --git a/srecord/quit/prefix.cc b/srecord/quit/prefix.cc
index bbdf702d..f0c30940 100644
--- a/srecord/quit/prefix.cc
+++ b/srecord/quit/prefix.cc
@@ -51,7 +51,7 @@ srecord::quit_prefix::exit(int n)
 void
 srecord::quit_prefix::message_v(const char *fmt, va_list ap)
 {
-    if (prefix != "")
+    if (!prefix.empty())
     {
         char buf[1024];
         vsnprintf(buf, sizeof(buf), fmt, ap);
diff --git a/srecord/r250.cc b/srecord/r250.cc
index 9f18baa3..d167da01 100644
--- a/srecord/r250.cc
+++ b/srecord/r250.cc
@@ -21,20 +21,21 @@
 #include <unistd.h>
 
 #include <srecord/r250.h>
+#include <srecord/sizeof.h>
 
 static  unsigned long   buf[250];
 static  unsigned long   *pos;
 
 
 static inline int
-rand8(void)
+rand8()
 {
     return ((rand() >> 7) & 255);
 }
 
 
 static inline long
-rand32(void)
+rand32()
 {
     return
         (
@@ -49,14 +50,11 @@ rand32(void)
 }
 
 
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
-#define ENDOF(a) ((a) + SIZEOF(a))
-
 static bool ready;
 
 
 static void
-r250_init(void)
+r250_init()
 {
     ready = true;
 
@@ -93,7 +91,7 @@ r250_init(void)
 
 
 unsigned long
-srecord::r250(void)
+srecord::r250()
 {
     if (!ready)
         r250_init();
diff --git a/srecord/r250.h b/srecord/r250.h
index 586a8964..23977161 100644
--- a/srecord/r250.h
+++ b/srecord/r250.h
@@ -26,7 +26,7 @@ namespace srecord
   * The r250 function is used to produce a 32-bit random number.
   * It repeats every 2**256 samples, long enough for most purposes.
   */
-unsigned long r250(void);
+unsigned long r250();
 
 };
 
diff --git a/srecord/record.h b/srecord/record.h
index e94ce5f6..175b6efb 100644
--- a/srecord/record.h
+++ b/srecord/record.h
@@ -20,7 +20,7 @@
 #define SRECORD_RECORD_H
 
 #include <cstddef>
-#include <stdint.h>
+#include <cstdint>
 
 #include <srecord/endian.h>
 
@@ -112,13 +112,13 @@ class record
       * The get_address method is used to get the address of the
       * record.
       */
-    address_t get_address(void) const { return address; }
+    address_t get_address() const { return address; }
 
     /**
       * The get_address_end method is used to get the address "off
       * the end" of this record.
       */
-    address_t get_address_end(void) const { return (address + length); }
+    address_t get_address_end() const { return (address + length); }
 
     /**
       * The address_range_fits_into_n_bits method is used to test whether or
@@ -141,7 +141,7 @@ class record
       * The get_length method is used to get the length (number of
       * bytes) of the record data.
       */
-    size_t get_length(void) const { return length; }
+    size_t get_length() const { return length; }
 
     /**
       * The set_length method is used to set the number of data
@@ -165,7 +165,7 @@ class record
       * Note: Accessing beyond get_length() bytes will give an
       * undefined value.
       */
-    const data_t *get_data(void) const { return data; }
+    const data_t *get_data() const { return data; }
 
     /**
       * The get_data method is used to fetch the nth data value.
@@ -184,7 +184,7 @@ class record
       * The is_all_zero method is used to determine if the record
       * contains data bytes which are all zero.
       */
-    bool is_all_zero(void) const;
+    bool is_all_zero() const;
 
     /**
       * The set_data method is used to set values in the data array.
@@ -215,7 +215,7 @@ class record
     /**
       * The get_type method is used to get the type of the record.
       */
-    type_t get_type(void) const { return type; }
+    type_t get_type() const { return type; }
 
     /**
       * The set_type method is used to set the type of the record.
diff --git a/srecord/sizeof.h b/srecord/sizeof.h
index a4d079b5..da7ffde2 100644
--- a/srecord/sizeof.h
+++ b/srecord/sizeof.h
@@ -20,7 +20,7 @@
 #ifndef SRECORD_SIZEOF_H
 #define SRECORD_SIZEOF_H
 
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+#define SIZEOF(a) (sizeof(a) / sizeof((a)[0]))
 #define ENDOF(a) ((a) + SIZEOF(a))
 
 #endif // SRECORD_SIZEOF_H
diff --git a/srecord/stm32.cc b/srecord/stm32.cc
index 75f866be..c0ec87aa 100644
--- a/srecord/stm32.cc
+++ b/srecord/stm32.cc
@@ -98,7 +98,7 @@ stm32_crc(unsigned long crc, unsigned long data)
 
 
 void
-srecord::stm32::generator(void)
+srecord::stm32::generator()
 {
     unsigned long data = 0;
     for (size_t j = 0; j < wordsize; j++)
@@ -120,7 +120,7 @@ srecord::stm32::next(unsigned char x)
 void
 srecord::stm32::nextbuf(const void *data, size_t nbytes)
 {
-    const unsigned char *dp = (const unsigned char *)data;
+    const auto *dp = (const unsigned char *)data;
     while (nbytes > 0)
     {
         --nbytes;
@@ -130,7 +130,7 @@ srecord::stm32::nextbuf(const void *data, size_t nbytes)
 
 
 unsigned long
-srecord::stm32::get(void)
+srecord::stm32::get()
     const
 {
     return state;
diff --git a/srecord/stm32.h b/srecord/stm32.h
index 8fe9aa2e..d2b61c55 100644
--- a/srecord/stm32.h
+++ b/srecord/stm32.h
@@ -28,7 +28,7 @@
 #ifndef SRECORD_STM32_H
 #define SRECORD_STM32_H
 
-#include <stddef.h>
+#include <cstddef>
 
 namespace srecord
 {
@@ -66,7 +66,7 @@ class stm32
       * The get method is used to obtain the running value of the cyclic
       * redundancy check.
       */
-    unsigned long get(void) const;
+    unsigned long get() const;
 
     /**
       * The next method is used to advance the state by one byte.
@@ -89,7 +89,7 @@ class stm32
       * the incoming byte stream is in little-endian order, which is safe
       * considering this is for the STM32F series MPUs.
       */
-    void generator(void);
+    void generator();
 
     /**
       * The state instance variable is used to remember the running
diff --git a/srecord/versn_stamp.cc b/srecord/versn_stamp.cc
index d396a3a6..55b54f52 100644
--- a/srecord/versn_stamp.cc
+++ b/srecord/versn_stamp.cc
@@ -24,26 +24,26 @@
 
 
 const char *
-srecord::version_stamp(void)
+srecord::version_stamp()
 {
     return PATCHLEVEL;
 }
 
 
 const char *
-srecord::copyright_years(void)
+srecord::copyright_years()
 {
     return COPYRIGHT_YEARS;
 }
 
 const char *
-srecord::git_sha1(void)
+srecord::git_sha1()
 {
     return GIT_SHA1;
 }
 
 void
-srecord::print_version(void)
+srecord::print_version()
 {
     std::cout << progname_get() << " version " << version_stamp()
               << " [git hash " << git_sha1() << "]"<< std::endl;
diff --git a/srecord/versn_stamp.h b/srecord/versn_stamp.h
index 55276bc0..82ee68e7 100644
--- a/srecord/versn_stamp.h
+++ b/srecord/versn_stamp.h
@@ -28,27 +28,27 @@ namespace srecord
   * as a string.  This reflects Aegis' idea of the version, so you can
   * re-create that Aegis version easily.
   */
-const char *version_stamp(void);
+const char *version_stamp();
 
 /**
   * The copyright_years function is used to obtain the range of
   * copyright years for the copyright notice.  This reflects Aegis'
   * tracking of the project, and updated automatically.
   */
-const char *copyright_years(void);
+const char *copyright_years();
 
 /**
   * The git_sha1 function is used to obtain the git hash as a string.
   * This reflects git's idea of the version, so you can re-create that
   * git version easily.
   */
-const char *git_sha1(void);
+const char *git_sha1();
 
 /**
   * The print_version function is used to print the program version, and
   * brief copyright notice, to the standard output.
   */
-void print_version(void);
+void print_version();
 
 };
 
diff --git a/test/01/t0150a.sh b/test/01/t0150a.sh
index aa5eb7bd..1b524064 100755
--- a/test/01/t0150a.sh
+++ b/test/01/t0150a.sh
@@ -43,17 +43,17 @@ test $? -eq 0 || no_result
 #
 test_crc16 < zero.length.file > test.out
 test $? -eq 0 || fail
-echo >> test.out
+echo | cat >> test.out
 test $? -eq 0 || no_result
 
 test_crc16 < single.a.file >> test.out
 test $? -eq 0 || fail
-echo >> test.out
+echo | cat >> test.out
 test $? -eq 0 || no_result
 
 test_crc16 < nine.digits.file >> test.out
 test $? -eq 0 || fail
-echo >> test.out
+echo | cat >> test.out
 test $? -eq 0 || no_result
 
 test_crc16 < upper-case-a.256.file >> test.out
diff --git a/test/01/t0151a.sh b/test/01/t0151a.sh
index 25893997..76b18bb8 100755
--- a/test/01/t0151a.sh
+++ b/test/01/t0151a.sh
@@ -43,17 +43,17 @@ test $? -eq 0 || no_result
 #
 test_crc16 -x < zero.length.file > test.out
 test $? -eq 0 || fail
-echo >> test.out
+echo | cat >> test.out
 test $? -eq 0 || no_result
 
 test_crc16 -x < single.a.file >> test.out
 test $? -eq 0 || fail
-echo >> test.out
+echo | cat >> test.out
 test $? -eq 0 || no_result
 
 test_crc16 -x < nine.digits.file >> test.out
 test $? -eq 0 || fail
-echo >> test.out
+echo | cat >> test.out
 test $? -eq 0 || no_result
 
 test_crc16 -x < upper-case-a.256.file >> test.out
diff --git a/test/01/t0152a.sh b/test/01/t0152a.sh
index 197fdde8..ea35dd2d 100755
--- a/test/01/t0152a.sh
+++ b/test/01/t0152a.sh
@@ -43,17 +43,17 @@ test $? -eq 0 || no_result
 #
 test_crc16 -a < zero.length.file > test.out
 test $? -eq 0 || fail
-echo >> test.out
+echo | cat >> test.out
 test $? -eq 0 || no_result
 
 test_crc16 -a < single.a.file >> test.out
 test $? -eq 0 || fail
-echo >> test.out
+echo | cat >> test.out
 test $? -eq 0 || no_result
 
 test_crc16 -a < nine.digits.file >> test.out
 test $? -eq 0 || fail
-echo >> test.out
+echo | cat >> test.out
 test $? -eq 0 || no_result
 
 test_crc16 -a < upper-case-a.256.file >> test.out
diff --git a/test/crc16/main.cc b/test/crc16/main.cc
index be7a866c..5130cbdc 100644
--- a/test/crc16/main.cc
+++ b/test/crc16/main.cc
@@ -29,7 +29,7 @@
 
 
 static void
-usage(void)
+usage()
 {
     fprintf(stderr, "Usage: [ -av ] %s\n", srecord::progname_get());
     exit(1);
diff --git a/test/fletcher16/main.cc b/test/fletcher16/main.cc
index 35bfef11..d9a4cde3 100644
--- a/test/fletcher16/main.cc
+++ b/test/fletcher16/main.cc
@@ -24,7 +24,7 @@
 
 
 static void
-usage(void)
+usage()
 {
     fprintf(stderr, "Usage: test_fletcher16 [ <sum1> <sum2> [ <answer> ]]\n");
     exit(1);
diff --git a/test/hyphen/main.cc b/test/hyphen/main.cc
index d933ad09..275958de 100644
--- a/test/hyphen/main.cc
+++ b/test/hyphen/main.cc
@@ -132,7 +132,7 @@ check(const char *filename)
 
 
 static void
-usage(void)
+usage()
 {
     const char *prog = srecord::progname_get();
     fprintf(stderr, "Usage: %s <filename>...\n", prog);
diff --git a/test/url_decode/main.cc b/test/url_decode/main.cc
index 217d72ca..e84e0fbd 100644
--- a/test/url_decode/main.cc
+++ b/test/url_decode/main.cc
@@ -18,7 +18,6 @@
 
 #include <cctype>
 #include <cstdio>
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <getopt.h>
@@ -30,7 +29,7 @@
 
 
 static void
-usage(void)
+usage()
 {
     const char *prog;
 
@@ -42,7 +41,7 @@ usage(void)
 
 
 static void
-test_url_decode(void)
+test_url_decode()
 {
     for (;;)
     {
@@ -59,7 +58,7 @@ test_url_decode(void)
 
 
 static void
-test_url_encode(void)
+test_url_encode()
 {
     for (;;)
     {
@@ -79,7 +78,7 @@ int
 main(int argc, char **argv)
 {
     srecord::progname_set(argv[0]);
-    typedef void (*func_t)(void);
+    typedef void (*func_t)();
     func_t func = NULL;
     for (;;)
     {