Index: src/CodeTools/TrackLoc.cc
===================================================================
--- src/CodeTools/TrackLoc.cc	(revision fa21ac9d92ef632e6c4267d08a93662032644c8d)
+++ src/CodeTools/TrackLoc.cc	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -85,5 +85,5 @@
 		}
 
-		void postvisit(BaseSyntaxNode * node) {
+		void postvisit( __attribute__((unused)) BaseSyntaxNode * node ) {
 			parents.pop();
 		}
Index: src/Common/Assert.cc
===================================================================
--- src/Common/Assert.cc	(revision fa21ac9d92ef632e6c4267d08a93662032644c8d)
+++ src/Common/Assert.cc	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -21,9 +21,9 @@
 extern const char * __progname;							// global name of running executable (argv[0])
 
-#define CFA_ASSERT_FMT "*CFA assertion error* from program \"%s\" in \"%s\" at line %d in file \"%s\""
+#define CFA_ASSERT_FMT "*CFA assertion error* \"%s\" from program \"%s\" in \"%s\" at line %d in file \"%s\""
 
 // called by macro assert in assert.h
 void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
-	fprintf( stderr, CFA_ASSERT_FMT ".\n", __progname, function, line, file );
+	fprintf( stderr, CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );
 	abort();
 }
@@ -31,5 +31,5 @@
 // called by macro assertf
 void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) {
-	fprintf( stderr, CFA_ASSERT_FMT ": ", __progname, function, line, file );
+	fprintf( stderr, CFA_ASSERT_FMT ": ", assertion, __progname, function, line, file );
 	va_list args;
 	va_start( args, fmt );
Index: src/Common/PassVisitor.proto.h
===================================================================
--- src/Common/PassVisitor.proto.h	(revision fa21ac9d92ef632e6c4267d08a93662032644c8d)
+++ src/Common/PassVisitor.proto.h	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -23,5 +23,5 @@
 
 template<typename pass_type, typename node_type>
-static inline void previsit_impl( __attribute__((unused)) pass_type& pass, node_type * node, __attribute__((unused)) long unused ) {}
+static inline void previsit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) node_type * node, __attribute__((unused)) long unused ) {}
 
 
@@ -32,5 +32,5 @@
 
 template<typename pass_type, typename node_type>
-static inline void postvisit_impl( __attribute__((unused)) pass_type& pass, node_type * node, __attribute__((unused)) long unused ) {}
+static inline void postvisit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) node_type * node, __attribute__((unused)) long unused ) {}
 
 // Mutate
@@ -41,5 +41,5 @@
 
 template<typename pass_type, typename node_type>
-static inline void premutate_impl( __attribute__((unused)) pass_type& pass, node_type * node, __attribute__((unused)) long unused ) {}
+static inline void premutate_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) node_type * node, __attribute__((unused)) long unused ) {}
 
 
@@ -71,9 +71,9 @@
 
 // Fields
-#define FIELD_PTR( type, name )                                                                                                                  \
-template<typename pass_type>                                                                                                                     \
-static inline auto name##_impl( pass_type& pass, __attribute__((unused)) int unused ) ->decltype( &pass.name ) { return &pass.name; }          \
-                                                                                                                                                 \
-template<typename pass_type>                                                                                                                     \
+#define FIELD_PTR( type, name )                                                                                                        \
+template<typename pass_type>                                                                                                           \
+static inline auto name##_impl( pass_type& pass, __attribute__((unused)) int unused ) ->decltype( &pass.name ) { return &pass.name; }  \
+                                                                                                                                       \
+template<typename pass_type>                                                                                                           \
 static inline type * name##_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) long unused ) { return nullptr;}    \
 
Index: src/Parser/ParseNode.h
===================================================================
--- src/Parser/ParseNode.h	(revision fa21ac9d92ef632e6c4267d08a93662032644c8d)
+++ src/Parser/ParseNode.h	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -61,6 +61,6 @@
 	}
 
