diff --git a/src/except.cpp b/src/except.cpp
index 7f95380d..ed8393a0 100644
--- a/src/except.cpp
+++ b/src/except.cpp
@@ -47,7 +47,7 @@ Throwable::Throwable(const char *m, int e, bool w)
 }
 
 
-Throwable::Throwable(Throwable const &other)
+Throwable::Throwable(const Throwable &other)
     : super(other), msg(NULL), err(other.err), is_warning(other.is_warning)
 {
     if (other.msg)
diff --git a/src/except.h b/src/except.h
index 95e0fba3..aee37e7a 100644
--- a/src/except.h
+++ b/src/except.h
@@ -45,7 +45,7 @@ class Throwable : public std::exception
 protected:
     Throwable(const char *m = 0, int e = 0, bool w = false);
 public:
-    Throwable(Throwable const &);
+    Throwable(const Throwable &);
     virtual ~Throwable() NOTHROW;
     const char *getMsg() const { return msg; }
     int getErrno() const { return err; }
@@ -58,7 +58,7 @@ protected:
 
 private:
     // disable assignment
-    Throwable& operator= (Throwable const &);
+    Throwable& operator= (const Throwable &);
     // disable dynamic allocation
     DISABLE_NEW_DELETE
 
diff --git a/src/lefile.h b/src/lefile.h
index 13769202..d05d5844 100644
--- a/src/lefile.h
+++ b/src/lefile.h
@@ -219,8 +219,8 @@ protected:
 
 private:
     // disable copy and assignment
-    LeFile(LeFile const &); // {}
-    LeFile& operator= (LeFile const &); // { return *this; }
+    LeFile(const LeFile &); // {}
+    LeFile& operator= (const LeFile &); // { return *this; }
 };
 
 
diff --git a/src/linker.h b/src/linker.h
index 01fadde2..cab1d300 100644
--- a/src/linker.h
+++ b/src/linker.h
@@ -64,8 +64,8 @@ private:
 
 private:
     // disable copy and assignment
-    Linker(Linker const &); // {}
-    Linker& operator= (Linker const &); // { return *this; }
+    Linker(const Linker &); // {}
+    Linker& operator= (const Linker &); // { return *this; }
 };
 
 
@@ -83,8 +83,8 @@ protected:
 
 private:
     // disable copy and assignment
-    BeLinker(BeLinker const &); // {}
-    BeLinker& operator= (BeLinker const &); // { return *this; }
+    BeLinker(const BeLinker &); // {}
+    BeLinker& operator= (const BeLinker &); // { return *this; }
 };
 
 
diff --git a/src/mem.h b/src/mem.h
index e6ad13b4..2f9c1521 100644
--- a/src/mem.h
+++ b/src/mem.h
@@ -63,8 +63,8 @@ private:
     static unsigned global_alloc_counter;
 
     // disable copy and assignment
-    MemBuffer(MemBuffer const &); // {}
-    MemBuffer& operator= (MemBuffer const &); // { return *this; }
+    MemBuffer(const MemBuffer &); // {}
+    MemBuffer& operator= (const MemBuffer &); // { return *this; }
 
     // disable dynamic allocation
     DISABLE_NEW_DELETE
diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
index 37e9722a..a9a6ee72 100644
--- a/src/p_lx_elf.cpp
+++ b/src/p_lx_elf.cpp
@@ -167,7 +167,7 @@ bool PackLinuxI386elf::canPack()
 }
 
 void PackLinuxI386elf::packExtent(
-    Extent const &x,
+    const Extent &x,
     unsigned &total_in,
     unsigned &total_out,
     Filter *ft,
diff --git a/src/p_lx_elf.h b/src/p_lx_elf.h
index 02b7e44c..00f28b69 100644
--- a/src/p_lx_elf.h
+++ b/src/p_lx_elf.h
@@ -58,7 +58,7 @@ protected:
         off_t offset;
         off_t size;
     };
-    virtual void packExtent(Extent const &x,
+    virtual void packExtent(const Extent &x,
         unsigned &total_in, unsigned &total_out, Filter *, OutputFile *);
     virtual void unpackExtent(unsigned wanted, OutputFile *fo,
         unsigned &total_in, unsigned &total_out,
diff --git a/src/packer.h b/src/packer.h
index eb77308a..1ad89228 100644
--- a/src/packer.h
+++ b/src/packer.h
@@ -273,8 +273,8 @@ private:
 
 private:
     // disable copy and assignment
-    Packer(Packer const &); // {}
-    Packer& operator= (Packer const &); // { return *this; }
+    Packer(const Packer &); // {}
+    Packer& operator= (const Packer &); // { return *this; }
 };