Move lib/dynamic-string.h to include/openvswitch directory

Signed-off-by: Ben Warren <ben@skyportsystems.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

70 files changed, 71 insertions, 165 deletions

diff --git a/lib/automake.mk b/lib/automake.mk
index 70f4deb4a..211f3c0fc 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -77,7 +77,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/heap.c \
 	lib/heap.h \
 	lib/dynamic-string.c \
-	lib/dynamic-string.h \
 	lib/entropy.c \
 	lib/entropy.h \
 	lib/fat-rwlock.c \
diff --git a/lib/backtrace.h b/lib/backtrace.h
index 4810a7caa..3eb92f7ad 100644
--- a/lib/backtrace.h
+++ b/lib/backtrace.h
@@ -18,7 +18,7 @@
 #define BACKTRACE_H 1
 
 #include <stdint.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 
 /* log_backtrace() will save the backtrace of a running program
  * into the log at the DEBUG level.
diff --git a/lib/bfd.c b/lib/bfd.c
index 8b5daffad..c0e06af98 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -26,7 +26,7 @@
 #include "csum.h"
 #include "dp-packet.h"
 #include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "hash.h"
 #include "hmap.h"
diff --git a/lib/bundle.c b/lib/bundle.c
index 371b318a2..69249e6c6 100644
--- a/lib/bundle.c
+++ b/lib/bundle.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+/* Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 
 #include "colors.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "multipath.h"
 #include "meta-flow.h"
 #include "nx-match.h"
diff --git a/lib/cfm.c b/lib/cfm.c
index 587454a75..cf1f72596 100644
--- a/lib/cfm.c
+++ b/lib/cfm.c
@@ -24,7 +24,7 @@
 #include "byte-order.h"
 #include "connectivity.h"
 #include "dp-packet.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "hash.h"
 #include "hmap.h"
diff --git a/lib/classifier.c b/lib/classifier.c
index cfcdc0292..8bc6353fe 100644
--- a/lib/classifier.c
+++ b/lib/classifier.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include "byte-order.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "odp-util.h"
 #include "ofp-util.h"
 #include "packets.h"
diff --git a/lib/command-line.c b/lib/command-line.c
index 7b668a139..bda5ed6c0 100644
--- a/lib/command-line.c
+++ b/lib/command-line.c
@@ -19,7 +19,7 @@
 #include <getopt.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "ovs-thread.h"
 #include "util.h"
 #include "openvswitch/vlog.h"
diff --git a/lib/coverage.c b/lib/coverage.c
index 9584cac97..6cef82614 100644
--- a/lib/coverage.c
+++ b/lib/coverage.c
@@ -18,7 +18,7 @@
 #include "coverage.h"
 #include <inttypes.h>
 #include <stdlib.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "svec.h"
 #include "timeval.h"
diff --git a/lib/db-ctl-base.c b/lib/db-ctl-base.c
index e3a1de95a..849883ba3 100644
--- a/lib/db-ctl-base.c
+++ b/lib/db-ctl-base.c
@@ -25,7 +25,7 @@
 #include "command-line.h"
 #include "compiler.h"
 #include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
 #include "json.h"
diff --git a/lib/db-ctl-base.h b/lib/db-ctl-base.h
index bada320b3..f8f576b4e 100644
--- a/lib/db-ctl-base.h
+++ b/lib/db-ctl-base.h
@@ -18,7 +18,7 @@
 #define DB_CTL_BASE_H 1
 
 #include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "shash.h"
 
 struct ctl_context;
diff --git a/lib/dp-packet.c b/lib/dp-packet.c
index db3c857ae..aec7fe7fb 100644
--- a/lib/dp-packet.c
+++ b/lib/dp-packet.c
@@ -17,7 +17,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "netdev-dpdk.h"
 #include "dp-packet.h"
 #include "util.h"
diff --git a/lib/dpctl.c b/lib/dpctl.c
index d58df0da9..854190f73 100644
--- a/lib/dpctl.c
+++ b/lib/dpctl.c
@@ -32,7 +32,7 @@
 #include "dirs.h"
 #include "dpctl.h"
 #include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "match.h"
 #include "netdev.h"
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index cf574ad58..0f2385a90 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -39,7 +39,7 @@
 #include "dpif.h"
 #include "dpif-provider.h"
 #include "dummy.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fat-rwlock.h"
 #include "flow.h"
 #include "hmapx.h"
diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c
index f1eaa5124..6ac973ed4 100644
--- a/lib/dpif-netlink.c
+++ b/lib/dpif-netlink.c
@@ -34,7 +34,7 @@
 
 #include "bitmap.h"
 #include "dpif-provider.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "fat-rwlock.h"
 #include "netdev.h"
diff --git a/lib/dpif.c b/lib/dpif.c
index df11b22c5..33783e1de 100644
--- a/lib/dpif.c
+++ b/lib/dpif.c
@@ -27,7 +27,7 @@
 #include "dpctl.h"
 #include "dp-packet.h"
 #include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "netdev.h"
 #include "netlink.h"
diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c
index a5a3460ef..1f17a9f11 100644
--- a/lib/dynamic-string.c
+++ b/lib/dynamic-string.c
@@ -15,7 +15,7 @@
  */
 
 #include <config.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/dynamic-string.h b/lib/dynamic-string.h
