diff --git a/patsolve/abstract_fc_solve_solver.h b/patsolve/abstract_fc_solve_solver.h
--- a/patsolve/abstract_fc_solve_solver.h
+++ b/patsolve/abstract_fc_solve_solver.h
@@ -25,19 +25,19 @@
 public:
     FcSolveSolver();
     virtual ~FcSolveSolver();
-    virtual int get_possible_moves(int *a, int *numout) Q_DECL_OVERRIDE = 0;
-    virtual bool isWon() Q_DECL_OVERRIDE;
-    virtual void make_move(MOVE *m) Q_DECL_OVERRIDE;
-    virtual void undo_move(MOVE *m) Q_DECL_OVERRIDE;
-    virtual int getOuts() Q_DECL_OVERRIDE;
-    virtual unsigned int getClusterNumber() Q_DECL_OVERRIDE;
-    virtual void translate_layout() Q_DECL_OVERRIDE = 0;
-    virtual void unpack_cluster( unsigned int k ) Q_DECL_OVERRIDE;
-    virtual MoveHint translateMove(const MOVE &m) Q_DECL_OVERRIDE = 0;
-    virtual SolverInterface::ExitStatus patsolve( int _max_positions = -1) Q_DECL_OVERRIDE;
+    int get_possible_moves(int *a, int *numout) override = 0;
+    bool isWon() override;
+    void make_move(MOVE *m) override;
+    void undo_move(MOVE *m) override;
+    int getOuts() override;
+    unsigned int getClusterNumber() override;
+    void translate_layout() override = 0;
+    void unpack_cluster( unsigned int k ) override;
+    MoveHint translateMove(const MOVE &m) override = 0;
+    SolverInterface::ExitStatus patsolve( int _max_positions = -1) override;
     virtual void setFcSolverGameParams() = 0;
 
-    virtual void print_layout() Q_DECL_OVERRIDE;
+    void print_layout() override;
 
     virtual int get_cmd_line_arg_count() = 0;
     virtual const char * * get_cmd_line_args() = 0;
diff --git a/patsolve/freecellsolver.h b/patsolve/freecellsolver.h
--- a/patsolve/freecellsolver.h
+++ b/patsolve/freecellsolver.h
@@ -30,7 +30,7 @@
 public:
     explicit FreecellSolver(const Freecell *dealer);
     int good_automove(int o, int r);
-    virtual int get_possible_moves(int *a, int *numout) Q_DECL_OVERRIDE;
+    int get_possible_moves(int *a, int *numout) override;
 #if 0
     bool isWon() Q_DECL_OVERRIDE;
     void make_move(MOVE *m) Q_DECL_OVERRIDE;
@@ -42,14 +42,14 @@
     void unpack_cluster( unsigned int k ) Q_DECL_OVERRIDE;
     MoveHint translateMove(const MOVE &m) Q_DECL_OVERRIDE;
 #endif
-    virtual void translate_layout() Q_DECL_OVERRIDE;
+    void translate_layout() override;
 #if 0
     virtual void unpack_cluster( unsigned int k );
 #endif
-    virtual MoveHint translateMove(const MOVE &m) Q_DECL_OVERRIDE;
-    virtual void setFcSolverGameParams() Q_DECL_OVERRIDE;
-    virtual int get_cmd_line_arg_count() Q_DECL_OVERRIDE;
-    virtual const char * * get_cmd_line_args() Q_DECL_OVERRIDE;
+    MoveHint translateMove(const MOVE &m) override;
+    void setFcSolverGameParams() override;
+    int get_cmd_line_arg_count() override;
+    const char * * get_cmd_line_args() override;
 #if 0
     virtual void print_layout();
 
diff --git a/patsolve/patsolve.h b/patsolve/patsolve.h
--- a/patsolve/patsolve.h
+++ b/patsolve/patsolve.h
@@ -57,10 +57,10 @@
 
     Solver();
     virtual ~Solver();
-    virtual ExitStatus patsolve( int max_positions = -1) Q_DECL_OVERRIDE;
+    ExitStatus patsolve( int max_positions = -1) override;
     bool recursive(POSITION *pos = nullptr);
-    virtual void translate_layout() Q_DECL_OVERRIDE = 0;
-    virtual MoveHint translateMove(const MOVE &m ) Q_DECL_OVERRIDE = 0;
+    void translate_layout() override = 0;
+    MoveHint translateMove(const MOVE &m ) override = 0;
     void stopExecution() final Q_DECL_OVERRIDE;
     QList<MOVE> firstMoves() const final Q_DECL_OVERRIDE;
     QList<MOVE> winMoves() const final Q_DECL_OVERRIDE;
diff --git a/patsolve/simonsolver.h b/patsolve/simonsolver.h
--- a/patsolve/simonsolver.h
+++ b/patsolve/simonsolver.h
@@ -35,16 +35,16 @@
     int getOuts() Q_DECL_OVERRIDE;
     unsigned int getClusterNumber() Q_DECL_OVERRIDE;
 #endif
-    virtual void translate_layout() Q_DECL_OVERRIDE;
-    virtual MoveHint translateMove(const MOVE &m) Q_DECL_OVERRIDE;
+    void translate_layout() override;
+    MoveHint translateMove(const MOVE &m) override;
 #if 0
     void unpack_cluster( unsigned int k ) Q_DECL_OVERRIDE;
     void print_layout() Q_DECL_OVERRIDE;
 #endif
-    virtual void setFcSolverGameParams() Q_DECL_OVERRIDE;
+    void setFcSolverGameParams() override;
 
-    virtual int get_cmd_line_arg_count() Q_DECL_OVERRIDE;
-    virtual const char * * get_cmd_line_args() Q_DECL_OVERRIDE;
+    int get_cmd_line_arg_count() override;
+    const char * * get_cmd_line_args() override;
 #if 0
 /* Names of the cards.  The ordering is defined in pat.h. */
     int O[4];