diff -Naur miktex-2.7.3107/BuildUtilities/md5walk/md5walk.cpp /root/miktex-2.7.3107/BuildUtilities/md5walk/md5walk.cpp
--- miktex-2.7.3107/BuildUtilities/md5walk/md5walk.cpp	2008-07-16 09:25:15.000000000 +0000
+++ /root/miktex-2.7.3107/BuildUtilities/md5walk/md5walk.cpp	2008-03-06 19:40:33.000000000 +0000
@@ -21,7 +21,6 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include <memory> 
 
 #include <miktex/Core/Core>
 #include <popt-miktex.h>
diff -Naur miktex-2.7.3107/BuildUtilities/mpc/mpc.cpp /root/miktex-2.7.3107/BuildUtilities/mpc/mpc.cpp
--- miktex-2.7.3107/BuildUtilities/mpc/mpc.cpp	2008-07-16 09:25:58.000000000 +0000
+++ /root/miktex-2.7.3107/BuildUtilities/mpc/mpc.cpp	2008-03-17 20:06:34.000000000 +0000
@@ -20,7 +20,6 @@
 
 #include "StdAfx.h"
 #include "internal.h"
-#include <memory>
 
 const char * const TheNameOfTheGame = T_("MiKTeX Package Creator");
 
diff -Naur miktex-2.7.3107/Libraries/MiKTeX/Core/CommandLine.cpp /root/miktex-2.7.3107/Libraries/MiKTeX/Core/CommandLine.cpp
--- miktex-2.7.3107/Libraries/MiKTeX/Core/CommandLine.cpp	2008-07-16 09:09:19.000000000 +0000
+++ /root/miktex-2.7.3107/Libraries/MiKTeX/Core/CommandLine.cpp	2007-11-14 17:32:17.000000000 +0000
@@ -20,7 +20,7 @@
    02111-1307, USA. */
 
 #include "StdAfx.h"
-#include <memory>
+
 #include "internal.h"
 
 /* _________________________________________________________________________
diff -Naur miktex-2.7.3107/Libraries/MiKTeX/Core/include/miktex/Core/Core /root/miktex-2.7.3107/Libraries/MiKTeX/Core/include/miktex/Core/Core
--- miktex-2.7.3107/Libraries/MiKTeX/Core/include/miktex/Core/Core	2008-07-16 09:15:13.000000000 +0000
+++ /root/miktex-2.7.3107/Libraries/MiKTeX/Core/include/miktex/Core/Core	2008-07-01 15:16:51.000000000 +0000
@@ -55,7 +55,7 @@
 #  include <cstdarg>
 #  include <cstdlib>
 #  include <ctime>
-#  include <cstring>
+#  include <string>
 #  include <stdexcept>
 #  include <vector>
 #else
diff -Naur miktex-2.7.3107/Libraries/MiKTeX/Core/internal.h /root/miktex-2.7.3107/Libraries/MiKTeX/Core/internal.h
--- miktex-2.7.3107/Libraries/MiKTeX/Core/internal.h	2008-07-16 09:10:25.000000000 +0000
+++ /root/miktex-2.7.3107/Libraries/MiKTeX/Core/internal.h	2008-03-07 10:45:26.000000000 +0000
@@ -19,8 +19,6 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA. */
 
-#include <memory>
-
 #if defined(_MSC_VER) && ! defined(MIKTEX_STATIC)
 #  define MIKTEXCOREEXPORT __declspec(dllexport)
 #else
diff -Naur miktex-2.7.3107/Libraries/MiKTeX/Core/texmfroot.cpp /root/miktex-2.7.3107/Libraries/MiKTeX/Core/texmfroot.cpp
--- miktex-2.7.3107/Libraries/MiKTeX/Core/texmfroot.cpp	2008-07-16 08:55:14.000000000 +0000
+++ /root/miktex-2.7.3107/Libraries/MiKTeX/Core/texmfroot.cpp	2008-01-01 20:41:42.000000000 +0000
@@ -233,13 +233,11 @@
 	  UNEXPECTED_CONDITION
 	    ("SessionImpl::InitializeRootDirectories");
 	}
