diff --git a/desmume/src/SPU.cpp b/desmume/src/SPU.cpp
index 9d8279bad..2d640a17a 100644
--- a/desmume/src/SPU.cpp
+++ b/desmume/src/SPU.cpp
@@ -1,27 +1,25 @@
-/*  SPU.cpp
-    Copyright (C) 2006 yopyop
-    Copyright (C) 2006 Theo Berkau
-    Copyright (C) 2008-2012 DeSmuME team
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2006 Theo Berkau
+	Copyright (C) 2008-2012 DeSmuME team
 
-    Ideas borrowed from Stephane Dallongeville's SCSP core
+	Ideas borrowed from Stephane Dallongeville's SCSP core
 
-    This file is part of DeSmuME
+	This file is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
 
-    DeSmuME is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+	This file is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-    DeSmuME is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DeSmuME; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+	You should have received a copy of the GNU General Public License
+	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+
 #define _USE_MATH_DEFINES
 #include <math.h>
 #ifndef M_PI
diff --git a/desmume/src/matrix.h b/desmume/src/matrix.h
index f283b2eb5..2806b1800 100644
--- a/desmume/src/matrix.h
+++ b/desmume/src/matrix.h
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2006-2007 shash
-	Copyright (C) 2009-2010 DeSmuME team
+/*  
+	Copyright (C) 2006-2007 shash
+	Copyright (C) 2009-2012 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -111,6 +112,10 @@ FORCEINLINE s32 s32floor(float f)
 	return (s32)floorf(f);
 #endif
 }
+FORCEINLINE s32 s32floor(double d)
+{
+	return s32floor((float)d);
+}
 
 //switched SSE2 functions
 //-------------