diff --git a/GRRLIB/GRRLIB/Makefile b/GRRLIB/GRRLIB/Makefile
index 6400a05..01d1ac9 100644
--- a/GRRLIB/GRRLIB/Makefile
+++ b/GRRLIB/GRRLIB/Makefile
@@ -19,6 +19,9 @@ endif
 NULLSTR :=
 PWD     := $(subst $(NULLSTR) ,\ ,$(shell pwd))
 
+INSTALL_INC	:=	$(DEVKITPRO)/portlibs/ppc/include
+INSTALL_LIB	:=	$(DEVKITPRO)/portlibs/ppc/lib
+
 INCLUDE	:= -I../lib/pngu -I$(PWD) -I$(LIBOGC_INC) -I$(DEVKITPRO)/portlibs/ppc/include -I$(DEVKITPRO)/portlibs/ppc/include/freetype2
 CFLAGS  := -O2 -Wall $(MACHDEP) $(INCLUDE)
 
@@ -36,7 +39,7 @@ clean :
 	rm -f $(OFILES) $(ARC)
 
 install :
-	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)  $(LIBOGC_INC)/grrlib
-	cp -f $(ARC) $(LIBOGC_LIB)/
-	cp -f $(HDR) $(LIBOGC_INC)/
-	cp -f $(INL) $(LIBOGC_INC)/grrlib
+	mkdir -p  $(INSTALL_LIB)  $(INSTALL_INC)  $(INSTALL_INC)/grrlib
+	cp -f $(ARC) $(INSTALL_LIB)/
+	cp -f $(HDR) $(INSTALL_INC)/
+	cp -f $(INL) $(INSTALL_INC)/grrlib
diff --git a/GRRLIB/lib/pngu/Makefile b/GRRLIB/lib/pngu/Makefile
index 30e47ad..dfa6631 100644
--- a/GRRLIB/lib/pngu/Makefile
+++ b/GRRLIB/lib/pngu/Makefile
@@ -16,6 +16,9 @@ else
 include $(DEVKITPPC)/wii_rules
 endif
 
+INSTALL_INC	:=	$(DEVKITPRO)/portlibs/ppc/include
+INSTALL_LIB	:=	$(DEVKITPRO)/portlibs/ppc/lib
+
 INCLUDE	:= -I$(LIBOGC_INC) -I$(DEVKITPRO)/portlibs/ppc/include
 CFLAGS  := -O2 -Wall $(MACHDEP) $(INCLUDE)
 
@@ -32,6 +35,6 @@ clean :
 	rm -f $(OFILES) $(ARC)
 
 install :
-	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)
-	cp -f $(ARC) $(LIBOGC_LIB)/
-	cp -f $(HDR) $(LIBOGC_INC)/
+	mkdir -p  $(INSTALL_LIB)  $(INSTALL_INC)
+	cp -f $(ARC) $(INSTALL_LIB)/
+	cp -f $(HDR) $(INSTALL_INC)/
diff --git a/examples/particle/source/main.cpp b/examples/particle/source/main.cpp
index 0c56e51..e04dee0 100644
--- a/examples/particle/source/main.cpp
+++ b/examples/particle/source/main.cpp
@@ -9,7 +9,7 @@
 
 #include <stdlib.h>
 #include <wiiuse/wpad.h>
-#include <math.h>
+#include <cmath>
 #include <ogc/lwp_watchdog.h>
 #include <vector>
 
@@ -276,7 +276,7 @@ static u8 CalculateFrameRate() {
  * @return Returns a clean, clamped unsigned char.
  */
 static u8 ClampVar8 (f32 Value) {
-    Value = roundf(Value);
+    Value = std::roundf(Value);
     if (Value < 0) {
         Value = 0;
     }