-	/* AVOIDING TEST FOR MULTIPLE ROOT DIRECTORIES IN $TEXMF AS IT FAILS ON GENTOO
       if (find(vec.begin(), vec.end(), root.GetCurrent()) != vec.end())
 	{
 	  UNEXPECTED_CONDITION
 	    ("SessionImpl::InitializeRootDirectories");
 	}
-	*/
       if (startupConfig.commonConfigRoot == root.GetCurrent())
 	{
 	  if ((GetPolicyFlags() & PolicyFlags::DataRootHighestPriority) != 0)
diff -Naur miktex-2.7.3107/Libraries/MiKTeX/Extractor/CabExtractor.h /root/miktex-2.7.3107/Libraries/MiKTeX/Extractor/CabExtractor.h
--- miktex-2.7.3107/Libraries/MiKTeX/Extractor/CabExtractor.h	2008-07-16 09:17:22.000000000 +0000
+++ /root/miktex-2.7.3107/Libraries/MiKTeX/Extractor/CabExtractor.h	2008-01-01 20:41:42.000000000 +0000
@@ -19,8 +19,6 @@
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA. */
 
-#include <memory>
-
 #if defined(_MSC_VER)
 #  pragma once
 #endif
diff -Naur miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarBzip2Extractor.h /root/miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarBzip2Extractor.h
--- miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarBzip2Extractor.h	2008-07-16 09:17:56.000000000 +0000
+++ /root/miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarBzip2Extractor.h	2007-11-14 17:32:17.000000000 +0000
@@ -19,8 +19,6 @@
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA. */
 
-#include <memory>
-
 #if defined(_MSC_VER)
 #  pragma once
 #endif
diff -Naur miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarExtractor.h /root/miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarExtractor.h
--- miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarExtractor.h	2008-07-16 09:18:18.000000000 +0000
+++ /root/miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarExtractor.h	2008-06-21 10:02:02.000000000 +0000
@@ -19,8 +19,6 @@
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA. */
 
-#include <memory>
-
 #if defined(_MSC_VER)
 #  pragma once
 #endif
diff -Naur miktex-2.7.3107/Libraries/MiKTeX/PackageManager/internal.h /root/miktex-2.7.3107/Libraries/MiKTeX/PackageManager/internal.h
--- miktex-2.7.3107/Libraries/MiKTeX/PackageManager/internal.h	2008-07-16 09:20:11.000000000 +0000
+++ /root/miktex-2.7.3107/Libraries/MiKTeX/PackageManager/internal.h	2008-06-27 15:12:15.000000000 +0000
@@ -19,8 +19,6 @@
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA. */
 
-#include <memory>
-
 #if defined(_MSC_VER) && ! defined(MIKTEX_STATIC)
 #  define MIKTEXMPMEXPORT __declspec(dllexport)
 #else
diff -Naur miktex-2.7.3107/Programs/MiKTeX/PackageManager/mpm/mpm.cpp /root/miktex-2.7.3107/Programs/MiKTeX/PackageManager/mpm/mpm.cpp
--- miktex-2.7.3107/Programs/MiKTeX/PackageManager/mpm/mpm.cpp	2008-07-16 09:23:20.000000000 +0000
+++ /root/miktex-2.7.3107/Programs/MiKTeX/PackageManager/mpm/mpm.cpp	2008-03-17 20:07:11.000000000 +0000
@@ -19,8 +19,6 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA. */
 
-#include<memory>
-#include<limits.h>
 #include "StdAfx.h"
 
 #include "internal.h"
diff -Naur miktex-2.7.3107/Programs/MiKTeX/initexmf/initexmf.cpp /root/miktex-2.7.3107/Programs/MiKTeX/initexmf/initexmf.cpp
--- miktex-2.7.3107/Programs/MiKTeX/initexmf/initexmf.cpp	2008-07-16 09:24:07.000000000 +0000
+++ /root/miktex-2.7.3107/Programs/MiKTeX/initexmf/initexmf.cpp	2008-01-01 20:41:42.000000000 +0000
@@ -33,7 +33,6 @@
 #include <stack>
 #include <string>
 #include <vector>
-#include <memory>
 
 #include "initexmf-version.h"