deleted file mode 100644
index cc064c084..000000000
--- a/lib/dynamic-string.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016 Nicira, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DYNAMIC_STRING_H
-#define DYNAMIC_STRING_H 1
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <time.h>
-#include "compiler.h"
-
-/* A "dynamic string", that is, a buffer that can be used to construct a
- * string across a series of operations that extend or modify it.
- *
- * The 'string' member does not always point to a null-terminated string.
- * Initially it is NULL, and even when it is nonnull, some operations do not
- * ensure that it is null-terminated.  Use ds_cstr() to ensure that memory is
- * allocated for the string and that it is null-terminated. */
-struct ds {
-    char *string;       /* Null-terminated string. */
-    size_t length;      /* Bytes used, not including null terminator. */
-    size_t allocated;   /* Bytes allocated, not including null terminator. */
-};
-
-#define DS_EMPTY_INITIALIZER { NULL, 0, 0 }
-
-void ds_init(struct ds *);
-void ds_clear(struct ds *);
-void ds_truncate(struct ds *, size_t new_length);
-void ds_reserve(struct ds *, size_t min_length);
-char *ds_put_uninit(struct ds *, size_t n);
-static inline void ds_put_char(struct ds *, char);
-void ds_put_utf8(struct ds *, int uc);
-void ds_put_char_multiple(struct ds *, char, size_t n);
-void ds_put_buffer(struct ds *, const char *, size_t n);
-void ds_put_cstr(struct ds *, const char *);
-void ds_put_and_free_cstr(struct ds *, char *);
-void ds_put_format(struct ds *, const char *, ...) OVS_PRINTF_FORMAT(2, 3);
-void ds_put_format_valist(struct ds *, const char *, va_list)
-    OVS_PRINTF_FORMAT(2, 0);
-void ds_put_printable(struct ds *, const char *, size_t);
-void ds_put_hex(struct ds *ds, const void *buf, size_t size);
-void ds_put_hex_dump(struct ds *ds, const void *buf_, size_t size,
-                     uintptr_t ofs, bool ascii);
-int ds_get_line(struct ds *, FILE *);
-int ds_get_preprocessed_line(struct ds *, FILE *, int *line_number);
-int ds_get_test_line(struct ds *, FILE *);
-
-void ds_put_strftime_msec(struct ds *, const char *format, long long int when,
-                          bool utc);
-char *xastrftime_msec(const char *format, long long int when, bool utc);
-
-char *ds_cstr(struct ds *);
-const char *ds_cstr_ro(const struct ds *);
-char *ds_steal_cstr(struct ds *);
-void ds_destroy(struct ds *);
-void ds_swap(struct ds *, struct ds *);
-
-int ds_last(const struct ds *);
-bool ds_chomp(struct ds *, int c);
-
-/* Inline functions. */
-
-void ds_put_char__(struct ds *, char);
-
-static inline void
-ds_put_char(struct ds *ds, char c)
-{
-    if (ds->length < ds->allocated) {
-        ds->string[ds->length++] = c;
-        ds->string[ds->length] = '\0';
-    } else {
-        ds_put_char__(ds, c);
-    }
-}
-
-#endif /* dynamic-string.h */
diff --git a/lib/flow.c b/lib/flow.c
index 5e962e231..b9ce3311d 100644
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -29,7 +29,7 @@
 #include "colors.h"
 #include "coverage.h"
 #include "csum.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "jhash.h"
 #include "match.h"
