diff --git a/platform/msvc2008/love.vcproj b/platform/msvc2008/love.vcproj
index 8e6521773..906d65c3c 100644
--- a/platform/msvc2008/love.vcproj
+++ b/platform/msvc2008/love.vcproj
@@ -3209,6 +3209,14 @@
 				RelativePath="..\..\src\common\Matrix.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\MemoryData.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\MemoryData.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\Module.h"
 				>
diff --git a/src/common/MemoryData.cpp b/src/common/MemoryData.cpp
new file mode 100644
index 000000000..ee7ebaccd
--- /dev/null
+++ b/src/common/MemoryData.cpp
@@ -0,0 +1,47 @@
+/**
+* Copyright (c) 2006-2009 LOVE Development Team
+* 
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+**/
+
+// LOVE
+#include "MemoryData.h"
+
+namespace love
+{	
+
+	MemoryData::MemoryData(void * data, int size)
+		: data(data), size(size)
+	{
+	}
+
+	MemoryData::~MemoryData()
+	{
+		// Memory should be static.
+	}
+
+	void * MemoryData::getData() const
+	{
+		return data;
+	}
+
+	int MemoryData::getSize() const
+	{
+		return size;
+	}
+
+} // love
diff --git a/src/common/MemoryData.h b/src/common/MemoryData.h
new file mode 100644
index 000000000..bf45ae23f
--- /dev/null
+++ b/src/common/MemoryData.h
@@ -0,0 +1,46 @@
+/**
+* Copyright (c) 2006-2009 LOVE Development Team
+* 
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* 
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+**/
+
+#ifndef LOVE_MEMORY_DATA_H
+#define LOVE_MEMORY_DATA_H
+
+// LOVE
+#include "Data.h"
+
+namespace love
+{	
+	class MemoryData : public Data
+	{
+	private:
+		void * data;
+		int size; 
+	public:
+
+		MemoryData(void * data, int size);
+		virtual ~MemoryData();
+
+		// Implements Data.
+		void * getData() const;
+		int getSize() const;
+
+	}; // MemoryData
+} // love
+
+#endif // LOVE_MEMORY_DATA_H
\ No newline at end of file
diff --git a/src/modules/filesystem/physfs/File.cpp b/src/modules/filesystem/physfs/File.cpp
index 6237c7d34..1a826fab7 100644
--- a/src/modules/filesystem/physfs/File.cpp
+++ b/src/modules/filesystem/physfs/File.cpp
@@ -25,7 +25,7 @@
 
 // LOVE
 #include "Filesystem.h"
-#include "FileData.h"
+#include <filesystem/FileData.h>
 
 namespace love
 {
diff --git a/src/modules/filesystem/physfs/Filesystem.h b/src/modules/filesystem/physfs/Filesystem.h
index ac506dc03..109806035 100644
--- a/src/modules/filesystem/physfs/Filesystem.h
+++ b/src/modules/filesystem/physfs/Filesystem.h
@@ -30,10 +30,8 @@
 #include <common/Module.h>
 #include <common/config.h>
 #include <common/constants.h>
-
-// Module
+#include <filesystem/FileData.h>
 #include "File.h"
-#include "FileData.h"
 
 // For great CWD. (Current Working Directory)
 // Using this instead of boost::filesystem which totally
diff --git a/src/modules/filesystem/physfs/wrap_FileData.h b/src/modules/filesystem/physfs/wrap_FileData.h
index 31004081b..a392b79b9 100644
--- a/src/modules/filesystem/physfs/wrap_FileData.h
+++ b/src/modules/filesystem/physfs/wrap_FileData.h
@@ -24,7 +24,7 @@
 // LOVE
 #include <common/runtime.h>
 
-#include "FileData.h"
+#include <filesystem/FileData.h>
 
 namespace love
 {
diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp
index 4b7535cb8..1b66637e5 100644
--- a/src/modules/graphics/opengl/Graphics.cpp
+++ b/src/modules/graphics/opengl/Graphics.cpp
@@ -400,8 +400,8 @@ namespace opengl
 		return new Frame(x, y, w, h, sw, sh);
 	}
 
-	Font * Graphics::newFont(love::filesystem::File * file, int size)
-	{
+	Font * Graphics::newFont(love::filesystem::File * file, int size)
+	{
 		Font * font = new TrueTypeFont(file, size);
 
 		// Load it and check for errors.
@@ -411,7 +411,7 @@ namespace opengl
 			return 0;
 		}
 
-		return font;
+		return font;
 	}
 
 	Font * Graphics::newImageFont(Image * image, const char * glyphs, float spacing)
diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h
index 9463277c8..e9d6b2c4d 100644
--- a/src/modules/graphics/opengl/Graphics.h
+++ b/src/modules/graphics/opengl/Graphics.h
@@ -244,7 +244,7 @@ namespace opengl
 		/**
 		* Creates a Font object.
 		**/
-		Font * newFont(love::filesystem::File * file, int size = 12);
+		Font * newFont(love::filesystem::File * file, int size);
 
 		/**
 		* Creates an ImageFont object.