diff --git a/src/espeak-ng.c b/src/espeak-ng.c
index b2ef23db..4b8cd0d1 100644
--- a/src/espeak-ng.c
+++ b/src/espeak-ng.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdbool.h>
diff --git a/src/include/espeak-ng/espeak_ng.h b/src/include/espeak-ng/espeak_ng.h
index 8300fef1..8ce43667 100644
--- a/src/include/espeak-ng/espeak_ng.h
+++ b/src/include/espeak-ng/espeak_ng.h
@@ -2,8 +2,6 @@
  *
  * Copyright (C) 2015 Reece H. Dunn
  *
- * This file is part of espeak-ng.
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c
index ad5b73ac..5b6d887b 100644
--- a/src/libespeak-ng/compiledata.c
+++ b/src/libespeak-ng/compiledata.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/libespeak-ng/compilembrola.c b/src/libespeak-ng/compilembrola.c
index f3634d91..6c3ade28 100644
--- a/src/libespeak-ng/compilembrola.c
+++ b/src/libespeak-ng/compilembrola.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/libespeak-ng/dictionary.c b/src/libespeak-ng/dictionary.c
index f9110d0d..9e9bdce5 100644
--- a/src/libespeak-ng/dictionary.c
+++ b/src/libespeak-ng/dictionary.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/libespeak-ng/espeak_command.c b/src/libespeak-ng/espeak_command.c
index ddc07892..7658cee3 100644
--- a/src/libespeak-ng/espeak_command.c
+++ b/src/libespeak-ng/espeak_command.c
@@ -13,9 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include "speech.h"
diff --git a/src/libespeak-ng/event.c b/src/libespeak-ng/event.c
index 7df10411..f47362ab 100644
--- a/src/libespeak-ng/event.c
+++ b/src/libespeak-ng/event.c
@@ -13,9 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 // This source file is only used for asynchronious modes
diff --git a/src/libespeak-ng/fifo.c b/src/libespeak-ng/fifo.c
index 0ec8b5c0..af29ce49 100644
--- a/src/libespeak-ng/fifo.c
+++ b/src/libespeak-ng/fifo.c
@@ -1,21 +1,19 @@
 /*
- *   Copyright (C) 2007, Gilles Casse <gcasse@oralux.org>
- *   Copyright (C) 2013-2015 Reece H. Dunn
+ * Copyright (C) 2007, Gilles Casse <gcasse@oralux.org>
+ * Copyright (C) 2013-2015 Reece H. Dunn
  *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 3 of the License, or
- *   (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 // This source file is only used for asynchronious modes
diff --git a/src/libespeak-ng/intonation.c b/src/libespeak-ng/intonation.c
index 097b4dbc..3c351f01 100644
--- a/src/libespeak-ng/intonation.c
+++ b/src/libespeak-ng/intonation.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/libespeak-ng/klatt.c b/src/libespeak-ng/klatt.c
index 83412db4..5693ef40 100644
--- a/src/libespeak-ng/klatt.c
+++ b/src/libespeak-ng/klatt.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 // See URL: ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/klatt.3.04.tar.gz
diff --git a/src/libespeak-ng/numbers.c b/src/libespeak-ng/numbers.c
index e4a0a328..57ab9e41 100644
--- a/src/libespeak-ng/numbers.c
+++ b/src/libespeak-ng/numbers.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdbool.h>
diff --git a/src/libespeak-ng/phoneme.h b/src/libespeak-ng/phoneme.h
index 132d8b65..55a293ad 100644
--- a/src/libespeak-ng/phoneme.h
+++ b/src/libespeak-ng/phoneme.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #ifdef __cplusplus
diff --git a/src/libespeak-ng/phonemelist.c b/src/libespeak-ng/phonemelist.c
index 4cdc485a..0e5285fb 100644
--- a/src/libespeak-ng/phonemelist.c
+++ b/src/libespeak-ng/phonemelist.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/libespeak-ng/readclause.c b/src/libespeak-ng/readclause.c
index 9f9e7bd5..332cb300 100644
--- a/src/libespeak-ng/readclause.c
+++ b/src/libespeak-ng/readclause.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/libespeak-ng/setlengths.c b/src/libespeak-ng/setlengths.c
index 74012035..7412276e 100644
--- a/src/libespeak-ng/setlengths.c
+++ b/src/libespeak-ng/setlengths.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/src/libespeak-ng/speak_lib.c b/src/libespeak-ng/speak_lib.c
index 2a97d2ea..b57d5f6c 100644
--- a/src/libespeak-ng/speak_lib.c
+++ b/src/libespeak-ng/speak_lib.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include "stdio.h"
diff --git a/src/libespeak-ng/spect.c b/src/libespeak-ng/spect.c
index f77f2a83..408185e2 100644
--- a/src/libespeak-ng/spect.c
+++ b/src/libespeak-ng/spect.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include "speak_lib.h"
diff --git a/src/libespeak-ng/spect.h b/src/libespeak-ng/spect.h
index dd5dff8c..aff6d26b 100644
--- a/src/libespeak-ng/spect.h
+++ b/src/libespeak-ng/spect.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #ifdef __cplusplus
diff --git a/src/libespeak-ng/speech.h b/src/libespeak-ng/speech.h
index bed5ba65..31c2458f 100644
--- a/src/libespeak-ng/speech.h
+++ b/src/libespeak-ng/speech.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SPEECH_H
diff --git a/src/libespeak-ng/synth_mbrola.c b/src/libespeak-ng/synth_mbrola.c
index 7a03430a..cfaba83f 100644
--- a/src/libespeak-ng/synth_mbrola.c
+++ b/src/libespeak-ng/synth_mbrola.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c
index 6996bae5..27080912 100644
--- a/src/libespeak-ng/synthdata.c
+++ b/src/libespeak-ng/synthdata.c
@@ -1,22 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2005 to 2014 by Jonathan Duddington                     *
-*   email: jonsd@users.sourceforge.net                                    *
-*   Copyright (C) 2015 Reece H. Dunn                                      *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 3 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU General Public License     *
-*   along with this program; if not, see:                                 *
-*               <http://www.gnu.org/licenses/>.                           *
-***************************************************************************/
+/*
+ * Copyright (C) 2005 to 2014 by Jonathan Duddington
+ * email: jonsd@users.sourceforge.net
+ * Copyright (C) 2015 Reece H. Dunn
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
+ */
 
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/src/libespeak-ng/synthesize.c b/src/libespeak-ng/synthesize.c
index a8959b49..82b80871 100644
--- a/src/libespeak-ng/synthesize.c
+++ b/src/libespeak-ng/synthesize.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/libespeak-ng/synthesize.h b/src/libespeak-ng/synthesize.h
index b1c345dc..ca84572a 100644
--- a/src/libespeak-ng/synthesize.h
+++ b/src/libespeak-ng/synthesize.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #ifdef __cplusplus
diff --git a/src/libespeak-ng/tr_languages.c b/src/libespeak-ng/tr_languages.c
index fb9b71c0..8580968f 100644
--- a/src/libespeak-ng/tr_languages.c
+++ b/src/libespeak-ng/tr_languages.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/libespeak-ng/translate.c b/src/libespeak-ng/translate.c
index 7884de02..3def103b 100644
--- a/src/libespeak-ng/translate.c
+++ b/src/libespeak-ng/translate.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/libespeak-ng/translate.h b/src/libespeak-ng/translate.h
index 43ac02ee..7c33f03c 100644
--- a/src/libespeak-ng/translate.h
+++ b/src/libespeak-ng/translate.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #ifdef __cplusplus
diff --git a/src/libespeak-ng/voice.h b/src/libespeak-ng/voice.h
index f3bf12fd..f814d9fd 100644
--- a/src/libespeak-ng/voice.h
+++ b/src/libespeak-ng/voice.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #ifdef __cplusplus
diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c
index 098e1254..97022dc8 100644
--- a/src/libespeak-ng/voices.c
+++ b/src/libespeak-ng/voices.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include "stdio.h"
diff --git a/src/libespeak-ng/wave.c b/src/libespeak-ng/wave.c
index 8eceec75..5927482c 100644
--- a/src/libespeak-ng/wave.c
+++ b/src/libespeak-ng/wave.c
@@ -14,9 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include "speech.h"
diff --git a/src/libespeak-ng/wave_pulse.c b/src/libespeak-ng/wave_pulse.c
index f8c3c8d4..52331fef 100644
--- a/src/libespeak-ng/wave_pulse.c
+++ b/src/libespeak-ng/wave_pulse.c
@@ -15,9 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 // TBD:
diff --git a/src/libespeak-ng/wave_sada.c b/src/libespeak-ng/wave_sada.c
index 5cc72b1f..75ea8c32 100644
--- a/src/libespeak-ng/wave_sada.c
+++ b/src/libespeak-ng/wave_sada.c
@@ -15,9 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include "speech.h"
diff --git a/src/libespeak-ng/wavegen.c b/src/libespeak-ng/wavegen.c
index e9cffbbe..26ff2d66 100644
--- a/src/libespeak-ng/wavegen.c
+++ b/src/libespeak-ng/wavegen.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 // this version keeps wavemult window as a constant fraction
diff --git a/src/speak-ng.c b/src/speak-ng.c
index e18bab83..09550afa 100644
--- a/src/speak-ng.c
+++ b/src/speak-ng.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write see:
- *             <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>.
  */
 
 #include "speech.h"