diff --git a/libs.xml b/libs.xml
index eeecc9e0..a7ad3aef 100644
--- a/libs.xml
+++ b/libs.xml
@@ -25,6 +25,19 @@
 		<!-- For building lime -->
 		<lib global="true" name="hxp" /> <lib name="hxp" />
 		<lib global="true" name="format" /> <lib name="format" />
+
+		<!-- Extras -->
+		<!-- TODO: Remove this when hxcpp is updated -->
+		<!-- Adds a progress counter to compilation -->
+		<git name="hxcpp" url="https://github.com/NeeEoo/hxcpp" ref="codename" />
+	</if>
+
+	<!-- Hxcpp Building -->
+	<if cond="build-hxcpp || all">
+		<print pretty="true">Rebuilding Hxcpp...</print>
+
+		<!-- Build hxcpp -->
+		<cmd inLib="hxcpp" dir="tools/hxcpp" cmd="haxe compile.hxml" />
 	</if>
 
 	<!-- Lime Building -->
diff --git a/setup-dev.xml b/setup-dev.xml
index be2eedb2..c3de04d2 100644
--- a/setup-dev.xml
+++ b/setup-dev.xml
@@ -82,5 +82,17 @@
 		</cmd>
 	</if>
 
+	<if cond="hxcpp || all">
+		<cmd>
+			<line>cd dev-libs</line>
+			<line>git clone https://github.com/NeeEoo/hxcpp hxcpp</line>
+			<line>cd ..</line>
+			<line>haxelib dev hxcpp dev-libs/hxcpp</line>
+		</cmd>
+
+		<!-- Build hxcpp -->
+		<cmd inLib="hxcpp" dir="tools/hxcpp" cmd="haxe compile.hxml" />
+	</if>
+
 	<print pretty="true">Setup for dev libs complete!</print>
 </libraries>