diff --git a/eclipse/Clean-Client/.classpath b/eclipse/Clean-Client/.classpath
index f967232d74..7155e084c4 100644
--- a/eclipse/Clean-Client/.classpath
+++ b/eclipse/Clean-Client/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-common"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="jars/bin/jinput.jar">
 		<attributes>
diff --git a/eclipse/Clean-Client/.project b/eclipse/Clean-Client/.project
index 4f8b47977c..b972e1a007 100644
--- a/eclipse/Clean-Client/.project
+++ b/eclipse/Clean-Client/.project
@@ -30,6 +30,11 @@
 			<type>2</type>
 			<locationURI>MCP_LOC/src-base/minecraft</locationURI>
 		</link>
+		<link>
+			<name>src-common</name>
+			<type>2</type>
+			<locationURI>MCP_LOC/src-base/common</locationURI>
+		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
diff --git a/eclipse/Clean-Server/.classpath b/eclipse/Clean-Server/.classpath
index a4bd2c12dc..8022c83cde 100644
--- a/eclipse/Clean-Server/.classpath
+++ b/eclipse/Clean-Server/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-common"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="jars/minecraft_server.jar"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/eclipse/Clean-Server/.project b/eclipse/Clean-Server/.project
index a97d69ae5a..b931a716ff 100644
--- a/eclipse/Clean-Server/.project
+++ b/eclipse/Clean-Server/.project
@@ -25,6 +25,11 @@
 			<type>2</type>
 			<locationURI>MCP_LOC/src-base/minecraft_server</locationURI>
 		</link>
+		<link>
+			<name>src-common</name>
+			<type>2</type>
+			<locationURI>MCP_LOC/src-base/common</locationURI>
+		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
diff --git a/eclipse/FML-Client/.classpath b/eclipse/FML-Client/.classpath
index 6c173141a1..dd2c23157b 100644
--- a/eclipse/FML-Client/.classpath
+++ b/eclipse/FML-Client/.classpath
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="common"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-common"/>
 	<classpathentry kind="src" path="client"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry exported="true" kind="lib" path="jars/bin/jinput.jar">
diff --git a/eclipse/FML-Client/.project b/eclipse/FML-Client/.project
index 77812bb3f3..78c6fff4fa 100644
--- a/eclipse/FML-Client/.project
+++ b/eclipse/FML-Client/.project
@@ -45,6 +45,11 @@
 			<type>2</type>
 			<locationURI>MCP_LOC/src-work/minecraft</locationURI>
 		</link>
+		<link>
+			<name>src-common</name>
+			<type>2</type>
+			<locationURI>MCP_LOC/src-work/common</locationURI>
+		</link>
 		<link>
 			<name>common/fmlversion.properties</name>
 			<type>1</type>
diff --git a/eclipse/FML-Server/.classpath b/eclipse/FML-Server/.classpath
index 705ff03fef..f289c98f41 100644
--- a/eclipse/FML-Server/.classpath
+++ b/eclipse/FML-Server/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-common"/>
 	<classpathentry kind="src" path="common"/>
 	<classpathentry kind="src" path="server"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
diff --git a/eclipse/FML-Server/.project b/eclipse/FML-Server/.project
index ec9c6cc2eb..bb0b0b6ca0 100644
--- a/eclipse/FML-Server/.project
+++ b/eclipse/FML-Server/.project
@@ -40,6 +40,11 @@
 			<type>2</type>
 			<locationURI>MCP_LOC/src-work/minecraft_server</locationURI>
 		</link>
+		<link>
+			<name>src-common</name>
+			<type>2</type>
+			<locationURI>MCP_LOC/src-work/common</locationURI>
+		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
diff --git a/install/eclipse/Client/.classpath b/install/eclipse/Client/.classpath
index 399ff35904..91b4c3a4c2 100644
--- a/install/eclipse/Client/.classpath
+++ b/install/eclipse/Client/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="common"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="jars/bin/jinput.jar">
 		<attributes>
diff --git a/install/eclipse/Client/.project b/install/eclipse/Client/.project
index 34e3c295f2..60902bbefb 100644
--- a/install/eclipse/Client/.project
+++ b/install/eclipse/Client/.project
@@ -25,6 +25,11 @@
 			<type>2</type>
 			<locationURI>MCP_LOC/src/minecraft</locationURI>
 		</link>
+		<link>
+			<name>common</name>
+			<type>2</type>
+			<locationURI>MCP_LOC/src/common</locationURI>
+		</link>
 		<link>
 			<name>lib</name>
 			<type>2</type>
diff --git a/install/eclipse/Server/.classpath b/install/eclipse/Server/.classpath
index a4bd2c12dc..3e91196ef4 100644
--- a/install/eclipse/Server/.classpath
+++ b/install/eclipse/Server/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="common"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="jars/minecraft_server.jar"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/install/eclipse/Server/.project b/install/eclipse/Server/.project
index 1199d4f3b6..cd336f710c 100644
--- a/install/eclipse/Server/.project
+++ b/install/eclipse/Server/.project
@@ -25,6 +25,11 @@
 			<type>2</type>
 			<locationURI>MCP_LOC/src/minecraft_server</locationURI>
 		</link>
+		<link>
+			<name>common</name>
+			<type>2</type>
+			<locationURI>MCP_LOC/src/common</locationURI>
+		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>