-	virtual void print( std::ostream &os, int indent = 0 ) const {}
-	virtual void printList( std::ostream &os, int indent = 0 ) const {}
+	virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
+	virtual void printList( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
 
 	static int indent_by;
@@ -113,6 +113,6 @@
 	ExpressionNode * set_extension( bool exten ) { extension = exten; return this; }
 
-	virtual void print( std::ostream &os, int indent = 0 ) const override {}
-	void printOneLine( std::ostream &os, int indent = 0 ) const {}
+	virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {}
+	void printOneLine( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
 
 	template<typename T>
@@ -283,6 +283,6 @@
 	}
 
-	virtual void print( std::ostream &os, int indent = 0 ) const override;
-	virtual void printList( std::ostream &os, int indent = 0 ) const override;
+	virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override;
+	virtual void printList( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override;
 
 	Declaration * build() const;
@@ -363,6 +363,6 @@
 	virtual StatementNode * append_last_case( StatementNode * );
 
-	virtual void print( std::ostream &os, int indent = 0 ) const override {}
-	virtual void printList( std::ostream &os, int indent = 0 ) const override {}
+	virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {}
+	virtual void printList( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {}
   private:
 	std::unique_ptr<Statement> stmt;
Index: src/SynTree/Statement.cc
===================================================================
--- src/SynTree/Statement.cc	(revision fa21ac9d92ef632e6c4267d08a93662032644c8d)
+++ src/SynTree/Statement.cc	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -30,5 +30,5 @@
 Statement::Statement( std::list<Label> _labels ) : labels( _labels ) {}
 
-void Statement::print( std::ostream &, int indent ) const {}
+void Statement::print( __attribute__((unused)) std::ostream &, __attribute__((unused)) int indent ) const {}
 
 Statement::~Statement() {}
@@ -365,5 +365,5 @@
 NullStmt::NullStmt() : CompoundStmt( std::list<Label>() ) {}
 
-void NullStmt::print( std::ostream &os, int indent ) const {
+void NullStmt::print( std::ostream &os, __attribute__((unused)) int indent ) const {
 	os << "Null Statement" << endl ;
 }
Index: src/SynTree/Type.h
===================================================================
--- src/SynTree/Type.h	(revision fa21ac9d92ef632e6c4267d08a93662032644c8d)
+++ src/SynTree/Type.h	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -334,5 +334,5 @@
 	virtual void print( std::ostream & os, int indent = 0 ) const;
 
-	virtual void lookup( const std::string & name, std::list< Declaration* > & foundDecls ) const {}
+	virtual void lookup( __attribute__((unused)) const std::string & name, __attribute__((unused)) std::list< Declaration* > & foundDecls ) const {}
   protected:
 	virtual std::string typeString() const = 0;
Index: src/SynTree/Visitor.cc
===================================================================
--- src/SynTree/Visitor.cc	(revision fa21ac9d92ef632e6c4267d08a93662032644c8d)
+++ src/SynTree/Visitor.cc	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -122,5 +122,5 @@
 }
 
-void Visitor::visit( BranchStmt *branchStmt ) {
+void Visitor::visit( __attribute__((unused)) BranchStmt *branchStmt ) {
 }
 
@@ -143,5 +143,5 @@
 }
 
-void Visitor::visit( NullStmt *nullStmt ) {
+void Visitor::visit( __attribute__((unused)) NullStmt *nullStmt ) {
 }
 
@@ -445,8 +445,8 @@
 
 
-void Visitor::visit( Subrange *subrange ) {}
-
-
-void Visitor::visit( Constant *constant ) {}
+void Visitor::visit( __attribute__((unused)) Subrange *subrange ) {}
+
+
+void Visitor::visit( __attribute__((unused)) Constant *constant ) {}
 // Local Variables: //
 // tab-width: 4 //
Index: src/driver/cc1.cc
===================================================================
--- src/driver/cc1.cc	(revision fa21ac9d92ef632e6c4267d08a93662032644c8d)
+++ src/driver/cc1.cc	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -84,5 +84,5 @@
 
 
-void sigTermHandler( int signal ) {
+void sigTermHandler( __attribute__((unused)) int signal ) {
 	if ( tmpfilefd != -1 ) {							// RACE, file created ?
 		rmtmpfile();									// remove
@@ -469,5 +469,5 @@
 
 
-int main( const int argc, const char * const argv[], const char * const env[] ) {
+int main( const int argc, const char * const argv[], __attribute__((unused)) const char * const env[] ) {
 #ifdef __DEBUG_H__
 	for ( int i = 0; env[i] != NULL; i += 1 ) {
Index: src/main.cc
===================================================================
--- src/main.cc	(revision fa21ac9d92ef632e6c4267d08a93662032644c8d)
+++ src/main.cc	(revision b3c36f41fb2d199b6fa2a40962f5aafe79f7ceeb)
@@ -146,5 +146,5 @@
 } // sigSegvBusHandler
 
-void sigAbortHandler( int sig_num ) {
+void sigAbortHandler( __attribute__((unused)) int sig_num ) {
 	backtrace( 6 );										// skip first 6 stack frames
 	signal( SIGABRT, SIG_DFL);							// reset default signal handler