summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc.jeanmougin@telecom-paristech.fr>2018-04-29 12:35:15 +0000
committerMarc Jeanmougin <marc.jeanmougin@telecom-paristech.fr>2018-04-29 12:35:15 +0000
commite4a6c1b52c721147bbda48d623879178a89b7b62 (patch)
tree557de694d44231c03a3e4d5364c30e6229684971 /src
parentMake the CMS toggle button update the canvas (diff)
downloadinkscape-e4a6c1b52c721147bbda48d623879178a89b7b62.tar.gz
inkscape-e4a6c1b52c721147bbda48d623879178a89b7b62.zip
moved libcroco, libuemf, libdepixelize to 3rdparty folder
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/CMakeLists.txt4
-rw-r--r--src/3rdparty/libcroco/CMakeLists.txt (renamed from src/libcroco/CMakeLists.txt)0
-rw-r--r--src/3rdparty/libcroco/README (renamed from src/libcroco/README)0
-rw-r--r--src/3rdparty/libcroco/cr-additional-sel.c (renamed from src/libcroco/cr-additional-sel.c)0
-rw-r--r--src/3rdparty/libcroco/cr-additional-sel.h (renamed from src/libcroco/cr-additional-sel.h)0
-rw-r--r--src/3rdparty/libcroco/cr-attr-sel.c (renamed from src/libcroco/cr-attr-sel.c)0
-rw-r--r--src/3rdparty/libcroco/cr-attr-sel.h (renamed from src/libcroco/cr-attr-sel.h)0
-rw-r--r--src/3rdparty/libcroco/cr-cascade.c (renamed from src/libcroco/cr-cascade.c)0
-rw-r--r--src/3rdparty/libcroco/cr-cascade.h (renamed from src/libcroco/cr-cascade.h)0
-rw-r--r--src/3rdparty/libcroco/cr-declaration.c (renamed from src/libcroco/cr-declaration.c)0
-rw-r--r--src/3rdparty/libcroco/cr-declaration.h (renamed from src/libcroco/cr-declaration.h)0
-rw-r--r--src/3rdparty/libcroco/cr-doc-handler.c (renamed from src/libcroco/cr-doc-handler.c)0
-rw-r--r--src/3rdparty/libcroco/cr-doc-handler.h (renamed from src/libcroco/cr-doc-handler.h)0
-rw-r--r--src/3rdparty/libcroco/cr-enc-handler.c (renamed from src/libcroco/cr-enc-handler.c)0
-rw-r--r--src/3rdparty/libcroco/cr-enc-handler.h (renamed from src/libcroco/cr-enc-handler.h)0
-rw-r--r--src/3rdparty/libcroco/cr-fonts.c (renamed from src/libcroco/cr-fonts.c)0
-rw-r--r--src/3rdparty/libcroco/cr-fonts.h (renamed from src/libcroco/cr-fonts.h)0
-rw-r--r--src/3rdparty/libcroco/cr-input.c (renamed from src/libcroco/cr-input.c)0
-rw-r--r--src/3rdparty/libcroco/cr-input.h (renamed from src/libcroco/cr-input.h)0
-rw-r--r--src/3rdparty/libcroco/cr-libxml-node-iface.c (renamed from src/libcroco/cr-libxml-node-iface.c)0
-rw-r--r--src/3rdparty/libcroco/cr-libxml-node-iface.h (renamed from src/libcroco/cr-libxml-node-iface.h)0
-rw-r--r--src/3rdparty/libcroco/cr-node-iface.h (renamed from src/libcroco/cr-node-iface.h)0
-rw-r--r--src/3rdparty/libcroco/cr-num.c (renamed from src/libcroco/cr-num.c)0
-rw-r--r--src/3rdparty/libcroco/cr-num.h (renamed from src/libcroco/cr-num.h)0
-rw-r--r--src/3rdparty/libcroco/cr-om-parser.c (renamed from src/libcroco/cr-om-parser.c)0
-rw-r--r--src/3rdparty/libcroco/cr-om-parser.h (renamed from src/libcroco/cr-om-parser.h)0
-rw-r--r--src/3rdparty/libcroco/cr-parser.c (renamed from src/libcroco/cr-parser.c)0
-rw-r--r--src/3rdparty/libcroco/cr-parser.h (renamed from src/libcroco/cr-parser.h)0
-rw-r--r--src/3rdparty/libcroco/cr-parsing-location.c (renamed from src/libcroco/cr-parsing-location.c)0
-rw-r--r--src/3rdparty/libcroco/cr-parsing-location.h (renamed from src/libcroco/cr-parsing-location.h)0
-rw-r--r--src/3rdparty/libcroco/cr-prop-list.c (renamed from src/libcroco/cr-prop-list.c)0
-rw-r--r--src/3rdparty/libcroco/cr-prop-list.h (renamed from src/libcroco/cr-prop-list.h)0
-rw-r--r--src/3rdparty/libcroco/cr-pseudo.c (renamed from src/libcroco/cr-pseudo.c)0
-rw-r--r--src/3rdparty/libcroco/cr-pseudo.h (renamed from src/libcroco/cr-pseudo.h)0
-rw-r--r--src/3rdparty/libcroco/cr-rgb.c (renamed from src/libcroco/cr-rgb.c)0
-rw-r--r--src/3rdparty/libcroco/cr-rgb.h (renamed from src/libcroco/cr-rgb.h)0
-rw-r--r--src/3rdparty/libcroco/cr-sel-eng.c (renamed from src/libcroco/cr-sel-eng.c)0
-rw-r--r--src/3rdparty/libcroco/cr-sel-eng.h (renamed from src/libcroco/cr-sel-eng.h)0
-rw-r--r--src/3rdparty/libcroco/cr-selector.c (renamed from src/libcroco/cr-selector.c)0
-rw-r--r--src/3rdparty/libcroco/cr-selector.h (renamed from src/libcroco/cr-selector.h)0
-rw-r--r--src/3rdparty/libcroco/cr-simple-sel.c (renamed from src/libcroco/cr-simple-sel.c)0
-rw-r--r--src/3rdparty/libcroco/cr-simple-sel.h (renamed from src/libcroco/cr-simple-sel.h)0
-rw-r--r--src/3rdparty/libcroco/cr-statement.c (renamed from src/libcroco/cr-statement.c)0
-rw-r--r--src/3rdparty/libcroco/cr-statement.h (renamed from src/libcroco/cr-statement.h)0
-rw-r--r--src/3rdparty/libcroco/cr-string.c (renamed from src/libcroco/cr-string.c)0
-rw-r--r--src/3rdparty/libcroco/cr-string.h (renamed from src/libcroco/cr-string.h)0
-rw-r--r--src/3rdparty/libcroco/cr-style.c (renamed from src/libcroco/cr-style.c)0
-rw-r--r--src/3rdparty/libcroco/cr-style.h (renamed from src/libcroco/cr-style.h)0
-rw-r--r--src/3rdparty/libcroco/cr-stylesheet.c (renamed from src/libcroco/cr-stylesheet.c)0
-rw-r--r--src/3rdparty/libcroco/cr-stylesheet.h (renamed from src/libcroco/cr-stylesheet.h)0
-rw-r--r--src/3rdparty/libcroco/cr-term.c (renamed from src/libcroco/cr-term.c)0
-rw-r--r--src/3rdparty/libcroco/cr-term.h (renamed from src/libcroco/cr-term.h)0
-rw-r--r--src/3rdparty/libcroco/cr-tknzr.c (renamed from src/libcroco/cr-tknzr.c)0
-rw-r--r--src/3rdparty/libcroco/cr-tknzr.h (renamed from src/libcroco/cr-tknzr.h)0
-rw-r--r--src/3rdparty/libcroco/cr-token.c (renamed from src/libcroco/cr-token.c)0
-rw-r--r--src/3rdparty/libcroco/cr-token.h (renamed from src/libcroco/cr-token.h)0
-rw-r--r--src/3rdparty/libcroco/cr-utils.c (renamed from src/libcroco/cr-utils.c)0
-rw-r--r--src/3rdparty/libcroco/cr-utils.h (renamed from src/libcroco/cr-utils.h)0
-rw-r--r--src/3rdparty/libcroco/libcroco.h (renamed from src/libcroco/libcroco.h)0
-rw-r--r--src/3rdparty/libdepixelize/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README (renamed from src/libdepixelize/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README)0
-rw-r--r--src/3rdparty/libdepixelize/CMakeLists.txt (renamed from src/libdepixelize/CMakeLists.txt)0
-rw-r--r--src/3rdparty/libdepixelize/kopftracer2011.cpp (renamed from src/libdepixelize/kopftracer2011.cpp)0
-rw-r--r--src/3rdparty/libdepixelize/kopftracer2011.h (renamed from src/libdepixelize/kopftracer2011.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/branchless.h (renamed from src/libdepixelize/priv/branchless.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/colorspace.h (renamed from src/libdepixelize/priv/colorspace.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/curvature.h (renamed from src/libdepixelize/priv/curvature.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/homogeneoussplines.h (renamed from src/libdepixelize/priv/homogeneoussplines.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/integral.h (renamed from src/libdepixelize/priv/integral.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/iterator.h (renamed from src/libdepixelize/priv/iterator.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/optimization-kopf2011.h (renamed from src/libdepixelize/priv/optimization-kopf2011.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/pixelgraph.h (renamed from src/libdepixelize/priv/pixelgraph.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/point.h (renamed from src/libdepixelize/priv/point.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/simplifiedvoronoi.h (renamed from src/libdepixelize/priv/simplifiedvoronoi.h)0
-rw-r--r--src/3rdparty/libdepixelize/priv/splines-kopf2011.h (renamed from src/libdepixelize/priv/splines-kopf2011.h)0
-rw-r--r--src/3rdparty/libdepixelize/splines.h (renamed from src/libdepixelize/splines.h)0
-rw-r--r--src/3rdparty/libuemf/CMakeLists.txt (renamed from src/libuemf/CMakeLists.txt)0
-rw-r--r--src/3rdparty/libuemf/README (renamed from src/libuemf/README)0
-rw-r--r--src/3rdparty/libuemf/symbol_convert.c (renamed from src/libuemf/symbol_convert.c)0
-rw-r--r--src/3rdparty/libuemf/symbol_convert.h (renamed from src/libuemf/symbol_convert.h)0
-rw-r--r--src/3rdparty/libuemf/uemf.c (renamed from src/libuemf/uemf.c)0
-rw-r--r--src/3rdparty/libuemf/uemf.h (renamed from src/libuemf/uemf.h)0
-rw-r--r--src/3rdparty/libuemf/uemf_endian.c (renamed from src/libuemf/uemf_endian.c)0
-rw-r--r--src/3rdparty/libuemf/uemf_endian.h (renamed from src/libuemf/uemf_endian.h)0
-rw-r--r--src/3rdparty/libuemf/uemf_print.c (renamed from src/libuemf/uemf_print.c)0
-rw-r--r--src/3rdparty/libuemf/uemf_print.h (renamed from src/libuemf/uemf_print.h)0
-rw-r--r--src/3rdparty/libuemf/uemf_safe.c (renamed from src/libuemf/uemf_safe.c)0
-rw-r--r--src/3rdparty/libuemf/uemf_safe.h (renamed from src/libuemf/uemf_safe.h)0
-rw-r--r--src/3rdparty/libuemf/uemf_utf.c (renamed from src/libuemf/uemf_utf.c)0
-rw-r--r--src/3rdparty/libuemf/uemf_utf.h (renamed from src/libuemf/uemf_utf.h)0
-rw-r--r--src/3rdparty/libuemf/upmf.c (renamed from src/libuemf/upmf.c)0
-rw-r--r--src/3rdparty/libuemf/upmf.h (renamed from src/libuemf/upmf.h)0
-rw-r--r--src/3rdparty/libuemf/upmf_print.c (renamed from src/libuemf/upmf_print.c)0
-rw-r--r--src/3rdparty/libuemf/upmf_print.h (renamed from src/libuemf/upmf_print.h)0
-rw-r--r--src/3rdparty/libuemf/uwmf.c (renamed from src/libuemf/uwmf.c)0
-rw-r--r--src/3rdparty/libuemf/uwmf.h (renamed from src/libuemf/uwmf.h)0
-rw-r--r--src/3rdparty/libuemf/uwmf_endian.c (renamed from src/libuemf/uwmf_endian.c)0
-rw-r--r--src/3rdparty/libuemf/uwmf_endian.h (renamed from src/libuemf/uwmf_endian.h)0
-rw-r--r--src/3rdparty/libuemf/uwmf_print.c (renamed from src/libuemf/uwmf_print.c)0
-rw-r--r--src/3rdparty/libuemf/uwmf_print.h (renamed from src/libuemf/uwmf_print.h)0
-rw-r--r--src/CMakeLists.txt12
-rw-r--r--src/document.cpp6
-rw-r--r--src/document.h2
-rw-r--r--src/extension/internal/emf-inout.cpp2
-rw-r--r--src/extension/internal/emf-inout.h6
-rw-r--r--src/extension/internal/emf-print.cpp2
-rw-r--r--src/extension/internal/emf-print.h2
-rw-r--r--src/extension/internal/metafile-inout.h2
-rw-r--r--src/extension/internal/metafile-print.h2
-rw-r--r--src/extension/internal/text_reassemble.c2
-rw-r--r--src/extension/internal/wmf-inout.cpp2
-rw-r--r--src/extension/internal/wmf-inout.h2
-rw-r--r--src/extension/internal/wmf-print.cpp2
-rw-r--r--src/extension/internal/wmf-print.h2
-rw-r--r--src/libnrtype/Layout-TNG-Output.cpp2
-rw-r--r--src/object/sp-style-elem.cpp2
-rw-r--r--src/style.cpp2
-rw-r--r--src/style.h4
-rw-r--r--src/ui/dialog/pixelartdialog.cpp2
-rw-r--r--src/xml/croco-node-iface.h2
-rw-r--r--src/xml/repr-css.cpp2
120 files changed, 35 insertions, 31 deletions
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
new file mode 100644
index 000000000..13b736ebf
--- /dev/null
+++ b/src/3rdparty/CMakeLists.txt
@@ -0,0 +1,4 @@
+#include(ExternalProject)
+add_subdirectory(libuemf)
+add_subdirectory(libcroco)
+add_subdirectory(libdepixelize)
diff --git a/src/libcroco/CMakeLists.txt b/src/3rdparty/libcroco/CMakeLists.txt
index af7f49654..af7f49654 100644
--- a/src/libcroco/CMakeLists.txt
+++ b/src/3rdparty/libcroco/CMakeLists.txt
diff --git a/src/libcroco/README b/src/3rdparty/libcroco/README
index 74df23145..74df23145 100644
--- a/src/libcroco/README
+++ b/src/3rdparty/libcroco/README
diff --git a/src/libcroco/cr-additional-sel.c b/src/3rdparty/libcroco/cr-additional-sel.c
index c34b8d243..c34b8d243 100644
--- a/src/libcroco/cr-additional-sel.c
+++ b/src/3rdparty/libcroco/cr-additional-sel.c
diff --git a/src/libcroco/cr-additional-sel.h b/src/3rdparty/libcroco/cr-additional-sel.h
index 7ca3e07d5..7ca3e07d5 100644
--- a/src/libcroco/cr-additional-sel.h
+++ b/src/3rdparty/libcroco/cr-additional-sel.h
diff --git a/src/libcroco/cr-attr-sel.c b/src/3rdparty/libcroco/cr-attr-sel.c
index 31d9da579..31d9da579 100644
--- a/src/libcroco/cr-attr-sel.c
+++ b/src/3rdparty/libcroco/cr-attr-sel.c
diff --git a/src/libcroco/cr-attr-sel.h b/src/3rdparty/libcroco/cr-attr-sel.h
index 82d5a87d7..82d5a87d7 100644
--- a/src/libcroco/cr-attr-sel.h
+++ b/src/3rdparty/libcroco/cr-attr-sel.h
diff --git a/src/libcroco/cr-cascade.c b/src/3rdparty/libcroco/cr-cascade.c
index 9f8dbdf8d..9f8dbdf8d 100644
--- a/src/libcroco/cr-cascade.c
+++ b/src/3rdparty/libcroco/cr-cascade.c
diff --git a/src/libcroco/cr-cascade.h b/src/3rdparty/libcroco/cr-cascade.h
index 3119ae85f..3119ae85f 100644
--- a/src/libcroco/cr-cascade.h
+++ b/src/3rdparty/libcroco/cr-cascade.h
diff --git a/src/libcroco/cr-declaration.c b/src/3rdparty/libcroco/cr-declaration.c
index 69c24b376..69c24b376 100644
--- a/src/libcroco/cr-declaration.c
+++ b/src/3rdparty/libcroco/cr-declaration.c
diff --git a/src/libcroco/cr-declaration.h b/src/3rdparty/libcroco/cr-declaration.h
index eee8be321..eee8be321 100644
--- a/src/libcroco/cr-declaration.h
+++ b/src/3rdparty/libcroco/cr-declaration.h
diff --git a/src/libcroco/cr-doc-handler.c b/src/3rdparty/libcroco/cr-doc-handler.c
index bbb158298..bbb158298 100644
--- a/src/libcroco/cr-doc-handler.c
+++ b/src/3rdparty/libcroco/cr-doc-handler.c
diff --git a/src/libcroco/cr-doc-handler.h b/src/3rdparty/libcroco/cr-doc-handler.h
index d12673f31..d12673f31 100644
--- a/src/libcroco/cr-doc-handler.h
+++ b/src/3rdparty/libcroco/cr-doc-handler.h
diff --git a/src/libcroco/cr-enc-handler.c b/src/3rdparty/libcroco/cr-enc-handler.c
index a7c4269ad..a7c4269ad 100644
--- a/src/libcroco/cr-enc-handler.c
+++ b/src/3rdparty/libcroco/cr-enc-handler.c
diff --git a/src/libcroco/cr-enc-handler.h b/src/3rdparty/libcroco/cr-enc-handler.h
index 0727764c0..0727764c0 100644
--- a/src/libcroco/cr-enc-handler.h
+++ b/src/3rdparty/libcroco/cr-enc-handler.h
diff --git a/src/libcroco/cr-fonts.c b/src/3rdparty/libcroco/cr-fonts.c
index 78e261149..78e261149 100644
--- a/src/libcroco/cr-fonts.c
+++ b/src/3rdparty/libcroco/cr-fonts.c
diff --git a/src/libcroco/cr-fonts.h b/src/3rdparty/libcroco/cr-fonts.h
index 9eaeeeb98..9eaeeeb98 100644
--- a/src/libcroco/cr-fonts.h
+++ b/src/3rdparty/libcroco/cr-fonts.h
diff --git a/src/libcroco/cr-input.c b/src/3rdparty/libcroco/cr-input.c
index 732068aff..732068aff 100644
--- a/src/libcroco/cr-input.c
+++ b/src/3rdparty/libcroco/cr-input.c
diff --git a/src/libcroco/cr-input.h b/src/3rdparty/libcroco/cr-input.h
index 9eb402a87..9eb402a87 100644
--- a/src/libcroco/cr-input.h
+++ b/src/3rdparty/libcroco/cr-input.h
diff --git a/src/libcroco/cr-libxml-node-iface.c b/src/3rdparty/libcroco/cr-libxml-node-iface.c
index bc860f974..bc860f974 100644
--- a/src/libcroco/cr-libxml-node-iface.c
+++ b/src/3rdparty/libcroco/cr-libxml-node-iface.c
diff --git a/src/libcroco/cr-libxml-node-iface.h b/src/3rdparty/libcroco/cr-libxml-node-iface.h
index b4a621293..b4a621293 100644
--- a/src/libcroco/cr-libxml-node-iface.h
+++ b/src/3rdparty/libcroco/cr-libxml-node-iface.h
diff --git a/src/libcroco/cr-node-iface.h b/src/3rdparty/libcroco/cr-node-iface.h
index 01898d641..01898d641 100644
--- a/src/libcroco/cr-node-iface.h
+++ b/src/3rdparty/libcroco/cr-node-iface.h
diff --git a/src/libcroco/cr-num.c b/src/3rdparty/libcroco/cr-num.c
index 6cc5150a1..6cc5150a1 100644
--- a/src/libcroco/cr-num.c
+++ b/src/3rdparty/libcroco/cr-num.c
diff --git a/src/libcroco/cr-num.h b/src/3rdparty/libcroco/cr-num.h
index 2b73aaf79..2b73aaf79 100644
--- a/src/libcroco/cr-num.h
+++ b/src/3rdparty/libcroco/cr-num.h
diff --git a/src/libcroco/cr-om-parser.c b/src/3rdparty/libcroco/cr-om-parser.c
index 596cd6e6b..596cd6e6b 100644
--- a/src/libcroco/cr-om-parser.c
+++ b/src/3rdparty/libcroco/cr-om-parser.c
diff --git a/src/libcroco/cr-om-parser.h b/src/3rdparty/libcroco/cr-om-parser.h
index 13d35b1cd..13d35b1cd 100644
--- a/src/libcroco/cr-om-parser.h
+++ b/src/3rdparty/libcroco/cr-om-parser.h
diff --git a/src/libcroco/cr-parser.c b/src/3rdparty/libcroco/cr-parser.c
index 6d1e64d28..6d1e64d28 100644
--- a/src/libcroco/cr-parser.c
+++ b/src/3rdparty/libcroco/cr-parser.c
diff --git a/src/libcroco/cr-parser.h b/src/3rdparty/libcroco/cr-parser.h
index 24cf5dfe8..24cf5dfe8 100644
--- a/src/libcroco/cr-parser.h
+++ b/src/3rdparty/libcroco/cr-parser.h
diff --git a/src/libcroco/cr-parsing-location.c b/src/3rdparty/libcroco/cr-parsing-location.c
index 4fe4acc30..4fe4acc30 100644
--- a/src/libcroco/cr-parsing-location.c
+++ b/src/3rdparty/libcroco/cr-parsing-location.c
diff --git a/src/libcroco/cr-parsing-location.h b/src/3rdparty/libcroco/cr-parsing-location.h
index b8064a560..b8064a560 100644
--- a/src/libcroco/cr-parsing-location.h
+++ b/src/3rdparty/libcroco/cr-parsing-location.h
diff --git a/src/libcroco/cr-prop-list.c b/src/3rdparty/libcroco/cr-prop-list.c
index dc575d6ff..dc575d6ff 100644
--- a/src/libcroco/cr-prop-list.c
+++ b/src/3rdparty/libcroco/cr-prop-list.c
diff --git a/src/libcroco/cr-prop-list.h b/src/3rdparty/libcroco/cr-prop-list.h
index 797ba43ea..797ba43ea 100644
--- a/src/libcroco/cr-prop-list.h
+++ b/src/3rdparty/libcroco/cr-prop-list.h
diff --git a/src/libcroco/cr-pseudo.c b/src/3rdparty/libcroco/cr-pseudo.c
index 8715c19f1..8715c19f1 100644
--- a/src/libcroco/cr-pseudo.c
+++ b/src/3rdparty/libcroco/cr-pseudo.c
diff --git a/src/libcroco/cr-pseudo.h b/src/3rdparty/libcroco/cr-pseudo.h
index b78435014..b78435014 100644
--- a/src/libcroco/cr-pseudo.h
+++ b/src/3rdparty/libcroco/cr-pseudo.h
diff --git a/src/libcroco/cr-rgb.c b/src/3rdparty/libcroco/cr-rgb.c
index 889f248b6..889f248b6 100644
--- a/src/libcroco/cr-rgb.c
+++ b/src/3rdparty/libcroco/cr-rgb.c
diff --git a/src/libcroco/cr-rgb.h b/src/3rdparty/libcroco/cr-rgb.h
index a127a440e..a127a440e 100644
--- a/src/libcroco/cr-rgb.h
+++ b/src/3rdparty/libcroco/cr-rgb.h
diff --git a/src/libcroco/cr-sel-eng.c b/src/3rdparty/libcroco/cr-sel-eng.c
index 9e35ad93f..9e35ad93f 100644
--- a/src/libcroco/cr-sel-eng.c
+++ b/src/3rdparty/libcroco/cr-sel-eng.c
diff --git a/src/libcroco/cr-sel-eng.h b/src/3rdparty/libcroco/cr-sel-eng.h
index 206990eb6..206990eb6 100644
--- a/src/libcroco/cr-sel-eng.h
+++ b/src/3rdparty/libcroco/cr-sel-eng.h
diff --git a/src/libcroco/cr-selector.c b/src/3rdparty/libcroco/cr-selector.c
index f9193feda..f9193feda 100644
--- a/src/libcroco/cr-selector.c
+++ b/src/3rdparty/libcroco/cr-selector.c
diff --git a/src/libcroco/cr-selector.h b/src/3rdparty/libcroco/cr-selector.h
index a7e029597..a7e029597 100644
--- a/src/libcroco/cr-selector.h
+++ b/src/3rdparty/libcroco/cr-selector.h
diff --git a/src/libcroco/cr-simple-sel.c b/src/3rdparty/libcroco/cr-simple-sel.c
index 3a4a3b2e2..3a4a3b2e2 100644
--- a/src/libcroco/cr-simple-sel.c
+++ b/src/3rdparty/libcroco/cr-simple-sel.c
diff --git a/src/libcroco/cr-simple-sel.h b/src/3rdparty/libcroco/cr-simple-sel.h
index 552e44f00..552e44f00 100644
--- a/src/libcroco/cr-simple-sel.h
+++ b/src/3rdparty/libcroco/cr-simple-sel.h
diff --git a/src/libcroco/cr-statement.c b/src/3rdparty/libcroco/cr-statement.c
index e31123aec..e31123aec 100644
--- a/src/libcroco/cr-statement.c
+++ b/src/3rdparty/libcroco/cr-statement.c
diff --git a/src/libcroco/cr-statement.h b/src/3rdparty/libcroco/cr-statement.h
index 74a233055..74a233055 100644
--- a/src/libcroco/cr-statement.h
+++ b/src/3rdparty/libcroco/cr-statement.h
diff --git a/src/libcroco/cr-string.c b/src/3rdparty/libcroco/cr-string.c
index 86ad3432c..86ad3432c 100644
--- a/src/libcroco/cr-string.c
+++ b/src/3rdparty/libcroco/cr-string.c
diff --git a/src/libcroco/cr-string.h b/src/3rdparty/libcroco/cr-string.h
index 2700f0e2e..2700f0e2e 100644
--- a/src/libcroco/cr-string.h
+++ b/src/3rdparty/libcroco/cr-string.h
diff --git a/src/libcroco/cr-style.c b/src/3rdparty/libcroco/cr-style.c
index 2b865c248..2b865c248 100644
--- a/src/libcroco/cr-style.c
+++ b/src/3rdparty/libcroco/cr-style.c
diff --git a/src/libcroco/cr-style.h b/src/3rdparty/libcroco/cr-style.h
index 18aeaad09..18aeaad09 100644
--- a/src/libcroco/cr-style.h
+++ b/src/3rdparty/libcroco/cr-style.h
diff --git a/src/libcroco/cr-stylesheet.c b/src/3rdparty/libcroco/cr-stylesheet.c
index a2cfc20c9..a2cfc20c9 100644
--- a/src/libcroco/cr-stylesheet.c
+++ b/src/3rdparty/libcroco/cr-stylesheet.c
diff --git a/src/libcroco/cr-stylesheet.h b/src/3rdparty/libcroco/cr-stylesheet.h
index 7ebaf7a60..7ebaf7a60 100644
--- a/src/libcroco/cr-stylesheet.h
+++ b/src/3rdparty/libcroco/cr-stylesheet.h
diff --git a/src/libcroco/cr-term.c b/src/3rdparty/libcroco/cr-term.c
index aec524b0b..aec524b0b 100644
--- a/src/libcroco/cr-term.c
+++ b/src/3rdparty/libcroco/cr-term.c
diff --git a/src/libcroco/cr-term.h b/src/3rdparty/libcroco/cr-term.h
index 39b9c6a8b..39b9c6a8b 100644
--- a/src/libcroco/cr-term.h
+++ b/src/3rdparty/libcroco/cr-term.h
diff --git a/src/libcroco/cr-tknzr.c b/src/3rdparty/libcroco/cr-tknzr.c
index 83f6ab3c0..83f6ab3c0 100644
--- a/src/libcroco/cr-tknzr.c
+++ b/src/3rdparty/libcroco/cr-tknzr.c
diff --git a/src/libcroco/cr-tknzr.h b/src/3rdparty/libcroco/cr-tknzr.h
index 13985b30e..13985b30e 100644
--- a/src/libcroco/cr-tknzr.h
+++ b/src/3rdparty/libcroco/cr-tknzr.h
diff --git a/src/libcroco/cr-token.c b/src/3rdparty/libcroco/cr-token.c
index dfe83e221..dfe83e221 100644
--- a/src/libcroco/cr-token.c
+++ b/src/3rdparty/libcroco/cr-token.c
diff --git a/src/libcroco/cr-token.h b/src/3rdparty/libcroco/cr-token.h
index 35e914d2d..35e914d2d 100644
--- a/src/libcroco/cr-token.h
+++ b/src/3rdparty/libcroco/cr-token.h
diff --git a/src/libcroco/cr-utils.c b/src/3rdparty/libcroco/cr-utils.c
index bfb587017..bfb587017 100644
--- a/src/libcroco/cr-utils.c
+++ b/src/3rdparty/libcroco/cr-utils.c
diff --git a/src/libcroco/cr-utils.h b/src/3rdparty/libcroco/cr-utils.h
index 3959b1037..3959b1037 100644
--- a/src/libcroco/cr-utils.h
+++ b/src/3rdparty/libcroco/cr-utils.h
diff --git a/src/libcroco/libcroco.h b/src/3rdparty/libcroco/libcroco.h
index 579715a6e..579715a6e 100644
--- a/src/libcroco/libcroco.h
+++ b/src/3rdparty/libcroco/libcroco.h
diff --git a/src/libdepixelize/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README b/src/3rdparty/libdepixelize/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README
index df63435d6..df63435d6 100644
--- a/src/libdepixelize/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README
+++ b/src/3rdparty/libdepixelize/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README
diff --git a/src/libdepixelize/CMakeLists.txt b/src/3rdparty/libdepixelize/CMakeLists.txt
index a69d37bc7..a69d37bc7 100644
--- a/src/libdepixelize/CMakeLists.txt
+++ b/src/3rdparty/libdepixelize/CMakeLists.txt
diff --git a/src/libdepixelize/kopftracer2011.cpp b/src/3rdparty/libdepixelize/kopftracer2011.cpp
index 96784b14f..96784b14f 100644
--- a/src/libdepixelize/kopftracer2011.cpp
+++ b/src/3rdparty/libdepixelize/kopftracer2011.cpp
diff --git a/src/libdepixelize/kopftracer2011.h b/src/3rdparty/libdepixelize/kopftracer2011.h
index c60d0a61a..c60d0a61a 100644
--- a/src/libdepixelize/kopftracer2011.h
+++ b/src/3rdparty/libdepixelize/kopftracer2011.h
diff --git a/src/libdepixelize/priv/branchless.h b/src/3rdparty/libdepixelize/priv/branchless.h
index 487a9688d..487a9688d 100644
--- a/src/libdepixelize/priv/branchless.h
+++ b/src/3rdparty/libdepixelize/priv/branchless.h
diff --git a/src/libdepixelize/priv/colorspace.h b/src/3rdparty/libdepixelize/priv/colorspace.h
index 4982630ad..4982630ad 100644
--- a/src/libdepixelize/priv/colorspace.h
+++ b/src/3rdparty/libdepixelize/priv/colorspace.h
diff --git a/src/libdepixelize/priv/curvature.h b/src/3rdparty/libdepixelize/priv/curvature.h
index 3a1af4197..3a1af4197 100644
--- a/src/libdepixelize/priv/curvature.h
+++ b/src/3rdparty/libdepixelize/priv/curvature.h
diff --git a/src/libdepixelize/priv/homogeneoussplines.h b/src/3rdparty/libdepixelize/priv/homogeneoussplines.h
index 6c4894dd8..6c4894dd8 100644
--- a/src/libdepixelize/priv/homogeneoussplines.h
+++ b/src/3rdparty/libdepixelize/priv/homogeneoussplines.h
diff --git a/src/libdepixelize/priv/integral.h b/src/3rdparty/libdepixelize/priv/integral.h
index fc1a49f27..fc1a49f27 100644
--- a/src/libdepixelize/priv/integral.h
+++ b/src/3rdparty/libdepixelize/priv/integral.h
diff --git a/src/libdepixelize/priv/iterator.h b/src/3rdparty/libdepixelize/priv/iterator.h
index 7caa9bfa9..7caa9bfa9 100644
--- a/src/libdepixelize/priv/iterator.h
+++ b/src/3rdparty/libdepixelize/priv/iterator.h
diff --git a/src/libdepixelize/priv/optimization-kopf2011.h b/src/3rdparty/libdepixelize/priv/optimization-kopf2011.h
index 0c9011ca7..0c9011ca7 100644
--- a/src/libdepixelize/priv/optimization-kopf2011.h
+++ b/src/3rdparty/libdepixelize/priv/optimization-kopf2011.h
diff --git a/src/libdepixelize/priv/pixelgraph.h b/src/3rdparty/libdepixelize/priv/pixelgraph.h
index 112242647..112242647 100644
--- a/src/libdepixelize/priv/pixelgraph.h
+++ b/src/3rdparty/libdepixelize/priv/pixelgraph.h
diff --git a/src/libdepixelize/priv/point.h b/src/3rdparty/libdepixelize/priv/point.h
index 53babd9dc..53babd9dc 100644
--- a/src/libdepixelize/priv/point.h
+++ b/src/3rdparty/libdepixelize/priv/point.h
diff --git a/src/libdepixelize/priv/simplifiedvoronoi.h b/src/3rdparty/libdepixelize/priv/simplifiedvoronoi.h
index 84feab08d..84feab08d 100644
--- a/src/libdepixelize/priv/simplifiedvoronoi.h
+++ b/src/3rdparty/libdepixelize/priv/simplifiedvoronoi.h
diff --git a/src/libdepixelize/priv/splines-kopf2011.h b/src/3rdparty/libdepixelize/priv/splines-kopf2011.h
index c3da58c05..c3da58c05 100644
--- a/src/libdepixelize/priv/splines-kopf2011.h
+++ b/src/3rdparty/libdepixelize/priv/splines-kopf2011.h
diff --git a/src/libdepixelize/splines.h b/src/3rdparty/libdepixelize/splines.h
index b06ba8ba9..b06ba8ba9 100644
--- a/src/libdepixelize/splines.h
+++ b/src/3rdparty/libdepixelize/splines.h
diff --git a/src/libuemf/CMakeLists.txt b/src/3rdparty/libuemf/CMakeLists.txt
index 9e6b68994..9e6b68994 100644
--- a/src/libuemf/CMakeLists.txt
+++ b/src/3rdparty/libuemf/CMakeLists.txt
diff --git a/src/libuemf/README b/src/3rdparty/libuemf/README
index f65120c30..f65120c30 100644
--- a/src/libuemf/README
+++ b/src/3rdparty/libuemf/README
diff --git a/src/libuemf/symbol_convert.c b/src/3rdparty/libuemf/symbol_convert.c
index 6a919fc2f..6a919fc2f 100644
--- a/src/libuemf/symbol_convert.c
+++ b/src/3rdparty/libuemf/symbol_convert.c
diff --git a/src/libuemf/symbol_convert.h b/src/3rdparty/libuemf/symbol_convert.h
index ac1795092..ac1795092 100644
--- a/src/libuemf/symbol_convert.h
+++ b/src/3rdparty/libuemf/symbol_convert.h
diff --git a/src/libuemf/uemf.c b/src/3rdparty/libuemf/uemf.c
index fa7689bb6..fa7689bb6 100644
--- a/src/libuemf/uemf.c
+++ b/src/3rdparty/libuemf/uemf.c
diff --git a/src/libuemf/uemf.h b/src/3rdparty/libuemf/uemf.h
index 3a51e39e2..3a51e39e2 100644
--- a/src/libuemf/uemf.h
+++ b/src/3rdparty/libuemf/uemf.h
diff --git a/src/libuemf/uemf_endian.c b/src/3rdparty/libuemf/uemf_endian.c
index f746553f1..f746553f1 100644
--- a/src/libuemf/uemf_endian.c
+++ b/src/3rdparty/libuemf/uemf_endian.c
diff --git a/src/libuemf/uemf_endian.h b/src/3rdparty/libuemf/uemf_endian.h
index 9dbcec455..9dbcec455 100644
--- a/src/libuemf/uemf_endian.h
+++ b/src/3rdparty/libuemf/uemf_endian.h
diff --git a/src/libuemf/uemf_print.c b/src/3rdparty/libuemf/uemf_print.c
index 28fe0b7c3..28fe0b7c3 100644
--- a/src/libuemf/uemf_print.c
+++ b/src/3rdparty/libuemf/uemf_print.c
diff --git a/src/libuemf/uemf_print.h b/src/3rdparty/libuemf/uemf_print.h
index 088a8a302..088a8a302 100644
--- a/src/libuemf/uemf_print.h
+++ b/src/3rdparty/libuemf/uemf_print.h
diff --git a/src/libuemf/uemf_safe.c b/src/3rdparty/libuemf/uemf_safe.c
index a3e050282..a3e050282 100644
--- a/src/libuemf/uemf_safe.c
+++ b/src/3rdparty/libuemf/uemf_safe.c
diff --git a/src/libuemf/uemf_safe.h b/src/3rdparty/libuemf/uemf_safe.h
index 0c9e3cc69..0c9e3cc69 100644
--- a/src/libuemf/uemf_safe.h
+++ b/src/3rdparty/libuemf/uemf_safe.h
diff --git a/src/libuemf/uemf_utf.c b/src/3rdparty/libuemf/uemf_utf.c
index 5c6507818..5c6507818 100644
--- a/src/libuemf/uemf_utf.c
+++ b/src/3rdparty/libuemf/uemf_utf.c
diff --git a/src/libuemf/uemf_utf.h b/src/3rdparty/libuemf/uemf_utf.h
index 68452b687..68452b687 100644
--- a/src/libuemf/uemf_utf.h
+++ b/src/3rdparty/libuemf/uemf_utf.h
diff --git a/src/libuemf/upmf.c b/src/3rdparty/libuemf/upmf.c
index 5cb558ac6..5cb558ac6 100644
--- a/src/libuemf/upmf.c
+++ b/src/3rdparty/libuemf/upmf.c
diff --git a/src/libuemf/upmf.h b/src/3rdparty/libuemf/upmf.h
index 4fb7ad492..4fb7ad492 100644
--- a/src/libuemf/upmf.h
+++ b/src/3rdparty/libuemf/upmf.h
diff --git a/src/libuemf/upmf_print.c b/src/3rdparty/libuemf/upmf_print.c
index 69fad3691..69fad3691 100644
--- a/src/libuemf/upmf_print.c
+++ b/src/3rdparty/libuemf/upmf_print.c
diff --git a/src/libuemf/upmf_print.h b/src/3rdparty/libuemf/upmf_print.h
index a25374487..a25374487 100644
--- a/src/libuemf/upmf_print.h
+++ b/src/3rdparty/libuemf/upmf_print.h
diff --git a/src/libuemf/uwmf.c b/src/3rdparty/libuemf/uwmf.c
index 50e4075d8..50e4075d8 100644
--- a/src/libuemf/uwmf.c
+++ b/src/3rdparty/libuemf/uwmf.c
diff --git a/src/libuemf/uwmf.h b/src/3rdparty/libuemf/uwmf.h
index 529232ca9..529232ca9 100644
--- a/src/libuemf/uwmf.h
+++ b/src/3rdparty/libuemf/uwmf.h
diff --git a/src/libuemf/uwmf_endian.c b/src/3rdparty/libuemf/uwmf_endian.c
index 7a047c2a5..7a047c2a5 100644
--- a/src/libuemf/uwmf_endian.c
+++ b/src/3rdparty/libuemf/uwmf_endian.c
diff --git a/src/libuemf/uwmf_endian.h b/src/3rdparty/libuemf/uwmf_endian.h
index 6ce7f1984..6ce7f1984 100644
--- a/src/libuemf/uwmf_endian.h
+++ b/src/3rdparty/libuemf/uwmf_endian.h
diff --git a/src/libuemf/uwmf_print.c b/src/3rdparty/libuemf/uwmf_print.c
index d6d1b584e..d6d1b584e 100644
--- a/src/libuemf/uwmf_print.c
+++ b/src/3rdparty/libuemf/uwmf_print.c
diff --git a/src/libuemf/uwmf_print.h b/src/3rdparty/libuemf/uwmf_print.h
index 54dfe9c9c..54dfe9c9c 100644
--- a/src/libuemf/uwmf_print.h
+++ b/src/3rdparty/libuemf/uwmf_print.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5db3faed4..6135288ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -272,15 +272,15 @@ add_subdirectory(xml)
add_subdirectory(2geom)
# Directories containing lists files that describe building internal libraries
-add_subdirectory(libavoid)
-add_subdirectory(libcola)
-add_subdirectory(libcroco)
+add_subdirectory(3rdparty)
add_subdirectory(inkgc)
-add_subdirectory(libuemf)
-add_subdirectory(libvpsc)
add_subdirectory(livarot)
add_subdirectory(libnrtype)
-add_subdirectory(libdepixelize)
+
+#these are independent from inkscape and should be packaged as a separate project.
+add_subdirectory(libcola)
+add_subdirectory(libavoid)
+add_subdirectory(libvpsc)
get_property(inkscape_global_SRC GLOBAL PROPERTY inkscape_global_SRC)
diff --git a/src/document.cpp b/src/document.cpp
index a2babbed7..eaaa318e9 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -60,9 +60,9 @@
#include "libavoid/router.h"
-#include "libcroco/cr-parser.h"
-#include "libcroco/cr-sel-eng.h"
-#include "libcroco/cr-selector.h"
+#include "3rdparty/libcroco/cr-parser.h"
+#include "3rdparty/libcroco/cr-sel-eng.h"
+#include "3rdparty/libcroco/cr-selector.h"
#include "object/persp3d.h"
#include "object/sp-factory.h"
diff --git a/src/document.h b/src/document.h
index 12f6cb724..65f0cf628 100644
--- a/src/document.h
+++ b/src/document.h
@@ -19,7 +19,7 @@
#include <stddef.h>
#include <sigc++/sigc++.h>
-#include "libcroco/cr-cascade.h"
+#include "3rdparty/libcroco/cr-cascade.h"
#include <2geom/forward.h>
#include "inkgc/gc-managed.h"
#include "gc-finalized.h"
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 8da11fc98..54099271b 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -30,7 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
-#include <libuemf/symbol_convert.h>
+#include <3rdparty/libuemf/symbol_convert.h>
#include "document.h"
#include "object/sp-root.h"
diff --git a/src/extension/internal/emf-inout.h b/src/extension/internal/emf-inout.h
index dd1d8f9c4..6cc4ceffb 100644
--- a/src/extension/internal/emf-inout.h
+++ b/src/extension/internal/emf-inout.h
@@ -12,9 +12,9 @@
#ifndef SEEN_EXTENSION_INTERNAL_EMF_H
#define SEEN_EXTENSION_INTERNAL_EMF_H
-#include <libuemf/uemf.h>
-#include <libuemf/uemf_safe.h>
-#include <libuemf/uemf_endian.h> // for U_emf_record_sizeok()
+#include <3rdparty/libuemf/uemf.h>
+#include <3rdparty/libuemf/uemf_safe.h>
+#include <3rdparty/libuemf/uemf_endian.h> // for U_emf_record_sizeok()
#include "extension/internal/metafile-inout.h" // picks up PNG
#include "extension/implementation/implementation.h"
#include "style.h"
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 539477a13..0b005f8da 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -28,7 +28,7 @@
#include <string.h>
#include <glibmm/miscutils.h>
-#include <libuemf/symbol_convert.h>
+#include <3rdparty/libuemf/symbol_convert.h>
#include <2geom/sbasis-to-bezier.h>
#include <2geom/path.h>
#include <2geom/pathvector.h>
diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h
index 7ca602fec..5e9a67ca1 100644
--- a/src/extension/internal/emf-print.h
+++ b/src/extension/internal/emf-print.h
@@ -16,7 +16,7 @@
# include "config.h"
#endif
-#include <libuemf/uemf.h>
+#include <3rdparty/libuemf/uemf.h>
#include "extension/internal/metafile-print.h"
#include "splivarot.h" // pieces for union on shapes
diff --git a/src/extension/internal/metafile-inout.h b/src/extension/internal/metafile-inout.h
index b3efee2a6..fd6ef28a8 100644
--- a/src/extension/internal/metafile-inout.h
+++ b/src/extension/internal/metafile-inout.h
@@ -23,7 +23,7 @@
#include <map>
#include <stack>
#include <glibmm/ustring.h>
-#include <libuemf/uemf.h>
+#include <3rdparty/libuemf/uemf.h>
#include <2geom/affine.h>
#include <2geom/pathvector.h>
diff --git a/src/extension/internal/metafile-print.h b/src/extension/internal/metafile-print.h
index 9903cbb98..eac93cbda 100644
--- a/src/extension/internal/metafile-print.h
+++ b/src/extension/internal/metafile-print.h
@@ -18,7 +18,7 @@
#include <map>
#include <stack>
#include <glibmm/ustring.h>
-#include <libuemf/uemf.h>
+#include <3rdparty/libuemf/uemf.h>
#include <2geom/affine.h>
#include <2geom/pathvector.h>
diff --git a/src/extension/internal/text_reassemble.c b/src/extension/internal/text_reassemble.c
index b191d4ea2..397a0c4d3 100644
--- a/src/extension/internal/text_reassemble.c
+++ b/src/extension/internal/text_reassemble.c
@@ -79,7 +79,7 @@ extern "C" {
#endif
#include "text_reassemble.h"
-#include <libuemf/uemf_utf.h> /* For a couple of text functions. Exact copy from libUEMF. */
+#include <3rdparty/libuemf/uemf_utf.h> /* For a couple of text functions. Exact copy from libUEMF. */
#include <locale.h>
#include <float.h>
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index a91725f6b..45f59ec03 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
-#include <libuemf/symbol_convert.h>
+#include <3rdparty/libuemf/symbol_convert.h>
#include "document.h"
#include "object/sp-root.h" // even though it is included indirectly by wmf-inout.h
diff --git a/src/extension/internal/wmf-inout.h b/src/extension/internal/wmf-inout.h
index 5a0a760dd..19cf53956 100644
--- a/src/extension/internal/wmf-inout.h
+++ b/src/extension/internal/wmf-inout.h
@@ -11,7 +11,7 @@
#ifndef SEEN_EXTENSION_INTERNAL_WMF_H
#define SEEN_EXTENSION_INTERNAL_WMF_H
-#include <libuemf/uwmf.h>
+#include <3rdparty/libuemf/uwmf.h>
#include "extension/internal/metafile-inout.h" // picks up PNG
#include "extension/implementation/implementation.h"
#include "style.h"
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index ccf5ddd0b..cdc59298b 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -64,7 +64,7 @@
#include "wmf-print.h"
#include <string.h>
-#include <libuemf/symbol_convert.h>
+#include <3rdparty/libuemf/symbol_convert.h>
namespace Inkscape {
namespace Extension {
diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h
index 45b94441c..be35da717 100644
--- a/src/extension/internal/wmf-print.h
+++ b/src/extension/internal/wmf-print.h
@@ -15,7 +15,7 @@
# include "config.h"
#endif
-#include <libuemf/uwmf.h>
+#include <3rdparty/libuemf/uwmf.h>
#include "extension/internal/metafile-print.h"
#include "splivarot.h" // pieces for union on shapes
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
index 6a05b4ea1..884c1a319 100644
--- a/src/libnrtype/Layout-TNG-Output.cpp
+++ b/src/libnrtype/Layout-TNG-Output.cpp
@@ -20,7 +20,7 @@
#include "extension/internal/cairo-render-context.h"
#include "display/curve.h"
#include <2geom/pathvector.h>
-#include <libuemf/symbol_convert.h>
+#include <3rdparty/libuemf/symbol_convert.h>
namespace Inkscape {
diff --git a/src/object/sp-style-elem.cpp b/src/object/sp-style-elem.cpp
index 4c954dc41..f1e66ae45 100644
--- a/src/object/sp-style-elem.cpp
+++ b/src/object/sp-style-elem.cpp
@@ -1,4 +1,4 @@
-#include <libcroco/cr-parser.h>
+#include <3rdparty/libcroco/cr-parser.h>
#include "xml/node-event-vector.h"
#include "xml/repr.h"
#include "document.h"
diff --git a/src/style.cpp b/src/style.cpp
index e05c2ae97..5d6ba7a15 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -38,7 +38,7 @@
#include "display/canvas-bpath.h"
-#include "libcroco/cr-sel-eng.h"
+#include "3rdparty/libcroco/cr-sel-eng.h"
#include "object/sp-paint-server.h"
#include "object/uri-references.h"
diff --git a/src/style.h b/src/style.h
index 2556ba2b1..8accd0384 100644
--- a/src/style.h
+++ b/src/style.h
@@ -23,6 +23,8 @@
#include <sigc++/connection.h>
#include <iostream>
#include <vector>
+#include "3rdparty/libcroco/cr-declaration.h"
+#include "3rdparty/libcroco/cr-prop-list.h"
// Define SPIBasePtr, a Pointer to a data member of SPStyle of type SPIBase;
typedef SPIBase SPStyle::*SPIBasePtr;
@@ -36,8 +38,6 @@ class Node;
}
}
-#include "libcroco/cr-declaration.h"
-#include "libcroco/cr-prop-list.h"
/// An SVG style object.
class SPStyle {
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index d5f3de406..5b96febb7 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -40,7 +40,7 @@
#include "display/cairo-utils.h"
-#include "libdepixelize/kopftracer2011.h"
+#include "3rdparty/libdepixelize/kopftracer2011.h"
#include "object/sp-image.h"
diff --git a/src/xml/croco-node-iface.h b/src/xml/croco-node-iface.h
index bfac85e04..2e035c31f 100644
--- a/src/xml/croco-node-iface.h
+++ b/src/xml/croco-node-iface.h
@@ -1,7 +1,7 @@
#ifndef INKSCAPE_SP_REPR_NODE_IFACE_H
#define INKSCAPE_SP_REPR_NODE_IFACE_H
-#include <libcroco/cr-node-iface.h>
+#include <3rdparty/libcroco/cr-node-iface.h>
namespace Inkscape {
namespace XML {
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 11c8bcf60..63ad05e04 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -24,7 +24,7 @@
#include <glibmm/ustring.h>
-#include "libcroco/cr-declaration.h"
+#include "3rdparty/libcroco/cr-declaration.h"
#include "svg/css-ostringstream.h"