diff --git a/Makefile.am b/Makefile.am
index a39842de78..c64529d393 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -310,6 +310,7 @@ endif
 # applications are X applications).
 wireshark_LDADD = \
 	gtk/libui.a			\
+	gtk/libui_dirty.a		\
 	codecs/libcodec.a		\
 	wiretap/libwiretap.la		\
 	epan/libwireshark.la		\
@@ -537,7 +538,7 @@ MAINTAINERCLEANFILES =		\
 	depcomp			\
 	install-sh		\
 	ltmain.sh		\
-	missing	
+	missing
 
 EXTRA_DIST = \
 	INSTALL.configure	\
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 82f591b8e2..e0367546dc 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -25,13 +25,14 @@ include Makefile.common
 include ../Makefile.am.inc
 
 if HAVE_WARNINGS_AS_ERRORS
-AM_CFLAGS = -Werror
+AM_CLEAN_CFLAGS = -Werror
 endif
 
-noinst_LIBRARIES = libui.a
+noinst_LIBRARIES = libui.a libui_dirty.a
 
 CLEANFILES = \
 	libui.a		\
+	libui_dirty.a	\
 	*~
 
 MAINTAINERCLEANFILES = \
@@ -50,7 +51,15 @@ libui_a_SOURCES = \
 	$(noinst_HEADERS) \
 	$(WIRESHARK_TAP_SRC)
 
-libui_a_DEPENDENCIES = 
+libui_a_CFLAGS = $(AM_CLEAN_CFLAGS)
+
+libui_a_DEPENDENCIES =
+
+
+libui_dirty_a_SOURCES = \
+	$(DIRTY_GENERATED_C_FILES)
+
+libui_dirty_a_DEPENDENCIES =
 
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 4be6a5fbf1..26db07a527 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -29,7 +29,9 @@ GENERATED_HEADER_FILES = \
 
 # Generated C source files that we want in the distribution.
 GENERATED_C_FILES = \
-	wireshark-tap-register.c	\
+	wireshark-tap-register.c
+
+DIRTY_GENERATED_C_FILES = \
 	text_import_scanner.c
 
 # All the generated files we want in the distribution.
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 240d73e3fd..782a6b4fe8 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -31,6 +31,7 @@ include Makefile.common
 WIRESHARK_WIN32_GTK_SRC = \
 	$(WIRESHARK_GTK_SRC) \
 	$(GENERATED_C_FILES) \
+	$(DIRTY_GENERATED_C_FILES) \
 	capture_if_details_dlg_win32.c	\
 	file_dlg_win32.c \
 	print_win32.c \
@@ -52,14 +53,14 @@ WIRESHARK_WIN32_GTK_SRC = \
 	pa_x86_plain_converters.c \
 	pa_win_waveformat.c \
 !ENDIF
-	pa_win_wmme.c 
+	pa_win_wmme.c
 !ENDIF
 
 WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj)
 
 
 WIRESHARK_WIN32_GTK_OBJECTS = $(WIRESHARK_WIN32_GTK_SRC:.c=.obj)
-	
+
 
 libui.lib	: ..\config.h $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS)
 	link /lib /out:libui.lib $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) winmm.lib
@@ -89,7 +90,7 @@ RUNLEX=..\tools\runlex.sh
 text_import_scanner.h: text_import_scanner.c
 text_import_scanner.obj : text_import_scanner.c
 	$(CC) $(CVARSDLL) $(GENERATED_CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $?
-	
+
 !IF "$(PORTAUDIO_VERSION)" == "18"
 pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c
 	$(CC) -c $(LOCAL_CFLAGS) $?
@@ -179,13 +180,13 @@ checkapi-base:
 	$(WIRESHARK_TAP_SRC) \
 	capture_if_details_dlg_win32.c	\
 	file_dlg_win32.c \
-	print_win32.c 
-	
+	print_win32.c
+
 checkapi-todo:
 	$(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \
 	$(WIRESHARK_GTK_SRC) \
 	$(WIRESHARK_TAP_SRC) \
 	capture_if_details_dlg_win32.c	\
 	file_dlg_win32.c \
-	print_win32.c 
-	
+	print_win32.c
+