diff --git a/Samples/PeerConnection/CMakeLists.txt b/Samples/PeerConnection/CMakeLists.txt
index 4556989..c369e66 100644
--- a/Samples/PeerConnection/CMakeLists.txt
+++ b/Samples/PeerConnection/CMakeLists.txt
@@ -15,6 +15,18 @@ set(PEERCONNECTION_SOURCE_FILES
         SetRemoteSessionDescriptionObserver.cpp
 )
 
+set(PEERCONNECTION_HEADER_FILES
+        Console.h
+        Core.h
+        CreateSessionObserver.h
+        DataChannelObserver.h
+        IPeer.h
+        Peer.h
+        PeerConnectionObserver.h
+        SetLocalSessionDescriptionObserver.h
+        SetRemoteSessionDescriptionObserver.h
+)
+
 include_directories(${CMAKE_SOURCE_DIR}/out/src)
 
 if(WIN)
@@ -24,7 +36,7 @@ else(WIN)
     set(PEERCONNECTION_SOURCE_FILES ${PEERCONNECTION_SOURCE_FILES} UnixConsole.cpp)
 endif(WIN)
 
-add_executable(PeerConnection ${PEERCONNECTION_SOURCE_FILES})
+add_executable(PeerConnection ${PEERCONNECTION_SOURCE_FILES} ${PEERCONNECTION_HEADER_FILES})
 
 set(PEERCONNECTION_LIBRARIES ${CMAKE_BINARY_DIR}/${LIBWEBRTC_LIBRARY} Threads::Threads)
 
diff --git a/Samples/PeerConnection/UnixConsole.h b/Samples/PeerConnection/Console.h
similarity index 100%
rename from Samples/PeerConnection/UnixConsole.h
rename to Samples/PeerConnection/Console.h
diff --git a/Samples/PeerConnection/CreateSessionObserver.cpp b/Samples/PeerConnection/CreateSessionObserver.cpp
index c53d36f..cc932dc 100644
--- a/Samples/PeerConnection/CreateSessionObserver.cpp
+++ b/Samples/PeerConnection/CreateSessionObserver.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "CreateSessionObserver.h"
-#include "UnixConsole.h"
+#include "Console.h"
 #include "Peer.h"
 #include "SetLocalSessionDescriptionObserver.h"
 
diff --git a/Samples/PeerConnection/DataChannelObserver.cpp b/Samples/PeerConnection/DataChannelObserver.cpp
index fde3c5e..4de742f 100644
--- a/Samples/PeerConnection/DataChannelObserver.cpp
+++ b/Samples/PeerConnection/DataChannelObserver.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "DataChannelObserver.h"
-#include "UnixConsole.h"
+#include "Console.h"
 
 
 DataChannelObserver::DataChannelObserver(
diff --git a/Samples/PeerConnection/SetLocalSessionDescriptionObserver.cpp b/Samples/PeerConnection/SetLocalSessionDescriptionObserver.cpp
index 46897bd..68836a4 100644
--- a/Samples/PeerConnection/SetLocalSessionDescriptionObserver.cpp
+++ b/Samples/PeerConnection/SetLocalSessionDescriptionObserver.cpp
@@ -4,7 +4,7 @@
 
 #include <third_party/jsoncpp/source/include/json/writer.h>
 #include "SetLocalSessionDescriptionObserver.h"
-#include "UnixConsole.h"
+#include "Console.h"
 
 SetLocalSessionDescriptionObserver::SetLocalSessionDescriptionObserver(
     webrtc::SessionDescriptionInterface* desc): _desc(desc) {
diff --git a/Samples/PeerConnection/SetRemoteSessionDescriptionObserver.cpp b/Samples/PeerConnection/SetRemoteSessionDescriptionObserver.cpp
index 9fd9715..2635b42 100644
--- a/Samples/PeerConnection/SetRemoteSessionDescriptionObserver.cpp
+++ b/Samples/PeerConnection/SetRemoteSessionDescriptionObserver.cpp
@@ -4,7 +4,7 @@
 
 #include "SetRemoteSessionDescriptionObserver.h"
 #include "CreateSessionObserver.h"
-#include "UnixConsole.h"
+#include "Console.h"
 
 
 SetRemoteSessionDescriptionObserver::SetRemoteSessionDescriptionObserver(
diff --git a/Samples/PeerConnection/UnixConsole.cpp b/Samples/PeerConnection/UnixConsole.cpp
index b49fa9e..dea6fd3 100644
--- a/Samples/PeerConnection/UnixConsole.cpp
+++ b/Samples/PeerConnection/UnixConsole.cpp
@@ -10,7 +10,7 @@
 #include <fcntl.h>
 #include <termios.h>
 #include <unistd.h>
-#include "UnixConsole.h"
+#include "Console.h"
 
 static int ttyErase;
 static int ttyEof;
diff --git a/Samples/PeerConnection/main.cpp b/Samples/PeerConnection/main.cpp
index 357758a..c99b3bb 100644
--- a/Samples/PeerConnection/main.cpp
+++ b/Samples/PeerConnection/main.cpp
@@ -5,7 +5,7 @@
 #include "DataChannelObserver.h"
 #include "Peer.h"
 #include "SetRemoteSessionDescriptionObserver.h"
-#include "UnixConsole.h"
+#include "Console.h"
 
 enum {
   STATE_EXCHANGE = 0,