diff --git a/lib/cd.h b/lib/cd.h
index 1b8863f..24f250e 100644
--- a/lib/cd.h
+++ b/lib/cd.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * cd.h -- cd structure
  *
  * Copyright (C) 2004 Svend Sorensen
@@ -79,7 +79,7 @@ Cd *cd_init ();
 void cd_dump (Cd *cd);
 
 /*
- * Cd functions 
+ * Cd functions
  */
 
 void cd_set_mode (Cd *cd, int mode);
@@ -88,7 +88,7 @@ int cd_get_mode (Cd *cd);
 void cd_set_catalog (Cd *cd, char *catalog);
 char *cd_get_catalog (Cd *cd);
 
-/* 
+/*
  * return pointer to cd's Cdtext
  */
 Cdtext *cd_get_cdtext (Cd *cd);
diff --git a/lib/cdtext.c b/lib/cdtext.c
index 6b0a939..1d8fd82 100644
--- a/lib/cdtext.c
+++ b/lib/cdtext.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * cdtext.c -- cdtext data structure and functions
  *
  * Copyright (C) 2004 Svend Sorensen
diff --git a/lib/cdtext.h b/lib/cdtext.h
index b02f6cd..bd11bbc 100644
--- a/lib/cdtext.h
+++ b/lib/cdtext.h
@@ -46,7 +46,7 @@ Cdtext *cdtext_init ();
 /* release a Cdtext */
 void cdtext_delete (Cdtext *cdtext);
 
-/* returns non-zero if there are no CD-TEXT fields set, zero otherwise */ 
+/* returns non-zero if there are no CD-TEXT fields set, zero otherwise */
 int cdtext_is_empty (Cdtext *cdtext);
 
 /* set CD-TEXT field to value for PTI pti */
diff --git a/lib/cue_parse.y b/lib/cue_parse.y
index 239a97c..8e3c988 100644
--- a/lib/cue_parse.y
+++ b/lib/cue_parse.y
@@ -17,7 +17,7 @@
 extern int cue_yylex();
 void yyerror (char *s);
 
-static Cd *cd = NULL; 
+static Cd *cd = NULL;
 static Track *track = NULL;
 static Track *prev_track = NULL;
 static Cdtext *cdtext = NULL;
diff --git a/lib/cue_print.c b/lib/cue_print.c
index c03dd03..be3a0de 100644
--- a/lib/cue_print.c
+++ b/lib/cue_print.c
@@ -43,7 +43,7 @@ void cue_print_track (FILE *fp, Track *track, int trackno)
 	int i; 	/* index */
 
 	if (NULL != track_get_filename(track)) {
-		/* 
+		/*
 		 * always print filename for track 1, afterwards only
 		 * print filename if it differs from the previous track
 		 */
diff --git a/lib/cuefile.c b/lib/cuefile.c
index 0e69ba9..d65d9f2 100644
--- a/lib/cuefile.c
+++ b/lib/cuefile.c
@@ -44,7 +44,7 @@ Cd *cf_parse (char *name, int *format)
 	return cd;
 }
 
-int cf_print (char *name, int *format, Cd *cd) 
+int cf_print (char *name, int *format, Cd *cd)
 {
 	FILE *fp = NULL;
 
diff --git a/lib/cuefile.h b/lib/cuefile.h
index 703aa5b..f3efb67 100644
--- a/lib/cuefile.h
+++ b/lib/cuefile.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * cuefile.h -- cue/toc public declarations
  *
  * Copyright (C) 2004 Svend Sorensen
diff --git a/lib/toc_parse.y b/lib/toc_parse.y
index ccc84d1..c1e42ae 100644
--- a/lib/toc_parse.y
+++ b/lib/toc_parse.y
@@ -33,7 +33,7 @@ static Cdtext *cdtext = NULL;
 %token <sval> STRING
 
 /* global (header) */
-%token CATALOG 
+%token CATALOG
 
 %token <ival> CD_DA
 %token <ival> CD_ROM
@@ -65,7 +65,7 @@ static Cdtext *cdtext = NULL;
 %token DATAFILE
 %token FIFO
 %token START
-%token PREGAP 
+%token PREGAP
 %token INDEX
 
 /* CD-TEXT */
@@ -153,7 +153,7 @@ track_def
 	;
 
 track_modes
-	: track_mode 
+	: track_mode
 	| track_mode track_sub_mode { track_set_sub_mode(track, $2); }
 	;
 
diff --git a/tools/cueconvert.c b/tools/cueconvert.c
index 85d3c22..65c301f 100644
--- a/tools/cueconvert.c
+++ b/tools/cueconvert.c
@@ -105,7 +105,7 @@ int main (int argc, char **argv)
 			break;
 		}
 	}
- 
+
 	if (optind == argc) {
 		convert("-", iformat, "-", oformat);
 	} else if (optind == argc - 1) {