diff --git a/Gui/Makefile b/Gui/Makefile
index b3c213ba3b..9da3353d95 100644
--- a/Gui/Makefile
+++ b/Gui/Makefile
@@ -8,9 +8,6 @@ INCDIR  = -I. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC) $(EXTRA_INC)
 
 OPTIMIZE =  $(OPTFLAGS) \
             -fexpensive-optimizations -fschedule-insns2 -Wall
-ifeq ($(TARGET_ARCH_X86),yes)
-OPTIMIZE += -malign-double
-endif
 
 CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG) 
 
diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h
index 3b607efa5a..84d89d71fb 100644
--- a/libmpdemux/stream.h
+++ b/libmpdemux/stream.h
@@ -84,10 +84,6 @@ typedef struct stream_st {
   // Close
   void (*close)(struct stream_st *s);
 
-// --- align workaround
-  int dummy;
-// --- align workaround
-  
   int fd;   // file descriptor, see man open(2)
   int type; // see STREAMTYPE_*
   int flags;