diff --git a/include/AutomationPattern.h b/include/AutomationPattern.h
index 7b0159d5d..ffe44318f 100644
--- a/include/AutomationPattern.h
+++ b/include/AutomationPattern.h
@@ -30,7 +30,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QPointer>
 
-#include "track.h"
+#include "Track.h"
 
 
 class AutomationTrack;
diff --git a/include/AutomationPatternView.h b/include/AutomationPatternView.h
index ab16ea5c9..23f68b559 100644
--- a/include/AutomationPatternView.h
+++ b/include/AutomationPatternView.h
@@ -25,7 +25,7 @@
 #ifndef AUTOMATION_PATTERN_VIEW_H
 #define AUTOMATION_PATTERN_VIEW_H
 
-#include "track.h"
+#include "Track.h"
 
 class AutomationPattern;
 
diff --git a/include/AutomationTrack.h b/include/AutomationTrack.h
index f3fca599a..84bb618da 100644
--- a/include/AutomationTrack.h
+++ b/include/AutomationTrack.h
@@ -27,7 +27,7 @@
 #ifndef AUTOMATION_TRACK_H
 #define AUTOMATION_TRACK_H
 
-#include "track.h"
+#include "Track.h"
 
 
 class AutomationTrack : public Track
diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h
index 4097b3da7..af20c5fb2 100644
--- a/include/InstrumentTrack.h
+++ b/include/InstrumentTrack.h
@@ -35,7 +35,7 @@
 #include "Piano.h"
 #include "PianoView.h"
 #include "Pitch.h"
-#include "track.h"
+#include "Track.h"
 
 
 class QLineEdit;
diff --git a/include/NotePlayHandle.h b/include/NotePlayHandle.h
index 52ae11d07..03b3fddd7 100644
--- a/include/NotePlayHandle.h
+++ b/include/NotePlayHandle.h
@@ -29,7 +29,7 @@
 #include "lmmsconfig.h"
 #include "note.h"
 #include "PlayHandle.h"
-#include "track.h"
+#include "Track.h"
 #include "MemoryManager.h"
 #include <QtCore/QAtomicInt>
 #include <QtCore/QReadWriteLock>
diff --git a/include/Pattern.h b/include/Pattern.h
index b66db7d0f..fdfd9ab57 100644
--- a/include/Pattern.h
+++ b/include/Pattern.h
@@ -34,7 +34,7 @@
 
 
 #include "note.h"
-#include "track.h"
+#include "Track.h"
 
 
 class QAction;
diff --git a/include/SampleTrack.h b/include/SampleTrack.h
index c982a2bd1..a776f821a 100644
--- a/include/SampleTrack.h
+++ b/include/SampleTrack.h
@@ -28,7 +28,7 @@
 #include <QDialog>
 
 #include "AudioPort.h"
-#include "track.h"
+#include "Track.h"
 
 class EffectRackView;
 class knob;
diff --git a/include/track.h b/include/Track.h
similarity index 99%
rename from include/track.h
rename to include/Track.h
index f04459776..944e9bd32 100644
--- a/include/track.h
+++ b/include/Track.h
@@ -1,5 +1,5 @@
 /*
- * track.h - declaration of classes concerning tracks -> necessary for all
+ * Track.h - declaration of classes concerning tracks -> necessary for all
  *           track-like objects (beat/bassline, sample-track...)
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
diff --git a/include/TrackContainer.h b/include/TrackContainer.h
index 9e24769a8..d932f32dd 100644
--- a/include/TrackContainer.h
+++ b/include/TrackContainer.h
@@ -28,7 +28,7 @@
 
 #include <QtCore/QReadWriteLock>
 
-#include "track.h"
+#include "Track.h"
 #include "JournallingObject.h"
 
 
diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h
index 564feb6fe..09b128a47 100644
--- a/include/TrackContainerView.h
+++ b/include/TrackContainerView.h
@@ -31,7 +31,7 @@
 #include <QWidget>
 
 
-#include "track.h"
+#include "Track.h"
 #include "JournallingObject.h"
 
 
diff --git a/include/bb_track.h b/include/bb_track.h
index c877024f6..25eb84c8e 100644
--- a/include/bb_track.h
+++ b/include/bb_track.h
@@ -30,7 +30,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QMap>
 
-#include "track.h"
+#include "Track.h"
 
 class trackLabelButton;
 class TrackContainer;
diff --git a/plugins/HydrogenImport/HydrogenImport.cpp b/plugins/HydrogenImport/HydrogenImport.cpp
index 2a8bb9e7c..414e1c58b 100644
--- a/plugins/HydrogenImport/HydrogenImport.cpp
+++ b/plugins/HydrogenImport/HydrogenImport.cpp
@@ -14,7 +14,7 @@
 #include "InstrumentTrack.h"
 #include "note.h"
 #include "Pattern.h"
-#include "track.h"
+#include "Track.h"
 #include "bb_track.h"
 #include "bb_track_container.h"
 #include "Instrument.h"
diff --git a/src/core/track.cpp b/src/core/Track.cpp
similarity index 99%
rename from src/core/track.cpp
rename to src/core/Track.cpp
index f791cbd08..db8d2d3f9 100644
--- a/src/core/track.cpp
+++ b/src/core/Track.cpp
@@ -1,5 +1,5 @@
 /*
- * track.cpp - implementation of classes concerning tracks -> necessary for
+ * Track.cpp - implementation of classes concerning tracks -> necessary for
  *             all track-like objects (beat/bassline, sample-track...)
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -23,7 +23,7 @@
  *
  */
 
-/** \file track.cpp
+/** \file Track.cpp
  *  \brief All classes concerning tracks and track-like objects
  */
 
@@ -35,7 +35,7 @@
  * \todo fill this out
  */
 
-#include "track.h"
+#include "Track.h"
 
 #include <assert.h>
 #include <cstdio>
diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp
index 692d60d63..6ffb8b1cf 100644
--- a/src/gui/TrackContainerView.cpp
+++ b/src/gui/TrackContainerView.cpp
@@ -44,7 +44,7 @@
 #include "rubberband.h"
 #include "song.h"
 #include "string_pair_drag.h"
-#include "track.h"
+#include "Track.h"
 
 
 TrackContainerView::TrackContainerView( TrackContainer * _tc ) :
diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp
index 11f4b5540..3de7751db 100644
--- a/src/gui/widgets/EnvelopeAndLfoView.cpp
+++ b/src/gui/widgets/EnvelopeAndLfoView.cpp
@@ -41,7 +41,7 @@
 #include "TempoSyncKnob.h"
 #include "text_float.h"
 #include "tooltip.h"
-#include "track.h"
+#include "Track.h"
 
 
 extern const float SECS_PER_ENV_SEGMENT;