// see below for copyright information on the second portion of this file
#include <java/lang/String.h>
-#include <org/ibex/Surface.h>
-#include <org/ibex/Picture.h>
+#include <org/ibex/graphics/Surface.h>
+#include <org/ibex/graphics/Picture.h>
#include <org/ibex/js/JS.h>
-#include <org/ibex/Box.h>
+#include <org/ibex/core/Box.h>
#include <org/ibex/util/Semaphore.h>
-#include <org/ibex/Platform.h>
+#include <org/ibex/plat/Platform.h>
#include <java/lang/Long.h>
#include <java/util/Hashtable.h>
#include <org/ibex/util/Log.h>