diff --git a/dmd/declaration.h b/dmd/declaration.h
index 7fed9e9a..3ed47af7 100644
--- a/dmd/declaration.h
+++ b/dmd/declaration.h
@@ -139,7 +139,7 @@ struct Declaration : Dsymbol
     Declaration *isDeclaration() { return this; }
 
     // llvm
-    virtual void toObjFile();           // compile to .obj file
+    virtual void toObjFile(int unused = 0);           // compile to .obj file
 };
 
 /**************************************************************/
diff --git a/dmd/module.c b/dmd/module.c
index e95b46cd..f5b5a6de 100644
--- a/dmd/module.c
+++ b/dmd/module.c
@@ -613,7 +613,7 @@ void Module::parse()
     }
 }
 
-void Module::semantic()
+void Module::semantic(Scope* unused_sc)
 {   int i;
 
     if (semanticstarted)
@@ -661,7 +661,7 @@ void Module::semantic()
     //printf("-Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent);
 }
 
-void Module::semantic2()
+void Module::semantic2(Scope* unused_sc)
 {   int i;
 
     if (deferred.dim)
@@ -700,7 +700,7 @@ void Module::semantic2()
     //printf("-Module::semantic2('%s'): parent = %p\n", toChars(), parent);
 }
 
-void Module::semantic3()
+void Module::semantic3(Scope* unused_sc)
 {   int i;
 
     //printf("Module::semantic3('%s'): parent = %p\n", toChars(), parent);
diff --git a/dmd/module.h b/dmd/module.h
index 95533cfe..a1caa5bb 100644
--- a/dmd/module.h
+++ b/dmd/module.h
@@ -126,9 +126,9 @@ struct Module : Package
 #else
     void parse();	// syntactic parse
 #endif
-    void semantic();	// semantic analysis
-    void semantic2();	// pass 2 semantic analysis
-    void semantic3();	// pass 3 semantic analysis
+    void semantic(Scope* unused_sc = NULL);	// semantic analysis
+    void semantic2(Scope* unused_sc = NULL);	// pass 2 semantic analysis
+    void semantic3(Scope* unused_sc = NULL);	// pass 3 semantic analysis
     void inlineScan();	// scan for functions to inline
 #ifdef _DH
     void genhdrfile();  // generate D import file
diff --git a/gen/d-asm-i386.h b/gen/d-asm-i386.h
index 98d83917..790da45c 100644
--- a/gen/d-asm-i386.h
+++ b/gen/d-asm-i386.h
@@ -1,7 +1,7 @@
 // Taken from GDC source tree. Original by David Friedman.
 // Released under the Artistic License found in dmd/artistic.txt
 
-#include "dmd/id.h"
+#include "id.h"
 
 typedef enum {
     Reg_Invalid = -1,
diff --git a/gen/toobj.cpp b/gen/toobj.cpp
index 38ce4cd5..3da0daf1 100644
--- a/gen/toobj.cpp
+++ b/gen/toobj.cpp
@@ -879,7 +879,7 @@ void Dsymbol::toObjFile(int multiobj)
 
 /* ================================================================== */
 
-void Declaration::toObjFile()
+void Declaration::toObjFile(int unused)
 {
     Logger::println("Ignoring Declaration::toObjFile for %s", toChars());
 }