diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7676461..2558c16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,8 @@ SET(LIBRARY_SOURCES
 )
 
 SET(LIBRARY_HEADERS
-	SDL2pp/Audio.hh
+	SDL2pp/AudioDevice.hh
+	SDL2pp/AudioSpec.hh
 	SDL2pp/ContainerRWops.hh
 	SDL2pp/Exception.hh
 	SDL2pp/Point.hh
diff --git a/SDL2pp/AudioDevice.cc b/SDL2pp/AudioDevice.cc
index 9a464b1..a2373e2 100644
--- a/SDL2pp/AudioDevice.cc
+++ b/SDL2pp/AudioDevice.cc
@@ -20,8 +20,9 @@
 */
 
 #include <SDL2pp/Exception.hh>
+#include <SDL2pp/AudioSpec.hh>
 
-#include <SDL2pp/Audio.hh>
+#include <SDL2pp/AudioDevice.hh>
 
 namespace SDL2pp {
 
diff --git a/SDL2pp/Audio.hh b/SDL2pp/AudioDevice.hh
similarity index 82%
rename from SDL2pp/Audio.hh
rename to SDL2pp/AudioDevice.hh
index e9c7511..7d87f3d 100644
--- a/SDL2pp/Audio.hh
+++ b/SDL2pp/AudioDevice.hh
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SDL2PP_AUDIO_HH
-#define SDL2PP_AUDIO_HH
+#ifndef SDL2PP_AUDIODEVICE_HH
+#define SDL2PP_AUDIODEVICE_HH
 
 #include <functional>
 #include <string>
@@ -31,23 +31,7 @@
 
 namespace SDL2pp {
 
-class AudioSpec : public SDL_AudioSpec {
-
-public:
-	AudioSpec();
-	AudioSpec(int freq, SDL_AudioFormat format, Uint8 channels, Uint16 samples);
-	~AudioSpec();
-
-	AudioSpec(AudioSpec&& other);
-	AudioSpec& operator=(AudioSpec&& other);
-	AudioSpec(const AudioSpec& other) = delete;
-	AudioSpec& operator=(const AudioSpec& other) = delete;
-
-	void MergeChanges(const SDL_AudioSpec& obtained);
-	const SDL_AudioSpec* Get() const;
-
-	bool IsSameFormat(const AudioSpec& other) const;
-};
+class AudioSpec;
 
 class AudioDevice {
 public:
diff --git a/SDL2pp/AudioLock.cc b/SDL2pp/AudioLock.cc
index b2d8754..55a1383 100644
--- a/SDL2pp/AudioLock.cc
+++ b/SDL2pp/AudioLock.cc
@@ -19,7 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <SDL2pp/Audio.hh>
+#include <SDL2pp/AudioDevice.hh>
 
 namespace SDL2pp {
 
diff --git a/SDL2pp/AudioSpec.cc b/SDL2pp/AudioSpec.cc
index e584384..bdf3569 100644
--- a/SDL2pp/AudioSpec.cc
+++ b/SDL2pp/AudioSpec.cc
@@ -21,7 +21,7 @@
 
 #include <algorithm>
 
-#include <SDL2pp/Audio.hh>
+#include <SDL2pp/AudioSpec.hh>
 
 namespace SDL2pp {
 
diff --git a/SDL2pp/AudioSpec.hh b/SDL2pp/AudioSpec.hh
new file mode 100644
index 0000000..e8bd0bd
--- /dev/null
+++ b/SDL2pp/AudioSpec.hh
@@ -0,0 +1,49 @@
+/*
+  libSDL2pp - C++11 bindings/wrapper for SDL2
+  Copyright (C) 2014 Dmitry Marakasov <amdmi3@amdmi3.ru>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL2PP_AUDIOSPEC_HH
+#define SDL2PP_AUDIOSPEC_HH
+
+#include <SDL2/SDL_audio.h>
+
+namespace SDL2pp {
+
+class AudioSpec : public SDL_AudioSpec {
+
+public:
+	AudioSpec();
+	AudioSpec(int freq, SDL_AudioFormat format, Uint8 channels, Uint16 samples);
+	~AudioSpec();
+
+	AudioSpec(AudioSpec&& other);
+	AudioSpec& operator=(AudioSpec&& other);
+	AudioSpec(const AudioSpec& other) = delete;
+	AudioSpec& operator=(const AudioSpec& other) = delete;
+
+	void MergeChanges(const SDL_AudioSpec& obtained);
+	const SDL_AudioSpec* Get() const;
+
+	bool IsSameFormat(const AudioSpec& other) const;
+};
+
+}
+
+#endif
diff --git a/SDL2pp/SDL2pp.hh b/SDL2pp/SDL2pp.hh
index d1a0816..dd352d1 100644
--- a/SDL2pp/SDL2pp.hh
+++ b/SDL2pp/SDL2pp.hh
@@ -26,7 +26,8 @@
 #include <SDL2pp/Config.hh>
 
 #include <SDL2pp/SDL.hh>
-#include <SDL2pp/Audio.hh>
+#include <SDL2pp/AudioDevice.hh>
+#include <SDL2pp/AudioSpec.hh>
 #include <SDL2pp/Window.hh>
 #include <SDL2pp/Renderer.hh>
 #include <SDL2pp/Texture.hh>
diff --git a/SDL2pp/Wav.hh b/SDL2pp/Wav.hh
index c503306..076576f 100644
--- a/SDL2pp/Wav.hh
+++ b/SDL2pp/Wav.hh
@@ -22,7 +22,9 @@
 #ifndef SDL2PP_WAV_HH
 #define SDL2PP_WAV_HH
 
-#include <SDL2pp/Audio.hh>
+#include <string>
+
+#include <SDL2pp/AudioSpec.hh>
 
 namespace SDL2pp {
 
diff --git a/demos/audio_sine.cc b/demos/audio_sine.cc
index e87d350..f82c285 100644
--- a/demos/audio_sine.cc
+++ b/demos/audio_sine.cc
@@ -24,7 +24,8 @@
 #include <SDL2/SDL.h>
 
 #include <SDL2pp/SDL.hh>
-#include <SDL2pp/Audio.hh>
+#include <SDL2pp/AudioDevice.hh>
+#include <SDL2pp/AudioSpec.hh>
 #include <SDL2pp/Exception.hh>
 
 using namespace SDL2pp;
diff --git a/demos/audio_wav.cc b/demos/audio_wav.cc
index 86a5be4..715f5a4 100644
--- a/demos/audio_wav.cc
+++ b/demos/audio_wav.cc
@@ -25,7 +25,8 @@
 #include <SDL2/SDL.h>
 
 #include <SDL2pp/SDL.hh>
-#include <SDL2pp/Audio.hh>
+#include <SDL2pp/AudioDevice.hh>
+#include <SDL2pp/AudioSpec.hh>
 #include <SDL2pp/Wav.hh>
 #include <SDL2pp/Exception.hh>