diff --git a/project/vc9/nvcore/nvcore.vcproj b/project/vc9/nvcore/nvcore.vcproj
index 871e896..719e96f 100644
--- a/project/vc9/nvcore/nvcore.vcproj
+++ b/project/vc9/nvcore/nvcore.vcproj
@@ -290,6 +290,10 @@
 			RelativePath="..\..\..\src\nvcore\Array.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\..\src\nvcore\Array.inl"
+			>
+		</File>
 		<File
 			RelativePath="..\..\..\src\nvcore\Debug.cpp"
 			>
@@ -311,11 +315,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\src\nvcore\Library.cpp"
+			RelativePath="..\..\..\src\nvcore\ForEach.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\src\nvcore\Library.h"
+			RelativePath="..\..\..\src\nvcore\Hash.h"
 			>
 		</File>
 		<File
diff --git a/src/nvcore/CMakeLists.txt b/src/nvcore/CMakeLists.txt
index ee8bdc0..9246768 100644
--- a/src/nvcore/CMakeLists.txt
+++ b/src/nvcore/CMakeLists.txt
@@ -10,7 +10,6 @@ SET(CORE_SRCS
     DefsVcWin32.h
     FileSystem.h FileSystem.cpp
     ForEach.h
-    Library.h Library.cpp
     Memory.h Memory.cpp
     Ptr.h
     RefCounted.h
diff --git a/src/nvcore/Library.cpp b/src/nvcore/Library.cpp
deleted file mode 100644
index d757e8f..0000000
--- a/src/nvcore/Library.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-
-#include "Library.h"
-#include "Debug.h"
-
-#if NV_OS_WIN32
-#define WIN32_LEAN_AND_MEAN
-#define VC_EXTRALEAN
-#include <windows.h>
-#elif NV_OS_XBOX
-#include <Xtl.h>
-#else
-#include <dlfcn.h>
-#endif
-
-
-
-void * nvLoadLibrary(const char * name)
-{
-#if NV_OS_WIN32
-	return (void *)LoadLibraryExA( name, NULL, 0 );
-#elif NV_OS_XBOX
-    return (void *)LoadLibraryA( name );
-#else
-	return dlopen(name, RTLD_LAZY);
-#endif
-}
-
-void nvUnloadLibrary(void * handle)
-{
-	nvDebugCheck(handle != NULL);
-#if NV_OS_WIN32 || NV_OS_XBOX
-	FreeLibrary((HMODULE)handle);
-#else
-	dlclose(handle);
-#endif
-}
-
-void * nvBindSymbol(void * handle, const char * symbol)
-{
-#if NV_OS_WIN32 || NV_OS_XBOX
-	return (void *)GetProcAddress((HMODULE)handle, symbol);
-#else
-	return (void *)dlsym(handle, symbol);
-#endif	
-}
diff --git a/src/nvcore/Library.h b/src/nvcore/Library.h
deleted file mode 100644
index 999e662..0000000
--- a/src/nvcore/Library.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// This code is in the public domain -- castano@gmail.com
-
-#pragma once
-#ifndef NV_CORE_LIBRARY_H
-#define NV_CORE_LIBRARY_H
-
-#include "nvcore.h"
-
-#if NV_OS_WIN32
-#define LIBRARY_NAME(name)	#name ".dll"
-#elif NV_OS_DARWIN
-#define NV_LIBRARY_NAME(name)	"lib" #name ".dylib"
-#else
-#define NV_LIBRARY_NAME(name)	"lib" #name ".so"
-#endif
-
-NVCORE_API void * nvLoadLibrary(const char * name);
-NVCORE_API void nvUnloadLibrary(void * lib);
-NVCORE_API void * nvBindSymbol(void * lib, const char * symbol);
-
-class NVCORE_CLASS Library
-{
-public:
-	Library(const char * name)
-	{
-		handle = nvLoadLibrary(name);
-	}
-	~Library()
-	{
-		if (isValid())
-		{
-			nvUnloadLibrary(handle);
-		}
-	}
-	
-	bool isValid() const
-	{
-		return handle != NULL;
-	}
-	
-	void * bindSymbol(const char * symbol)
-	{
-		return nvBindSymbol(handle, symbol);
-	}
-	
-private:
-	void * handle;
-};
-
-
-#endif // NV_CORE_LIBRARY_H