diff --git a/include/Makefile.am b/include/Makefile.am
index 1fef6c6ab..5e76d2698 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,12 +2,11 @@
 AUTOMAKE_OPTIONS=	foreign
 SUBDIRS = QF
 EXTRA_DIST = asm_i386.h adivtab.h anorm_dots.h anorms.h asm_draw.h block16.h \
-	block8.h buildnum.h compat.h context_x11.h d_iface.h d_ifacea.h d_local.h \
-	dga_check.h dosisms.h fbset.h gib_error.h gib_instructions.h \
-	gib_interpret.h gib_modules.h gib_parse.h gib_stack.h gib_vars.h \
-	gl_warp_sin.h glquake.h in_win.h logos.h menu.h mpdosock.h qfgl_ext.h \
-	quakeasm.h r_cvar.h r_dynamic.h r_local.h r_shared.h sbar.h stamp-h.in \
-	varrays.h vgamodes.h vid_dos.h view.h vregset.h winquake.h \
+	block8.h buildnum.h compat.h context_x11.h d_iface.h d_ifacea.h
+	d_local.h dga_check.h dosisms.h fbset.h gl_warp_sin.h glquake.h \
+	in_win.h logos.h menu.h mpdosock.h qfgl_ext.h quakeasm.h r_cvar.h \
+	r_dynamic.h r_local.h r_shared.h sbar.h stamp-h.in varrays.h \
+	vgamodes.h vid_dos.h view.h vregset.h winquake.h \
 	\
 	win32/bc/borland.c win32/bc/config.h \
 	\
@@ -19,3 +18,4 @@ EXTRA_DIST = asm_i386.h adivtab.h anorm_dots.h anorms.h asm_draw.h block16.h \
 	win32/resources/resource.h \
 	\
 	win32/vc/config.h win32/vc/dirent.h win32/version.h win32/version.h.in
+
diff --git a/libs/gib/Makefile.am b/libs/gib/Makefile.am
index e5a6dc2f9..68b621e87 100644
--- a/libs/gib/Makefile.am
+++ b/libs/gib/Makefile.am
@@ -5,5 +5,7 @@ lib_LTLIBRARIES = libQFgib.la
 libQFgib_la_LDFLAGS = -version-info 1:0:0
 libQFgib_la_SOURCES = gib.c gib_instructions.c gib_interpret.c \
 	gib_modules.c gib_parse.c gib_stack.c gib_vars.c
+EXTRA_DIST = gib_error.h gib_instructions.h gib_interpret.h gib_modules.h \
+	gib_parse.h gib_stack.h gib_vars.h
 
 LIBLIST = libQFgib.la @LIBRARY_SEARCH_PATH@
diff --git a/include/gib_error.h b/libs/gib/gib_error.h
similarity index 100%
rename from include/gib_error.h
rename to libs/gib/gib_error.h
diff --git a/include/gib_instructions.h b/libs/gib/gib_instructions.h
similarity index 100%
rename from include/gib_instructions.h
rename to libs/gib/gib_instructions.h
diff --git a/include/gib_interpret.h b/libs/gib/gib_interpret.h
similarity index 100%
rename from include/gib_interpret.h
rename to libs/gib/gib_interpret.h
diff --git a/include/gib_modules.h b/libs/gib/gib_modules.h
similarity index 100%
rename from include/gib_modules.h
rename to libs/gib/gib_modules.h
diff --git a/include/gib_parse.h b/libs/gib/gib_parse.h
similarity index 100%
rename from include/gib_parse.h
rename to libs/gib/gib_parse.h
diff --git a/include/gib_stack.h b/libs/gib/gib_stack.h
similarity index 100%
rename from include/gib_stack.h
rename to libs/gib/gib_stack.h
diff --git a/include/gib_vars.h b/libs/gib/gib_vars.h
similarity index 100%
rename from include/gib_vars.h
rename to libs/gib/gib_vars.h