diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index 48fc03e23..cf228beda 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -27,8 +27,10 @@ libneutrino_driver_a_SOURCES = \
 	colorgradient.cpp \
 	fade.cpp \
 	fb_window.cpp \
+	fbaccel.cpp \
 	file.cpp \
 	fontrenderer.cpp \
+	framebuffer_ng.cpp \
 	genpsi.cpp \
 	moviecut.cpp \
 	neutrinofonts.cpp \
@@ -45,12 +47,7 @@ libneutrino_driver_a_SOURCES = \
 
 if BOXTYPE_COOL
 libneutrino_driver_a_SOURCES += \
-	framebuffer.cpp \
 	vfd.cpp
-else
-libneutrino_driver_a_SOURCES += \
-	fbaccel.cpp \
-	framebuffer_ng.cpp
 endif
 
 if BOXTYPE_TRIPLE
diff --git a/src/driver/framebuffer.h b/src/driver/framebuffer.h
index 1e892f7b6..68722516d 100644
--- a/src/driver/framebuffer.h
+++ b/src/driver/framebuffer.h
@@ -21,9 +21,8 @@
 	Boston, MA  02110-1301, USA.
 */
 
-#if !HAVE_COOL_HARDWARE
 #include "framebuffer_ng.h"
-#else
+#if 0
 
 #ifndef __framebuffer__
 #define __framebuffer__