8 files changed, 12 insertions, 16 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index 1ad607d76..b1ab67598 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(SRCS    citra.cpp
             emu_window/emu_window_glfw.cpp)
-set(HEADERS citra.h
-            resource.h)
+set(HEADERS resource.h)
 
 # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
 if (NOT X11_xf86vmode_LIB)
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 036af3735..9399ff296 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -12,8 +12,6 @@
 
 #include "citra/emu_window/emu_window_glfw.h"
 
-#include "citra/citra.h"
-
 /// Application entry point
 int __cdecl main(int argc, char **argv) {
     LogManager::Init();
diff --git a/src/citra/citra.h b/src/citra/citra.h
deleted file mode 100644
index b3b78a2dc..000000000
--- a/src/citra/citra.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj
index d81ac5bfc..bda1ed07d 100644
--- a/src/citra/citra.vcxproj
+++ b/src/citra/citra.vcxproj
@@ -203,7 +203,6 @@
     <ClCompile Include="emu_window\emu_window_glfw.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="citra.h" />
     <ClInclude Include="emu_window\emu_window_glfw.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
@@ -213,4 +212,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters
index b2685691f..78954670e 100644
--- a/src/citra/citra.vcxproj.filters
+++ b/src/citra/citra.vcxproj.filters
@@ -12,7 +12,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="citra.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="emu_window\emu_window_glfw.h">
       <Filter>emu_window</Filter>
@@ -21,4 +20,4 @@
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/common/math_util.h b/src/common/math_util.h
index 65220fbdf..b32e7bb14 100644
--- a/src/common/math_util.h
+++ b/src/common/math_util.h
@@ -6,11 +6,18 @@
 
 #include "common/common.h"
 
+#include <algorithm>
 #include <vector>
 
 namespace MathUtil
 {
 
+template<typename T>
+inline T Clamp(const T val, const T& min, const T& max)
+{
+    return std::max(min, std::min(max, val));
+}
+
 static const u64 DOUBLE_SIGN = 0x8000000000000000ULL,
     DOUBLE_EXP  = 0x7FF0000000000000ULL,
     DOUBLE_FRAC = 0x000FFFFFFFFFFFFFULL,
diff --git a/src/core/arm/interpreter/vfp/vfpdouble.cpp b/src/core/arm/interpreter/vfp/vfpdouble.cpp
index 7f975cbeb..5ae99b88a 100644
--- a/src/core/arm/interpreter/vfp/vfpdouble.cpp
+++ b/src/core/arm/interpreter/vfp/vfpdouble.cpp
@@ -895,7 +895,7 @@ vfp_double_multiply(struct vfp_double *vdd, struct vfp_double *vdn,
 #define NEG_SUBTRACT	(1 << 1)
 
 static u32
-vfp_double_multiply_accumulate(ARMul_State* state, int dd, int dn, int dm, u32 fpscr, u32 negate, char *func)
+vfp_double_multiply_accumulate(ARMul_State* state, int dd, int dn, int dm, u32 fpscr, u32 negate, const char *func)
 {
 	struct vfp_double vdd, vdp, vdn, vdm;
 	u32 exceptions;
diff --git a/src/core/arm/interpreter/vfp/vfpsingle.cpp b/src/core/arm/interpreter/vfp/vfpsingle.cpp
index 602713cff..0fcc85266 100644
--- a/src/core/arm/interpreter/vfp/vfpsingle.cpp
+++ b/src/core/arm/interpreter/vfp/vfpsingle.cpp
@@ -917,7 +917,7 @@ vfp_single_multiply(struct vfp_single *vsd, struct vfp_single *vsn, struct vfp_s
 #define NEG_SUBTRACT	(1 << 1)
 
 static u32
-vfp_single_multiply_accumulate(ARMul_State* state, int sd, int sn, s32 m, u32 fpscr, u32 negate, char *func)
+vfp_single_multiply_accumulate(ARMul_State* state, int sd, int sn, s32 m, u32 fpscr, u32 negate, const char *func)
 {
 	struct vfp_single vsd, vsp, vsn, vsm;
 	u32 exceptions;