Includes implemented. Now it builds itself again, but the just.xml reading process is simplified.