diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index d4c9c85b2..75deffa31 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -60,45 +60,75 @@ libneutrino_driver_a_SOURCES += \
 	lcd4l.cpp
 endif
 
+# hdmi-cec driver
+if BOXTYPE_ARMBOX
+libneutrino_driver_a_SOURCES += \
+	hdmi_cec.cpp
+endif
+if BOXTYPE_MIPSBOX
+libneutrino_driver_a_SOURCES += \
+	hdmi_cec.cpp
+endif
+
+# different framebuffer drivers
+if BOXTYPE_GENERIC
+libneutrino_driver_a_SOURCES += \
+	fb_accel_glfb.cpp
+endif
+
 if BOXTYPE_CST
 libneutrino_driver_a_SOURCES += \
 	fb_accel_cs_hdx.cpp
 if BOXMODEL_CST_HD2
 libneutrino_driver_a_SOURCES += \
-	fb_accel_cs_hd2.cpp \
-	vfd.cpp
+	fb_accel_cs_hd2.cpp
 else
 libneutrino_driver_a_SOURCES += \
-	fb_accel_cs_hd1.cpp \
-	vfd.cpp
+	fb_accel_cs_hd1.cpp
+endif
+
+endif
+if BOXTYPE_ARMBOX
+if ENABLE_LCD
+libneutrino_driver_a_SOURCES += \
+	fb_accel_arm.cpp
+else
+libneutrino_driver_a_SOURCES += \
+	fb_accel_arm.cpp
 endif
 endif
 
+if BOXTYPE_MIPSBOX
+libneutrino_driver_a_SOURCES += \
+	fb_accel_mips.cpp
+endif
+# end framebuffer drivers
+
+# different display drivers
 if BOXTYPE_GENERIC
 libneutrino_driver_a_SOURCES += \
-	fb_accel_glfb.cpp \
 	simple_display.cpp
 endif
 
+if BOXTYPE_CST
+libneutrino_driver_a_SOURCES += \
+	vfd.cpp
+endif
+
 if BOXTYPE_ARMBOX
 if ENABLE_LCD
 libneutrino_driver_a_SOURCES += \
-	hdmi_cec.cpp \
-	fb_accel_arm.cpp \
 	lcdd.cpp
 else
 libneutrino_driver_a_SOURCES += \
-	hdmi_cec.cpp \
-	fb_accel_arm.cpp \
 	simple_display.cpp
 endif
 endif
 
 if BOXTYPE_MIPSBOX
 libneutrino_driver_a_SOURCES += \
-	hdmi_cec.cpp \
-	fb_accel_mips.cpp \
 	simple_display.cpp
 endif
+# end display drivers
 
 libneutrino_driver_netfile_a_SOURCES = netfile.cpp