diff --git a/Utilities/cmtar/CMakeLists.txt b/Utilities/cmtar/CMakeLists.txt
index dd503160a..1a5b35f6a 100644
--- a/Utilities/cmtar/CMakeLists.txt
+++ b/Utilities/cmtar/CMakeLists.txt
@@ -230,7 +230,9 @@ SET (MAKEDEV_THREE_ARGS 0)
 #SET (NEED_BASENAME 0)
 #SET (NEED_DIRNAME 0)
 #SET (NEED_FNMATCH 1)
-#SET (NEED_MAKEDEV 1)
+IF(UNIX)
+  SET (NEED_MAKEDEV 1)
+ENDIF(UNIX)
 #SET (NEED_SNPRINTF 0)
 #SET (NEED_STRDUP 0)
 #SET (NEED_STRLCPY 0)
@@ -269,8 +271,11 @@ FOREACH(hfile libtar.h tar.h compat/compat.h)
     ${LIBTAR_BINARY_DIR}/libtar/${outname} @ONLY IMMEDIATE)
 ENDFOREACH(hfile)
 
-CONFIGURE_FILE(${LIBTAR_SOURCE_DIR}/internal.h
-  ${LIBTAR_BINARY_DIR}/libtarint/internal.h @ONLY IMMEDIATE)
+FOREACH(hfile internal.h filesystem.h)
+  GET_FILENAME_COMPONENT(outname "${hfile}" NAME)
+  CONFIGURE_FILE(${LIBTAR_SOURCE_DIR}/${hfile}
+    ${LIBTAR_BINARY_DIR}/libtarint/${outname} @ONLY IMMEDIATE)
+ENDFOREACH(hfile)
   
 SET(libtar_SRC
   append.c
@@ -344,13 +349,6 @@ ENDIF(NOT HAVE_FNMATCH)
 #ENDIF(NOT HAVE_GLOB)
 
 
-IF(WIN32)
-SET(NEED_MAKEDEV 0)
-ELSE(WIN32)
-SET(NEED_MAKEDEV 1)
-ENDIF(WIN32)
-
-
 CONFIGURE_FILE(${LIBTAR_SOURCE_DIR}/config.h.in
   ${LIBTAR_BINARY_DIR}/libtar/config.h)
 
diff --git a/Utilities/cmtar/compat/basename.c b/Utilities/cmtar/compat/basename.c
index 21cc13ddd..3b87b0eb7 100644
--- a/Utilities/cmtar/compat/basename.c
+++ b/Utilities/cmtar/compat/basename.c
@@ -34,7 +34,7 @@ static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp
 #include <errno.h>
 #include <string.h>
 //#include <sys/param.h>
-#include <compat.h>
+#include <libtar/compat.h>
 
 char *
 openbsd_basename(path)
diff --git a/Utilities/cmtar/compat/dirname.c b/Utilities/cmtar/compat/dirname.c
index 63455a93b..f322bbd7d 100644
--- a/Utilities/cmtar/compat/dirname.c
+++ b/Utilities/cmtar/compat/dirname.c
@@ -34,7 +34,7 @@ static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $
 #include <errno.h>
 #include <string.h>
 //#include <sys/param.h>
-#include <compat.h>
+#include <libtar/compat.h>
 
 char *
 openbsd_dirname(path)
diff --git a/Utilities/cmtar/compat/fnmatch.c b/Utilities/cmtar/compat/fnmatch.c
index f1c5da1da..d10e8a35e 100644
--- a/Utilities/cmtar/compat/fnmatch.c
+++ b/Utilities/cmtar/compat/fnmatch.c
@@ -49,7 +49,7 @@ static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.6 1998/03/19 00:29:59 millert Exp
  * Compares a filename or pathname to a pattern.
  */
 
-#include <config.h>
+#include <libtar/config.h>
 
 #include <stdio.h>
 
@@ -61,7 +61,7 @@ static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.6 1998/03/19 00:29:59 millert Exp
 # include <ctype.h>
 #endif
 
-#include <compat.h>
+#include <libtar/compat.h>
 
 
 #define  EOS  '\0'
diff --git a/Utilities/cmtar/compat/snprintf.c b/Utilities/cmtar/compat/snprintf.c
index a6d8c0562..40c54d6ed 100644
--- a/Utilities/cmtar/compat/snprintf.c
+++ b/Utilities/cmtar/compat/snprintf.c
@@ -40,7 +40,7 @@
  *
  **************************************************************/
 
-#include <config.h>
+#include <libtar/config.h>
 
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
 
diff --git a/Utilities/cmtar/decode.c b/Utilities/cmtar/decode.c
index 39077de39..178ffc0f6 100644
--- a/Utilities/cmtar/decode.c
+++ b/Utilities/cmtar/decode.c
@@ -17,7 +17,7 @@
 #ifndef _MSC_VER
 #include <sys/param.h>
 #else
-#include <compat.h>
+#include <libtar/compat.h>
 #endif
 
 #ifndef WIN32
diff --git a/Utilities/cmtar/filesystem.c b/Utilities/cmtar/filesystem.c
index cc4f91225..3418d1edc 100644
--- a/Utilities/cmtar/filesystem.c
+++ b/Utilities/cmtar/filesystem.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <filesystem.h>
+#include <libtarint/filesystem.h>
 
 
 kwDirectory * kwOpenDir(const char* name)
diff --git a/Utilities/cmtar/wrapper.c b/Utilities/cmtar/wrapper.c
index fd80f3914..a54586244 100644
--- a/Utilities/cmtar/wrapper.c
+++ b/Utilities/cmtar/wrapper.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <libtar/compat.h>
 #ifdef _MSC_VER
-#include <filesystem.h>
+#include <libtarint/filesystem.h>
 #else
 #include <sys/param.h>
 #include <dirent.h>