diff --git a/lib/json.c b/lib/json.c
index dd852138f..4ac250b6a 100644
--- a/lib/json.c
+++ b/lib/json.c
@@ -24,7 +24,7 @@
 #include <limits.h>
 #include <string.h>
 
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "shash.h"
 #include "unicode.h"
diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
index 35428a67e..868dd4040 100644
--- a/lib/jsonrpc.c
+++ b/lib/jsonrpc.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 
 #include "byteq.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "json.h"
 #include "list.h"
diff --git a/lib/lacp.c b/lib/lacp.c
index c5d0fb1df..8ecef0693 100644
--- a/lib/lacp.c
+++ b/lib/lacp.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 
 #include "connectivity.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "hmap.h"
 #include "dp-packet.h"
diff --git a/lib/learn.c b/lib/learn.c
index 20a4ddcd8..fe67351b2 100644
--- a/lib/learn.c
+++ b/lib/learn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 #include "byte-order.h"
 #include "colors.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "match.h"
 #include "meta-flow.h"
 #include "nx-match.h"
diff --git a/lib/match.c b/lib/match.c
index 35ceb2ae6..fd571d91a 100644
--- a/lib/match.c
+++ b/lib/match.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include "byte-order.h"
 #include "colors.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "ofp-util.h"
 #include "packets.h"
 #include "tun-metadata.h"
diff --git a/lib/memory.c b/lib/memory.c
index 3e21eb561..6a6a55014 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -19,7 +19,7 @@
 #include <stdbool.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "poll-loop.h"
 #include "simap.h"
 #include "timeval.h"
diff --git a/lib/meta-flow.c b/lib/meta-flow.c
index 37027e414..721152c40 100644
--- a/lib/meta-flow.c
+++ b/lib/meta-flow.c
@@ -24,7 +24,7 @@
 #include <netinet/ip6.h>
 
 #include "classifier.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "nx-match.h"
 #include "ofp-util.h"
 #include "ovs-thread.h"
diff --git a/lib/multipath.c b/lib/multipath.c
index c5d2ab52e..485190192 100644
--- a/lib/multipath.c
+++ b/lib/multipath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2012, 2013, 2014, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include "colors.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "nx-match.h"
 #include "ofp-actions.h"
 #include "ofp-util.h"
diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c
index b14871452..273ec8e3f 100644
--- a/lib/netdev-bsd.c
+++ b/lib/netdev-bsd.c
@@ -50,7 +50,7 @@
 #include "coverage.h"
 #include "dp-packet.h"
 #include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "openflow/openflow.h"
 #include "ovs-thread.h"
diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 6fa116933..27d718c8c 100644
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -22,7 +22,7 @@
 
 #include "dp-packet.h"
 #include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "list.h"
 #include "netdev-provider.h"
diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index dd39f0e2d..05e54bd01 100644
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
@@ -52,7 +52,7 @@
 #include "dp-packet.h"
 #include "dpif-netlink.h"
 #include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
 #include "hmap.h"
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 4ba146d96..74442f4d4 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -32,7 +32,7 @@
 #include "dirs.h"
 #include "dpif.h"
 #include "dp-packet.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "hash.h"
 #include "hmap.h"
diff --git a/lib/netdev.c b/lib/netdev.c
index 83b030077..97beeeb95 100644
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@ -27,7 +27,7 @@
 #include "coverage.h"
 #include "dpif.h"
 #include "dp-packet.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
 #include "list.h"
