diff --git a/engines/asylum/asylum.cpp b/engines/asylum/asylum.cpp
index 101c78dc2a9..c4ce272e18f 100644
--- a/engines/asylum/asylum.cpp
+++ b/engines/asylum/asylum.cpp
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #include "common/config-manager.h"
@@ -90,8 +94,6 @@ Common::Error AsylumEngine::go() {
     // ScummVM window alive until ESC is pressed.
     // This will facilitate drawing tests ;)
 
-    uint32 lastRefresh = 0;
-
 	Common::EventManager *em = _system->getEventManager();
 	while (!shouldQuit()) {
 		Common::Event ev;
@@ -157,7 +159,7 @@ void AsylumEngine::showMainMenu() {
 	GraphicResource *cur = _resMgr->getGraphic(1, 2)->getEntry(0);
 
 	_system->setMouseCursor(cur->data, cur->width, cur->height, 1, 1, 0);
-	// FIXME: is there any reason why the cursor palette is set here, 
+	// FIXME: is there any reason why the cursor palette is set here,
 	// when it's the same as the rest of the game's palette?
 	//_system->setCursorPalette(pal, 0, 1024);
 	_system->showMouse(true);
diff --git a/engines/asylum/asylum.h b/engines/asylum/asylum.h
index 2b95a925d79..3c91581e147 100644
--- a/engines/asylum/asylum.h
+++ b/engines/asylum/asylum.h
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #ifndef ASYLUM_ENGINE_H
diff --git a/engines/asylum/bundle.cpp b/engines/asylum/bundle.cpp
index 02757fed6fa..8eb3793c63d 100644
--- a/engines/asylum/bundle.cpp
+++ b/engines/asylum/bundle.cpp
@@ -17,10 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
+
 #include "common/file.h"
 
-#include "asylum/bundles/bundle.h"
+#include "asylum/bundle.h"
 
 namespace Asylum {
 
diff --git a/engines/asylum/bundle.h b/engines/asylum/bundle.h
index 4f5fb9042f0..6c875ba356f 100644
--- a/engines/asylum/bundle.h
+++ b/engines/asylum/bundle.h
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #ifndef ASYLUM_BUNDLE_H_
diff --git a/engines/asylum/detection.cpp b/engines/asylum/detection.cpp
index b08b38a5bb2..037949fd0ab 100644
--- a/engines/asylum/detection.cpp
+++ b/engines/asylum/detection.cpp
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #include "common/config-manager.h"
@@ -36,14 +40,14 @@ static const PlainGameDescriptor asylumGames[] = {
 namespace Asylum {
 
 static const ADGameDescription gameDescriptions[] = {
-	{ 
+	{
 		"asylum",
 		0,
 		AD_ENTRY1s("SNTRM.DAT", "280b4a72f70f3073e9dbc9a9cfa25518", 8930),
 		Common::EN_ANY,
 		Common::kPlatformPC,
 		ADGF_NO_FLAGS
-	},		
+	},
 	AD_TABLE_END_MARKER
 };
 
@@ -106,9 +110,9 @@ bool AsylumMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGa
 	return desc != 0;
 }
 
-SaveStateList AsylumMetaEngine::listSaves(const char *target) const {	
+SaveStateList AsylumMetaEngine::listSaves(const char *target) const {
 	SaveStateList saveList;
-	
+
 	return saveList;
 }
 
diff --git a/engines/asylum/graphicbundle.cpp b/engines/asylum/graphicbundle.cpp
index 6ffc0df38ed..b100f2db379 100644
--- a/engines/asylum/graphicbundle.cpp
+++ b/engines/asylum/graphicbundle.cpp
@@ -17,9 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
-#include "asylum/bundles/graphicbundle.h"
+#include "asylum/graphicbundle.h"
 
 namespace Asylum {
 
diff --git a/engines/asylum/graphicbundle.h b/engines/asylum/graphicbundle.h
index c30683dc877..6f7679336b4 100644
--- a/engines/asylum/graphicbundle.h
+++ b/engines/asylum/graphicbundle.h
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #ifndef ASYLUM_GRAPHICBUNDLE_H_
diff --git a/engines/asylum/module.mk b/engines/asylum/module.mk
index 217ebab11db..6341b14f7bb 100644
--- a/engines/asylum/module.mk
+++ b/engines/asylum/module.mk
@@ -5,7 +5,7 @@ MODULE_OBJS := \
 	bundle.o \
 	detection.o \
 	graphicbundle.o \
-	movie.o \
+	video.o \
 	resman.o \
 	screen.o
 
diff --git a/engines/asylum/resman.cpp b/engines/asylum/resman.cpp
index e73dcd4a302..ac11e62b096 100644
--- a/engines/asylum/resman.cpp
+++ b/engines/asylum/resman.cpp
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #include "asylum/resman.h"
@@ -41,7 +45,7 @@ void ResourceManager::getPalette(uint8 fileNum, uint32 offset, byte *palette) {
 	char filename[256];
 	sprintf(filename, "res.%03d", fileNum);
 	palFile.open(filename);
-	
+
 	// Read entries
 	/*uint32 entryCount =*/ palFile.readUint32LE();
 	palFile.skip(4 * offset);
diff --git a/engines/asylum/resman.h b/engines/asylum/resman.h
index a940e91a8af..25afd1806da 100644
--- a/engines/asylum/resman.h
+++ b/engines/asylum/resman.h
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #ifndef ASYLUM_RESOURCEMANAGER_H_
diff --git a/engines/asylum/resource.h b/engines/asylum/resource.h
index 2685e4e863a..aa978ec0eb1 100644
--- a/engines/asylum/resource.h
+++ b/engines/asylum/resource.h
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #ifndef ASYLUM_RESOURCE_H_
diff --git a/engines/asylum/screen.cpp b/engines/asylum/screen.cpp
index f560d0aff6f..45d2f4400d2 100644
--- a/engines/asylum/screen.cpp
+++ b/engines/asylum/screen.cpp
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #include "common/system.h"
diff --git a/engines/asylum/screen.h b/engines/asylum/screen.h
index f2b88460913..f513000f4b4 100644
--- a/engines/asylum/screen.h
+++ b/engines/asylum/screen.h
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #ifndef ASYLUM_SCREEN_H
diff --git a/engines/asylum/video.cpp b/engines/asylum/video.cpp
index 420dfda6c46..77b83c6fd71 100644
--- a/engines/asylum/video.cpp
+++ b/engines/asylum/video.cpp
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #include "asylum/video.h"
diff --git a/engines/asylum/video.h b/engines/asylum/video.h
index 5f104bc18fe..b47147933d4 100644
--- a/engines/asylum/video.h
+++ b/engines/asylum/video.h
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
  */
 
 #ifndef ASYLUM_VIDEO_H_