diff --git a/desmume/INSTALL b/desmume/INSTALL
index 5458714e1..d3c5b40a9 100644
--- a/desmume/INSTALL
+++ b/desmume/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 
diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index a43957660..527bd0c0a 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -9,9 +9,11 @@ libdesmume_a_SOURCES = \
         arm_instructions.cpp arm_instructions.h \
         bios.cpp bios.h bits.h cp15.cpp cp15.h \
         cflash.cpp cflash.h config.h fs.h \
+	common.cpp common.h \
 	debug.cpp debug.h \
 	Disassembler.cpp Disassembler.h \
 	dscard.h fat.h FIFO.cpp FIFO.h \
+	GPU_osd.cpp GPU_osd.h \
 	GPU.cpp GPU.h \
 	GPU_osd.cpp GPU_osd.h \
 	gl_vertex.cpp gl_vertex.h \
@@ -23,6 +25,7 @@ libdesmume_a_SOURCES = \
 	OGLRender.cpp OGLRender.h \
 	ROMReader.cpp ROMReader.h \
 	render3D.cpp render3D.h \
+	rtc.cpp rtc.h \
         saves.cpp saves.h \
         SPU.cpp SPU.h \
 	gdbstub.h \
diff --git a/desmume/src/gtk-glade/gdk_3Demu.cpp b/desmume/src/gtk-glade/gdk_3Demu.cpp
index 69dd2d854..edc1df46b 100644
--- a/desmume/src/gtk-glade/gdk_3Demu.cpp
+++ b/desmume/src/gtk-glade/gdk_3Demu.cpp
@@ -29,7 +29,7 @@
 
 #include "../types.h"
 #include "../render3D.h"
-#include "../opengl_collector_3Demu.h"
+#include "../OGLRender.h"
 #include "gdk_3Demu.h"
 
 /*
@@ -126,14 +126,14 @@ examine_gl_config_attrib (GdkGLConfig *glconfig)
 }
 
 
-static int
+static bool
 begin_opengl_region_gdk_3d( void) {
 
   if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext)) {
-    return 0;
+    return false;
   }
 
-  return 1;
+  return true;
 }
 
 static void
@@ -141,10 +141,10 @@ end_opengl_region_gdk_3d( void) {
   gdk_gl_drawable_gl_end (gldrawable);
 }
 
-static int
+static bool
 initialise_gdk_3d( void) {
   /* this does nothing */
-  return 1;
+  return true;
 }
 
 int
@@ -192,10 +192,9 @@ init_opengl_gdk_3Demu( void) {
       return 0;
     }
 
-  begin_opengl_ogl_collector_platform = begin_opengl_region_gdk_3d;
-  end_opengl_ogl_collector_platform = end_opengl_region_gdk_3d;
-  initialise_ogl_collector_platform = initialise_gdk_3d;
-
+  oglrender_init = initialise_gdk_3d;
+  oglrender_beginOpenGL = begin_opengl_region_gdk_3d;
+  oglrender_endOpenGL = end_opengl_region_gdk_3d;
 
   return 1;
 }
diff --git a/desmume/src/gtk-glade/main.cpp b/desmume/src/gtk-glade/main.cpp
index 320e2c122..e4ecfdcec 100755
--- a/desmume/src/gtk-glade/main.cpp
+++ b/desmume/src/gtk-glade/main.cpp
@@ -29,7 +29,7 @@
 
 #ifdef GTKGLEXT_AVAILABLE
 #include <gtk/gtkgl.h>
-#include "../opengl_collector_3Demu.h"
+#include "../OGLRender.h"
 #include "gdk_3Demu.h"
 #endif
 
@@ -54,7 +54,7 @@ GPU3DInterface *core3DList[] = {
 &gpu3DNull
 #ifdef GTKGLEXT_AVAILABLE
   ,
-  &gpu3D_opengl_collector
+  &gpu3Dgl
 #endif
 };
 
diff --git a/desmume/src/gtk/gdk_3Demu.cpp b/desmume/src/gtk/gdk_3Demu.cpp
index 315796602..294513440 100644
--- a/desmume/src/gtk/gdk_3Demu.cpp
+++ b/desmume/src/gtk/gdk_3Demu.cpp
@@ -188,8 +188,8 @@ init_opengl_gdk_3Demu( void) {
       return 0;
     }
 
-  
-	oglrender_init = _oglrender_init;
+  
+	oglrender_init = _oglrender_init;
 	oglrender_beginOpenGL = _oglrender_beginOpenGL;
 	oglrender_endOpenGL = _oglrender_endOpenGL;
 
diff --git a/desmume/src/rtc.cpp b/desmume/src/rtc.cpp
index 690547e70..166f28e50 100644
--- a/desmume/src/rtc.cpp
+++ b/desmume/src/rtc.cpp
@@ -26,6 +26,7 @@
 #include "debug.h"
 #include "armcpu.h"
 #include <time.h>
+#include <string.h>
 
 const u8 valRTC[100]=	{	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
 						0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
@@ -223,7 +224,7 @@ INLINE void rtcPost(u8 data)
 	}
 }
 
-INLINE u8 rtcRead()
+u8 rtcRead()
 {
 	u8	val;
 
@@ -239,7 +240,7 @@ INLINE u8 rtcRead()
 	return val;
 }
 
-INLINE void rtcWrite(u16 val)
+void rtcWrite(u16 val)
 {
 	rtc.reg = val;
 
@@ -256,4 +257,4 @@ INLINE void rtcWrite(u16 val)
 			rtc.dataWrite = 0;
 		}
 	}
-}
\ No newline at end of file
+}