diff --git a/Makefile b/Makefile
index 6e4597e..4571952 100644
--- a/Makefile
+++ b/Makefile
@@ -10,16 +10,16 @@ OBJECTS = $(SOURCES:.c=.o)
 PROG = ustreamer
 
 
+ifeq ($(shell ls -d /opt/vc/include 2>/dev/null), /opt/vc/include)
+SOURCES += $(shell ls src/omx/*.c)
+LIBS += -lbcm_host -lvcos -lopenmaxil -L/opt/vc/lib
+CFLAGS += -DOMX_ENCODER -DOMX_SKIP64BIT -I/opt/vc/include
+endif
+
+
 all: $(SOURCES) $(PROG)
 
 
-rpi:
-	make all \
-		SOURCES="$(SOURCES) $(shell ls src/omx/*.c)" \
-		LIBS="$(LIBS) -lbcm_host -lvcos -lopenmaxil -L/opt/vc/lib" \
-		CFLAGS="$(CFLAGS) -DOMX_ENCODER -DOMX_SKIP64BIT -I/opt/vc/include"
-
-
 install: $(PROG)
 	install -Dm755 $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
 
diff --git a/src/encoder.h b/src/encoder.h
index f45f0af..da686cd 100644
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -26,20 +26,15 @@
 
 #ifdef OMX_ENCODER
 #	include "omx/encoder.h"
+#	define ENCODER_TYPES_OMX_HINT ", OMX"
+#else
+#	define ENCODER_TYPES_OMX_HINT ""
 #endif
 
 
-#define ENCODER_TYPES_STR "CPU"
-#define PUSH	_Pragma("push_macro(\"ENCODER_TYPES_STR\")")
-#define POP		_Pragma("pop_macro(\"ENCODER_TYPES_STR\")")
-#ifdef OMX_ENCODER
-	PUSH
-#	undef ENCODER_TYPES_STR
-#	define ENCODER_TYPES_STR POP ENCODER_TYPES_STR ", OMX"
-#endif
-#undef PUSH
-#undef POP
-
+#define ENCODER_TYPES_STR \
+	"CPU" \
+	ENCODER_TYPES_OMX_HINT
 
 enum encoder_type_t {
 	ENCODER_TYPE_UNKNOWN, // Only for encoder_parse_type() and main()