diff --git a/lib/netlink-conntrack.c b/lib/netlink-conntrack.c
index d86587c67..bd01c35a8 100644
--- a/lib/netlink-conntrack.c
+++ b/lib/netlink-conntrack.c
@@ -27,7 +27,7 @@
 
 #include "byte-order.h"
 #include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "netlink.h"
 #include "netlink-socket.h"
 #include "ofpbuf.h"
diff --git a/lib/netlink-conntrack.h b/lib/netlink-conntrack.h
index f1a41501b..04a1ee10b 100644
--- a/lib/netlink-conntrack.h
+++ b/lib/netlink-conntrack.h
@@ -20,7 +20,7 @@
 #include "byte-order.h"
 #include "compiler.h"
 #include "ct-dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hmap.h"
 #include "ofpbuf.h"
 #include "timeval.h"
diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
index 1a1b5e42a..88e986c5c 100644
--- a/lib/netlink-socket.c
+++ b/lib/netlink-socket.c
@@ -23,7 +23,7 @@
 #include <sys/uio.h>
 #include <unistd.h>
 #include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "hmap.h"
 #include "netlink.h"
diff --git a/lib/nx-match.c b/lib/nx-match.c
index ae88ff10b..5cad24c08 100644
--- a/lib/nx-match.c
+++ b/lib/nx-match.c
@@ -22,7 +22,7 @@
 
 #include "classifier.h"
 #include "colors.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hmap.h"
 #include "meta-flow.h"
 #include "ofp-actions.h"
diff --git a/lib/odp-util.c b/lib/odp-util.c
index b5e782675..b53de4e68 100644
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -29,7 +29,7 @@
 #include "byte-order.h"
 #include "coverage.h"
 #include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "netlink.h"
 #include "ofpbuf.h"
diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
index be63f6348..0438c6202 100644
--- a/lib/ofp-actions.c
+++ b/lib/ofp-actions.c
@@ -23,7 +23,7 @@
 #include "colors.h"
 #include "compiler.h"
 #include "dummy.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hmap.h"
 #include "learn.h"
 #include "meta-flow.h"
diff --git a/lib/ofp-errors.c b/lib/ofp-errors.c
index b4a1f8ff3..f20dcdbdd 100644
--- a/lib/ofp-errors.c
+++ b/lib/ofp-errors.c
@@ -17,7 +17,7 @@
 #include <config.h>
 #include <errno.h>
 #include "byte-order.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "ofp-msgs.h"
 #include "ofp-util.h"
 #include "ofpbuf.h"
diff --git a/lib/ofp-msgs.c b/lib/ofp-msgs.c
index de20655b4..9d35df6e4 100644
--- a/lib/ofp-msgs.c
+++ b/lib/ofp-msgs.c
@@ -17,7 +17,7 @@
 #include <config.h>
 #include "ofp-msgs.h"
 #include "byte-order.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "hmap.h"
 #include "ofpbuf.h"
diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
index 5ef3892ad..438270ab0 100644
--- a/lib/ofp-parse.c
+++ b/lib/ofp-parse.c
@@ -24,7 +24,7 @@
 #include <netinet/in.h>
 
 #include "byte-order.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "learn.h"
 #include "meta-flow.h"
 #include "multipath.h"
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 6fa13e4ea..fe55cbc36 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -30,7 +30,7 @@
 #include "byte-order.h"
 #include "colors.h"
 #include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "learn.h"
 #include "multipath.h"
diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index c8e44a0df..97e46086e 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -26,7 +26,7 @@
 #include "bundle.h"
 #include "byte-order.h"
 #include "classifier.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "learn.h"
 #include "meta-flow.h"
 #include "multipath.h"
diff --git a/lib/ofp-version-opt.c b/lib/ofp-version-opt.c
index 1cf57e18f..aaa58271c 100644
--- a/lib/ofp-version-opt.c
+++ b/lib/ofp-version-opt.c
@@ -1,5 +1,5 @@
 #include <config.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "ofp-util.h"
 #include "ofp-version-opt.h"
 #include "ovs-thread.h"
diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c
index 1a090ee9c..cd83b57d0 100644
--- a/lib/ofpbuf.c
+++ b/lib/ofpbuf.c
@@ -18,7 +18,7 @@
 #include "ofpbuf.h"
 #include <stdlib.h>
 #include <string.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "netdev-dpdk.h"
 #include "util.h"
 
diff --git a/lib/ovs-lldp.c b/lib/ovs-lldp.c
index 16225b511..4ad746718 100644
--- a/lib/ovs-lldp.c
+++ b/lib/ovs-lldp.c
@@ -34,7 +34,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "list.h"
 #include "lldp/lldpd.h"
diff --git a/lib/ovs-router.c b/lib/ovs-router.c
index d416bdbd2..f10901605 100644
--- a/lib/ovs-router.c
+++ b/lib/ovs-router.c
@@ -33,7 +33,7 @@
 #include "command-line.h"
 #include "compiler.h"
 #include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "netdev.h"
 #include "packets.h"
 #include "seq.h"
diff --git a/lib/ovsdb-data.c b/lib/ovsdb-data.c
index 75febad81..22176cdb8 100644
--- a/lib/ovsdb-data.c
+++ b/lib/ovsdb-data.c
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 #include <limits.h>
 
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "ovs-thread.h"
 #include "ovsdb-error.h"
diff --git a/lib/ovsdb-error.c b/lib/ovsdb-error.c
index 8be4d1613..d3549cb22 100644
--- a/lib/ovsdb-error.c
+++ b/lib/ovsdb-error.c
@@ -20,7 +20,7 @@
 #include <inttypes.h>
 
 #include "backtrace.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "json.h"
 #include "util.h"
 #include "openvswitch/vlog.h"
diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c
index 2a109a948..976921698 100644
--- a/lib/ovsdb-idl.c
+++ b/lib/ovsdb-idl.c
@@ -24,7 +24,7 @@
 
 #include "bitmap.h"
 #include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "json.h"
 #include "jsonrpc.h"
diff --git a/lib/ovsdb-types.c b/lib/ovsdb-types.c
index 8fe0d4225..91d521602 100644
--- a/lib/ovsdb-types.c
+++ b/lib/ovsdb-types.c
@@ -20,7 +20,7 @@
 #include <float.h>
 #include <limits.h>
 
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "json.h"
 #include "ovs-thread.h"
 #include "ovsdb-data.h"
diff --git a/lib/packets.c b/lib/packets.c
index 1348c8b87..b9a5ba855 100644
--- a/lib/packets.c
+++ b/lib/packets.c
@@ -27,7 +27,7 @@
 #include "crc32c.h"
 #include "flow.h"
 #include "hmap.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "ovs-thread.h"
 #include "odp-util.h"
 #include "dp-packet.h"
diff --git a/lib/perf-counter.c b/lib/perf-counter.c
index 62e2d76dd..c5144e7f7 100644
--- a/lib/perf-counter.c
+++ b/lib/perf-counter.c
@@ -26,7 +26,7 @@
 #include <sys/ioctl.h>
 #include <linux/perf_event.h>
 #include <asm/unistd.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "perf-counter.h"
 #include "shash.h"
 #include "util.h"
diff --git a/lib/poll-loop.c b/lib/poll-loop.c
index e83d98956..9e06e0fed 100644
--- a/lib/poll-loop.c
+++ b/lib/poll-loop.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "list.h"
 #include "ovs-thread.h"
diff --git a/lib/process.c b/lib/process.c
index e89f9cacc..7407b1e3e 100644
--- a/lib/process.c
+++ b/lib/process.c
@@ -26,7 +26,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "list.h"
 #include "ovs-thread.h"
diff --git a/lib/socket-util.c b/lib/socket-util.c
index 6f959b271..5463c93e7 100644
--- a/lib/socket-util.c
+++ b/lib/socket-util.c
@@ -32,7 +32,7 @@
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <unistd.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "ovs-thread.h"
 #include "packets.h"
 #include "poll-loop.h"
diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c
index 26996338a..6ef9803a5 100644
--- a/lib/stream-ssl.c
+++ b/lib/stream-ssl.c
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "entropy.h"
 #include "ofpbuf.h"
 #include "openflow/openflow.h"
diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c
index fc5a60644..2b57ca71a 100644
--- a/lib/stream-tcp.c
+++ b/lib/stream-tcp.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <unistd.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "packets.h"
 #include "socket-util.h"
 #include "util.h"
diff --git a/lib/stream.c b/lib/stream.c
index 217191cab..f6602b266 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "flow.h"
 #include "jsonrpc.h"
diff --git a/lib/svec.c b/lib/svec.c
index 7fe8bebdf..aad04e38c 100644
--- a/lib/svec.c
+++ b/lib/svec.c
@@ -19,7 +19,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "util.h"
 #include "openvswitch/vlog.h"
 
diff --git a/lib/syslog-direct.c b/lib/syslog-direct.c
index f41d881e3..85ca9e292 100644
--- a/lib/syslog-direct.c
+++ b/lib/syslog-direct.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "socket-util.h"
 #include "syslog-provider.h"
 #include "util.h"
diff --git a/lib/syslog-libc.c b/lib/syslog-libc.c
index f879658c9..8858c3c8e 100644
--- a/lib/syslog-libc.c
+++ b/lib/syslog-libc.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "socket-util.h"
 #include "syslog-provider.h"
 #include "util.h"
diff --git a/lib/table.c b/lib/table.c
index 46281703f..a2cfe3d1b 100644
--- a/lib/table.c
+++ b/lib/table.c
@@ -18,7 +18,7 @@
 
 #include "table.h"
 
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "json.h"
 #include "ovsdb-data.h"
 #include "ovsdb-error.h"
diff --git a/lib/timeval.c b/lib/timeval.c
index d390df1b7..2d533394a 100644
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include "coverage.h"
 #include "dummy.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
 #include "hmap.h"
diff --git a/lib/tnl-neigh-cache.c b/lib/tnl-neigh-cache.c
index 0339b5233..a62402c57 100644
--- a/lib/tnl-neigh-cache.c
+++ b/lib/tnl-neigh-cache.c
@@ -28,7 +28,7 @@
 #include "cmap.h"
 #include "coverage.h"
 #include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "errno.h"
 #include "flow.h"
 #include "netdev.h"
diff --git a/lib/tnl-ports.c b/lib/tnl-ports.c
index e7f2066ab..a2a42cc76 100644
--- a/lib/tnl-ports.c
+++ b/lib/tnl-ports.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "classifier.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "list.h"
 #include "netdev.h"
diff --git a/lib/tun-metadata.h b/lib/tun-metadata.h
index 14471deaf..37cf3ce69 100644
--- a/lib/tun-metadata.h
+++ b/lib/tun-metadata.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "netlink.h"
 #include "ofpbuf.h"
 #include "openflow/openflow.h"
diff --git a/lib/unicode.c b/lib/unicode.c
index 31612a25c..846896da0 100644
--- a/lib/unicode.c
+++ b/lib/unicode.c
@@ -20,7 +20,7 @@
 
 #include <inttypes.h>
 
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "util.h"
 
 /* Returns the unicode code point corresponding to leading surrogate 'leading'
diff --git a/lib/unixctl.c b/lib/unixctl.c
index c1a504805..30fcc695c 100644
--- a/lib/unixctl.c
+++ b/lib/unixctl.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include "coverage.h"
 #include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "json.h"
 #include "jsonrpc.h"
 #include "list.h"
diff --git a/lib/vconn.c b/lib/vconn.c
index 69b39d760..e63489211 100644
--- a/lib/vconn.c
+++ b/lib/vconn.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "coverage.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "flow.h"
 #include "ofp-msgs.h"
diff --git a/lib/vlog.c b/lib/vlog.c
index bbc6eb6f6..4c36f1b78 100644
--- a/lib/vlog.c
+++ b/lib/vlog.c
@@ -31,7 +31,7 @@
 #include "async-append.h"
 #include "coverage.h"
 #include "dirs.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
 #include "ofpbuf.h"
 #include "ovs-thread.h"
 #include "sat-math.h"