diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a39c19..a3b6b8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -353,5 +353,15 @@ add_executable(MakeTimestamp MakeTimestamp/MakeTimestamp.cpp)
 target_include_directories(MakeTimestamp PRIVATE PortabilityLayer UnixCompat)
 target_link_libraries(MakeTimestamp PortabilityLayer)
 
+add_executable(FTagData FTagData/FTagData.cpp)
+target_include_directories(FTagData PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	UnixCompat
+	)
+target_link_libraries(FTagData PortabilityLayer)
+
 
 install (TARGETS ${EXECNAME})
diff --git a/FTagData/FTagData.cpp b/FTagData/FTagData.cpp
index c0337df..03ede9f 100644
--- a/FTagData/FTagData.cpp
+++ b/FTagData/FTagData.cpp
@@ -1,11 +1,17 @@
 #include <stdio.h>
 #include <string>
-#include <Windows.h>
+
 #include "MacFileInfo.h"
 #include "CFileStream.h"
 #include "CombinedTimestamp.h"
 
+#ifdef _WIN32
+#include <Windows.h>
+
 #include "WindowsUnicodeToolShim.h"
+#else
+#include "UnixCompat.h"
+#endif
 
 int toolMain(int argc, const char **argv)
 {