diff --git a/generic-pc/glfb.h b/generic-pc/glfb.h
deleted file mode 100644
index bd37bb2..0000000
--- a/generic-pc/glfb.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-	Copyright 2010 Carsten Juttner <carjay@gmx.net>
-	Copyright 2012,2013 Stefan Seyfried <seife@tuxboxcvs.slipkontur.de>
-
-	This program 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 program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __glfb__
-#define __glfb__
-#include <OpenThreads/Thread>
-#include <vector>
-#include <linux/fb.h> /* for screeninfo etc. */
-
-class GLFramebuffer : public OpenThreads::Thread
-{
-public:
-	GLFramebuffer(int x, int y);
-	~GLFramebuffer();
-	std::vector<unsigned char> *getOSDBuffer() { return &osd_buf; } /* pointer to OSD bounce buffer */
-	void blit();
-	fb_var_screeninfo getScreenInfo() { return si; }
-
-private:
-	fb_var_screeninfo si;
-	std::vector<unsigned char> osd_buf; /* silly bounce buffer */
-	void run();	/* for OpenThreads::Thread */
-	void *pdata;	/* not yet used */
-};
-#endif
diff --git a/include/glfb.h b/include/glfb.h
index ea7addd..5b95ce6 100644
--- a/include/glfb.h
+++ b/include/glfb.h
@@ -1,10 +1,42 @@
-#include <config.h>
-#if HAVE_GENERIC_HARDWARE
-#if BOXMODEL_RASPI
-#include "../raspi/glfb.h"
-#else
-#include "../generic-pc/glfb.h"
-#endif
-#else
-#error glfb.h only works with HAVE_GENERIC_HARDWARE defined
+/*
+	Copyright 2010 Carsten Juttner <carjay@gmx.net>
+	Copyright 2012,2013 Stefan Seyfried <seife@tuxboxcvs.slipkontur.de>
+
+	This program 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 program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __glfb__
+#define __glfb__
+#include <OpenThreads/Thread>
+#include <vector>
+#include <linux/fb.h> /* for screeninfo etc. */
+
+class GLFramebuffer : public OpenThreads::Thread
+{
+public:
+	GLFramebuffer(int x, int y);
+	~GLFramebuffer();
+	std::vector<unsigned char> *getOSDBuffer() { return &osd_buf; } /* pointer to OSD bounce buffer */
+	void blit();
+	fb_var_screeninfo getScreenInfo() { return si; }
+
+private:
+	fb_var_screeninfo si;
+	std::vector<unsigned char> osd_buf; /* silly bounce buffer */
+	void run();	/* for OpenThreads::Thread */
+	void setup();
+	void blit_osd();
+	void *pdata;	/* not yet used */
+};
 #endif
diff --git a/raspi/glfb.h b/raspi/glfb.h
deleted file mode 100644
index c5fcce6..0000000
--- a/raspi/glfb.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-	Copyright 2013 Stefan Seyfried <seife@tuxboxcvs.slipkontur.de>
-
-	This program 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 program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __glthread__
-#define __glthread__
-#include <OpenThreads/Thread>
-#include <vector>
-#include <linux/fb.h> /* for screeninfo etc. */
-
-class GLFramebuffer : public OpenThreads::Thread
-{
-public:
-	GLFramebuffer(int x, int y);
-	~GLFramebuffer();
-	std::vector<unsigned char> *getOSDBuffer() { return &osd_buf; } /* pointer to OSD bounce buffer */
-	void blit();
-	fb_var_screeninfo getScreenInfo() { return si; }
-
-private:
-	void *pdata;	/* not yet used */
-	fb_var_screeninfo si;
-	std::vector<unsigned char> osd_buf; /* silly bounce buffer */
-	void run();	/* for OpenThreads::Thread */
-
-	void setup();
-	void blit_osd();
-};
-#endif