Move cache/mgt common stuff under, you guessed it: common/

bin/varnishd/Makefile.am

@@ -45,14 +45,10 @@ varnishd_SOURCES = \
 	cache_vrt_re.c \
 	cache_vrt_var.c \
 	cache_vrt_vmod.c \
-	waiter/cache_waiter.c \
-	waiter/cache_waiter_epoll.c \
-	waiter/cache_waiter_kqueue.c \
-	waiter/cache_waiter_poll.c \
-	waiter/cache_waiter_ports.c \
 	cache_wrk.c \
 	cache_wrw.c \
 	cache_ws.c \
+	common/common_vsm.c \
 	hash/hash_classic.c \
 	hash/hash_critbit.c \
 	hash/hash_mgt.c \
@@ -76,23 +72,27 @@ varnishd_SOURCES = \
 	storage/storage_persistent_subr.c \
 	storage/storage_synth.c \
 	storage/storage_umem.c \
-	vsm.c
+	waiter/cache_waiter.c \
+	waiter/cache_waiter_epoll.c \
+	waiter/cache_waiter_kqueue.c \
+	waiter/cache_waiter_poll.c \
+	waiter/cache_waiter_ports.c 
 
 noinst_HEADERS = \
 	cache.h \
 	cache_backend.h \
 	cache_esi.h \
-	waiter/cache_waiter.h \
-	common.h \
+	common/common.h \
+	common/heritage.h \
+	common/params.h \
 	default_vcl.h \
 	hash/hash_slinger.h \
-	heritage.h \
 	mgt/mgt.h \
 	mgt/mgt_cli.h \
 	mgt/mgt_param.h \
-	params.h \
 	storage/storage.h \
-	storage/storage_persistent.h
+	storage/storage_persistent.h \
+	waiter/cache_waiter.h
 
 varnishd_CFLAGS = \
 	@PCRE_CFLAGS@ \

bin/varnishd/cache.h

@@ -34,7 +34,7 @@
  */
 #define VARNISH_CACHE_CHILD	1
 
-#include "common.h"
+#include "common/common.h"
 
 #include "vapi/vsc_int.h"
 #include "vapi/vsl_int.h"
@@ -55,7 +55,7 @@
 #endif
 
 
-#include "params.h"
+#include "common/params.h"
 
 enum body_status {
 #define BODYSTATUS(U,l)	BS_##U,

bin/varnishd/cache_acceptor.c

@@ -31,7 +31,7 @@
 #include "config.h"
 
 #include "cache.h"
-#include "heritage.h"
+#include "common/heritage.h"
 
 #include "vcli.h"
 #include "vcli_priv.h"

bin/varnishd/cache_cli.c

@@ -39,7 +39,7 @@
 #include <stddef.h>			// offsetof
 
 #include "cache.h"
-#include "heritage.h"
+#include "common/heritage.h"
 
 #include "cache_backend.h"		// struct vbc
 #include "hash/hash_slinger.h"		// struct objhead

bin/varnishd/cache_main.c

@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 #include "cache.h"
-#include "heritage.h"
+#include "common/heritage.h"
 
 #include "waiter/cache_waiter.h"
 #include "hash/hash_slinger.h"

bin/varnishd/cache_pool.c

@@ -46,7 +46,7 @@
 #include <stdlib.h>
 
 #include "cache.h"
-#include "heritage.h"
+#include "common/heritage.h"
 
 #include "waiter/cache_waiter.h"
 #include "vtcp.h"

bin/varnishd/cache_vrt_var.c

@@ -34,7 +34,7 @@
 #include <stdlib.h>
 
 #include "cache.h"
-#include "heritage.h"
+#include "common/heritage.h"
 
 #include "cache_backend.h"
 #include "vrt_obj.h"

bin/varnishd/flint.sh

@@ -16,6 +16,7 @@ flexelint \
 	-I/usr/local/include \
 	-DVARNISH_STATE_DIR=\"foo\" \
 	*.c \
+	common/*.c \
 	storage/*.c \
 	waiter/*.c \
 	hash/*.c \

bin/varnishd/hash/hash_mgt.c

@@ -36,7 +36,7 @@
 #include <unistd.h>
 
 #include "mgt/mgt.h"
-#include "heritage.h"
+#include "common/heritage.h"
 
 #include "hash/hash_slinger.h"
 #include "vav.h"

bin/varnishd/mgt/mgt.h

@@ -30,7 +30,7 @@
 
 #include <stdint.h>
 
-#include "common.h"
+#include "common/common.h"
 
 struct cli;
 

bin/varnishd/mgt/mgt_child.c

@@ -44,8 +44,8 @@
 #include <unistd.h>
 
 #include "mgt/mgt.h"
-#include "heritage.h"
-#include "params.h"
+#include "common/heritage.h"
+#include "common/params.h"
 
 #include "vapi/vsm_int.h"
 #include "vbm.h"

bin/varnishd/mgt/mgt_cli.c

@@ -43,8 +43,8 @@
 #include <unistd.h>
 
 #include "mgt/mgt.h"
-#include "heritage.h"
-#include "params.h"
+#include "common/heritage.h"
+#include "common/params.h"
 
 #include "vcli.h"
 #include "vcli_common.h"

bin/varnishd/mgt/mgt_main.c

@@ -44,8 +44,8 @@
 #include <unistd.h>
 
 #include "mgt/mgt.h"
-#include "heritage.h"
-#include "params.h"
+#include "common/heritage.h"
+#include "common/params.h"
 
 #include "hash/hash_slinger.h"
 #include "vav.h"

bin/varnishd/mgt/mgt_param.c

@@ -38,8 +38,8 @@
 #include <unistd.h>
 
 #include "mgt/mgt.h"
-#include "heritage.h"
-#include "params.h"
+#include "common/heritage.h"
+#include "common/params.h"
 
 #include "mgt/mgt_param.h"
 #include "waiter/cache_waiter.h"

bin/varnishd/mgt/mgt_pool.c

@@ -48,8 +48,8 @@
 #include <unistd.h>
 
 #include "mgt/mgt.h"
-#include "heritage.h"
-#include "params.h"
+#include "common/heritage.h"
+#include "common/params.h"
 
 #include "mgt/mgt_param.h"
 

bin/varnishd/mgt/mgt_sandbox.c

@@ -53,8 +53,8 @@
 #include <unistd.h>
 
 #include "mgt/mgt.h"
-#include "heritage.h"
-#include "params.h"
+#include "common/heritage.h"
+#include "common/params.h"
 
 /*--------------------------------------------------------------------*/
 

bin/varnishd/mgt/mgt_sandbox_solaris.c

@@ -44,7 +44,7 @@
 
 #include "mgt/mgt.h"
 
-#include "heritage.h"
+#include "common/heritage.h"
 
 /*--------------------------------------------------------------------
  * SOLARIS PRIVILEGES: Note on use of symbolic PRIV_* constants

bin/varnishd/mgt/mgt_shmem.c

@@ -98,8 +98,8 @@
 #include <unistd.h>
 
 #include "mgt/mgt.h"
-#include "heritage.h"
-#include "params.h"
+#include "common/heritage.h"
+#include "common/params.h"
 
 #include "flopen.h"
 #include "vapi/vsc_int.h"