8 files changed, 18 insertions, 11 deletions
diff --git a/src/md/CMakeLists.txt b/src/md/CMakeLists.txt
index d58569062e..09a305d4af 100644
--- a/src/md/CMakeLists.txt
+++ b/src/md/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory(runtime)
 add_subdirectory(enc)
 add_subdirectory(hotdata)
 add_subdirectory(ceefilegen)
+add_subdirectory(datasource)
 if(WIN32)
 add_subdirectory(winmd)
-add_subdirectory(datasource)
 endif(WIN32)
diff --git a/src/md/datasource/CMakeLists.txt b/src/md/datasource/CMakeLists.txt
index dd0f5ae4eb..a5f0758a78 100644
--- a/src/md/datasource/CMakeLists.txt
+++ b/src/md/datasource/CMakeLists.txt
@@ -1,10 +1,17 @@
-add_definitions(-DNO_CRT)
+if(CLR_CMAKE_PLATFORM_UNIX)
+    add_compile_options(-fPIC)
+endif(CLR_CMAKE_PLATFORM_UNIX)
+
+if(WIN32)
+    add_definitions(-DNO_CRT)
+endif(WIN32)
+
 
 set(MDDATASOURCE_SOURCES
   api.cpp
-  DataTargetReader.cpp
-  RemoteMDInternalRWSource.cpp
-  TargetTypes.cpp
+  datatargetreader.cpp
+  remotemdinternalrwsource.cpp
+  targettypes.cpp
 )
 
 convert_to_absolute_path(MDDATASOURCE_SOURCES ${MDDATASOURCE_SOURCES})
diff --git a/src/md/datasource/api.cpp b/src/md/datasource/api.cpp
index c65babeb8c..8c0fa6bed8 100644
--- a/src/md/datasource/api.cpp
+++ b/src/md/datasource/api.cpp
@@ -10,7 +10,7 @@
 //*****************************************************************************
 
 #include "stdafx.h"
-#include "RemoteMDInternalRWSource.h"
+#include "remotemdinternalrwsource.h"
 
 HRESULT CreateRemoteMDInternalRWSource(TADDR mdInternalRWRemoteAddress, ICorDebugDataTarget* pDataTarget, DWORD defines, DWORD dataStructureVersion, IMDCustomDataSource** ppDataSource)
 {
diff --git a/src/md/datasource/datatargetreader.cpp b/src/md/datasource/datatargetreader.cpp
index 259b567c2b..bef73a73c3 100644
--- a/src/md/datasource/datatargetreader.cpp
+++ b/src/md/datasource/datatargetreader.cpp
@@ -5,7 +5,7 @@
 
 
 #include "stdafx.h"
-#include "DataTargetReader.h"
+#include "datatargetreader.h"
 
 
 DataTargetReader::DataTargetReader(CORDB_ADDRESS remoteAddressCursor, ICorDebugDataTarget* pDataTarget, DWORD targetDefines, DWORD mdStructuresVersion) 
diff --git a/src/md/datasource/remotemdinternalrwsource.cpp b/src/md/datasource/remotemdinternalrwsource.cpp
index db881f80dc..0da82ce4be 100644
--- a/src/md/datasource/remotemdinternalrwsource.cpp
+++ b/src/md/datasource/remotemdinternalrwsource.cpp
@@ -10,7 +10,7 @@
 //*****************************************************************************
 
 #include "stdafx.h"
-#include "RemoteMDInternalRWSource.h"
+#include "remotemdinternalrwsource.h"
 
 RemoteMDInternalRWSource::RemoteMDInternalRWSource() :
 m_cRef(0)
diff --git a/src/md/datasource/remotemdinternalrwsource.h b/src/md/datasource/remotemdinternalrwsource.h
index 7625e68da6..247f2c0e9c 100644
--- a/src/md/datasource/remotemdinternalrwsource.h
+++ b/src/md/datasource/remotemdinternalrwsource.h
@@ -12,7 +12,7 @@
 #ifndef _REMOTE_MDINTERNALRW_SOURCE_
 #define _REMOTE_MDINTERNALRW_SOURCE_
 
-#include "TargetTypes.h"
+#include "targettypes.h"
 
 class RemoteMDInternalRWSource : IMDCustomDataSource
 {
diff --git a/src/md/datasource/targettypes.cpp b/src/md/datasource/targettypes.cpp
index fc78bc2c02..bf1b340b55 100644
--- a/src/md/datasource/targettypes.cpp
+++ b/src/md/datasource/targettypes.cpp
@@ -10,7 +10,7 @@
 //*****************************************************************************
 
 #include "stdafx.h"
-#include "TargetTypes.h"
+#include "targettypes.h"
 
 
 Target_CMiniMdSchemaBase::Target_CMiniMdSchemaBase() :
diff --git a/src/md/datasource/targettypes.h b/src/md/datasource/targettypes.h
index d6d266d768..36efb21980 100644
--- a/src/md/datasource/targettypes.h
+++ b/src/md/datasource/targettypes.h
@@ -12,7 +12,7 @@
 #ifndef _MD_TARGET_TYPES_
 #define _MD_TARGET_TYPES_
 
-#include "DataTargetReader.h"
+#include "datatargetreader.h"
 
 class Target_CMiniMdSchemaBase : public TargetObject
 {