diff --git a/bagpipe-fixed.ly b/bagpipe-fixed.ly
index 517e2cb..0c1e20c 100644
--- a/bagpipe-fixed.ly
+++ b/bagpipe-fixed.ly
@@ -5,36 +5,15 @@
   Substantial changes and additions made by
   Sven Axelsson, the Murray Pipes & Drums of Gothenburg
   (http://www.murrays.nu)
+
+  Including this file will **not** change the pitchnames used by lilypond.
+  embellishments will be placed around c''
 %}
 
 \version "2.19.28"
 
-% Some common timing tweaks.
-
-% Sets the autobeamer to span quarter notes only. Use for fast music.
-quarterBeaming = {
-  \set Score.baseMoment = #(ly:make-moment 1/4)
-  \set Score.beatStructure = #'(1 1 1 1)
-}
-% Sets the autobeamer to span half notes. Mostly used in reels.
-halfBeaming = {
-  \set Score.baseMoment = #(ly:make-moment 1/2)
-  \set Score.beatStructure = #'(1 1)
-}
-
-% Reels are in allabreve time with half note beaming.
-reelTime = {
-  \time 2/2
-  \halfBeaming
-}
-% 4/4 marches are written with numerical time signature and with quarter beaming.
-marchTime = {
-  \time 4/4
-  \numericTimeSignature
-  \quarterBeaming
-}
-
 #(ly:set-option 'relative-includes #t)
 
 \include "lib/embellishments-fixed.ily"
 \include "lib/layout_tweaks.ily"
+\include "lib/timing.ily"
diff --git a/bagpipe.ly b/bagpipe.ly
index bd82872..f7da5d2 100644
--- a/bagpipe.ly
+++ b/bagpipe.ly
@@ -5,37 +5,15 @@
   Substantial changes and additions made by
   Sven Axelsson, the Murray Pipes & Drums of Gothenburg
   (http://www.murrays.nu)
+
+  Including this file will change the pitchnames used by lilypond.
 %}
 
 \version "2.19.28"
 
-% Some common timing tweaks.
-
-% Sets the autobeamer to span quarter notes only. Use for fast music.
-quarterBeaming = {
-  \set Score.baseMoment = #(ly:make-moment 1/4)
-  \set Score.beatStructure = #'(1 1 1 1)
-}
-% Sets the autobeamer to span half notes. Mostly used in reels.
-halfBeaming = {
-  \set Score.baseMoment = #(ly:make-moment 1/2)
-  \set Score.beatStructure = #'(1 1)
-}
-
-% Reels are in allabreve time with half note beaming.
-reelTime = {
-  \time 2/2
-  \halfBeaming
-}
-% 4/4 marches are written with numerical time signature and with quarter beaming.
-marchTime = {
-  \time 4/4
-  \numericTimeSignature
-  \quarterBeaming
-}
-
 #(ly:set-option 'relative-includes #t)
 
 \include "lib/pitchnames.ily"
 \include "lib/embellishments.ily"
 \include "lib/layout_tweaks.ily"
+\include "lib/timing.ily"
diff --git a/lib/timing.ily b/lib/timing.ily
new file mode 100644
index 0000000..dded132
--- /dev/null
+++ b/lib/timing.ily
@@ -0,0 +1,27 @@
+% =====================================	%
+%     Some common timing tweaks		%
+% =====================================	%
+
+% Sets the autobeamer to span quarter notes only. Use for fast music.
+quarterBeaming = {
+  \set Score.baseMoment = #(ly:make-moment 1/4)
+  \set Score.beatStructure = #'(1 1 1 1)
+}
+% Sets the autobeamer to span half notes. Mostly used in reels.
+halfBeaming = {
+  \set Score.baseMoment = #(ly:make-moment 1/2)
+  \set Score.beatStructure = #'(1 1)
+}
+
+% Reels are in allabreve time with half note beaming.
+reelTime = {
+  \time 2/2
+  \halfBeaming
+}
+% 4/4 marches are written with numerical time signature and with quarter beaming.
+marchTime = {
+  \time 4/4
+  \numericTimeSignature
+  \quarterBeaming
+}
+