-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
-#include <config.h>
-
-#include "rock.hpp"
-#include "sprite/sprite.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "lisp/writer.hpp"
-#include "video/drawing_context.hpp"
-#include "resources.hpp"
-#include "object_factory.hpp"
-
-Rock::Rock(const lisp::Lisp& reader)
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#include "audio/sound_manager.hpp"
+#include "object/rock.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/tile.hpp"
+
+namespace {
+const std::string ROCK_SOUND = "sounds/brick.wav"; //TODO use own sound.
+}
+
+Rock::Rock(const Vector& pos, std::string spritename) :
+ MovingSprite(pos, spritename),
+ physic(),
+ on_ground(),
+ grabbed(),
+ last_movement()