diff --git a/src/GenApiSchema_Version_1_0.xsd b/aravis/GenApiSchema_Version_1_0.xsd
similarity index 100%
rename from src/GenApiSchema_Version_1_0.xsd
rename to aravis/GenApiSchema_Version_1_0.xsd
diff --git a/src/GenApiSchema_Version_1_1.xsd b/aravis/GenApiSchema_Version_1_1.xsd
similarity index 100%
rename from src/GenApiSchema_Version_1_1.xsd
rename to aravis/GenApiSchema_Version_1_1.xsd
diff --git a/src/aravis.rules b/aravis/aravis.rules
similarity index 100%
rename from src/aravis.rules
rename to aravis/aravis.rules
diff --git a/src/arv-fake-camera.xml b/aravis/arv-fake-camera.xml
similarity index 100%
rename from src/arv-fake-camera.xml
rename to aravis/arv-fake-camera.xml
diff --git a/src/arv-gev-bootstrap.xml b/aravis/arv-gev-bootstrap.xml
similarity index 100%
rename from src/arv-gev-bootstrap.xml
rename to aravis/arv-gev-bootstrap.xml
diff --git a/src/arv-test.cfg b/aravis/arv-test.cfg
similarity index 100%
rename from src/arv-test.cfg
rename to aravis/arv-test.cfg
diff --git a/src/arv-v4l2.xml b/aravis/arv-v4l2.xml
similarity index 100%
rename from src/arv-v4l2.xml
rename to aravis/arv-v4l2.xml
diff --git a/aravis/arv.h b/aravis/arv.h
new file mode 100644
index 000000000..16d7b0712
--- /dev/null
+++ b/aravis/arv.h
@@ -0,0 +1,132 @@
+/* Aravis - Digital camera library
+ *
+ * Copyright © 2009-2025 Emmanuel Pacaud <emmanuel.pacaud@free.fr>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
+ */
+
+#ifndef ARV_H
+#define ARV_H
+
+#define ARV_H_INSIDE
+
+#include <aravis/arvtypes.h>
+
+#include <aravis/arvbuffer.h>
+#include <aravis/arvcamera.h>
+#include <aravis/arvchunkparser.h>
+#include <aravis/arvdebug.h>
+#include <aravis/arvdevice.h>
+
+#include <aravis/arvdomcharacterdata.h>
+#include <aravis/arvdomdocumentfragment.h>
+#include <aravis/arvdomdocument.h>
+#include <aravis/arvdomelement.h>
+#include <aravis/arvdomimplementation.h>
+#include <aravis/arvdomnamednodemap.h>
+#include <aravis/arvdomnode.h>
+#include <aravis/arvdomnodelist.h>
+#include <aravis/arvdomnodechildlist.h>
+#include <aravis/arvdomparser.h>
+#include <aravis/arvdomtext.h>
+
+#include <aravis/arvenums.h>
+#include <aravis/arvevaluator.h>
+
+#include <aravis/arvfakecamera.h>
+#include <aravis/arvfakedevice.h>
+#include <aravis/arvfakeinterface.h>
+#include <aravis/arvfakestream.h>
+
+#include <aravis/arvfeatures.h>
+
+#include <aravis/arvgc.h>
+#include <aravis/arvgcboolean.h>
+#include <aravis/arvgccategory.h>
+#include <aravis/arvgccommand.h>
+#include <aravis/arvgcconverter.h>
+#include <aravis/arvgcconverternode.h>
+#include <aravis/arvgcenumentry.h>
+#include <aravis/arvgcenumeration.h>
+#include <aravis/arvgcenums.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcfloat.h>
+#include <aravis/arvgcfloatnode.h>
+#include <aravis/arvgcfloatregnode.h>
+#include <aravis/arvgcgroupnode.h>
+#include <aravis/arvgcindexnode.h>
+#include <aravis/arvgcintconverternode.h>
+#include <aravis/arvgcinteger.h>
+#include <aravis/arvgcintegernode.h>
+#include <aravis/arvgcintregnode.h>
+#include <aravis/arvgcintswissknifenode.h>
+#include <aravis/arvgcinvalidatornode.h>
+#include <aravis/arvgcnode.h>
+#include <aravis/arvgcmaskedintregnode.h>
+#include <aravis/arvgcport.h>
+#include <aravis/arvgcpropertynode.h>
+#include <aravis/arvgcregisterdescriptionnode.h>
+#include <aravis/arvgcregister.h>
+#include <aravis/arvgcregisternode.h>
+#include <aravis/arvgcselector.h>
+#include <aravis/arvgcstring.h>
+#include <aravis/arvgcstringnode.h>
+#include <aravis/arvgcstringregnode.h>
+#include <aravis/arvgcstructregnode.h>
+#include <aravis/arvgcstructentrynode.h>
+#include <aravis/arvgcswissknife.h>
+#include <aravis/arvgcswissknifenode.h>
+#include <aravis/arvgcvalueindexednode.h>
+
+#include <aravis/arvgvdevice.h>
+#include <aravis/arvgvfakecamera.h>
+#include <aravis/arvgvinterface.h>
+#include <aravis/arvgvstream.h>
+
+#include <aravis/arvgentlsystem.h>
+#include <aravis/arvgentlinterface.h>
+#include <aravis/arvgentldevice.h>
+#include <aravis/arvgentlstream.h>
+
+#include <aravis/arvinterface.h>
+#include <aravis/arvmisc.h>
+#include <aravis/arvnetwork.h>
+#include <aravis/arvrealtime.h>
+#include <aravis/arvstream.h>
+#include <aravis/arvstr.h>
+#include <aravis/arvsystem.h>
+
+#if ARAVIS_HAS_USB
+#include <aravis/arvuvinterface.h>
+#include <aravis/arvuvdevice.h>
+#include <aravis/arvuvstream.h>
+#endif
+
+#if ARAVIS_HAS_V4L2
+#include <aravis/arvv4l2interface.h>
+#include <aravis/arvv4l2device.h>
+#include <aravis/arvv4l2stream.h>
+#endif
+
+#include <aravis/arvversion.h>
+#include <aravis/arvzip.h>
+#include <aravis/arvxmlschema.h>
+
+#undef ARV_H_INSIDE
+
+#endif
diff --git a/src/arvapi.h.in b/aravis/arvapi.h.in
similarity index 100%
rename from src/arvapi.h.in
rename to aravis/arvapi.h.in
diff --git a/src/arvbuffer.c b/aravis/arvbuffer.c
similarity index 99%
rename from src/arvbuffer.c
rename to aravis/arvbuffer.c
index 5de932130..95fa4d0c2 100644
--- a/src/arvbuffer.c
+++ b/aravis/arvbuffer.c
@@ -31,7 +31,7 @@
  * interest, pixel format and time stamp.
  */
 
-#include <arvbufferprivate.h>
+#include "arvbufferprivate.h"
 
 static gboolean
 arv_buffer_part_is_image (ArvBuffer *buffer, guint part_id)
diff --git a/src/arvbuffer.h b/aravis/arvbuffer.h
similarity index 99%
rename from src/arvbuffer.h
rename to aravis/arvbuffer.h
index 580cfb8fb..dc062636f 100644
--- a/src/arvbuffer.h
+++ b/aravis/arvbuffer.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvbufferprivate.h b/aravis/arvbufferprivate.h
similarity index 96%
rename from src/arvbufferprivate.h
rename to aravis/arvbufferprivate.h
index 7dea6af67..9db39e1a1 100644
--- a/src/arvbufferprivate.h
+++ b/aravis/arvbufferprivate.h
@@ -23,8 +23,8 @@
 #ifndef ARV_BUFFER_PRIVATE_H
 #define ARV_BUFFER_PRIVATE_H
 
-#include <arvbuffer.h>
-#include <arvgvspprivate.h>
+#include <aravis/arvbuffer.h>
+#include <aravis/arvgvspprivate.h>
 #include <stddef.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvcamera.c b/aravis/arvcamera.c
similarity index 99%
rename from src/arvcamera.c
rename to aravis/arvcamera.c
index 3b805e266..d006af04b 100644
--- a/src/arvcamera.c
+++ b/aravis/arvcamera.c
@@ -29,28 +29,28 @@
  * and [class@Aravis.Gc] for a more advanced use of the Aravis library.
  */
 
-#include <arvfeatures.h>
-#include <arvdebug.h>
-#include <arvcamera.h>
-#include <arvsystem.h>
-#include <arvgvinterface.h>
-#include <arvgcboolean.h>
-#include <arvgccommand.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcenumeration.h>
-#include <arvgcenumentry.h>
-#include <arvgcregister.h>
-#include <arvgcstring.h>
-#include <arvbuffer.h>
-#include <arvgc.h>
-#include <arvgvdevice.h>
+#include "arvfeatures.h"
+#include "arvdebug.h"
+#include "arvcamera.h"
+#include "arvsystem.h"
+#include "arvgvinterface.h"
+#include "arvgcboolean.h"
+#include "arvgccommand.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcenumeration.h"
+#include "arvgcenumentry.h"
+#include "arvgcregister.h"
+#include "arvgcstring.h"
+#include "arvbuffer.h"
+#include "arvgc.h"
+#include "arvgvdevice.h"
 #if ARAVIS_HAS_USB
-#include <arvuvdevice.h>
+#include "arvuvdevice.h"
 #endif
-#include <arvgentldeviceprivate.h>
-#include <arvenums.h>
-#include <arvstr.h>
+#include "arvgentldeviceprivate.h"
+#include "arvenums.h"
+#include "arvstr.h"
 
 static void arv_camera_get_integer_bounds_as_gint (ArvCamera *camera, const char *feature, gint *min, gint *max, GError **error);
 static void arv_camera_get_integer_bounds_as_guint (ArvCamera *camera, const char *feature, guint *min, guint *max, GError **error);
diff --git a/src/arvcamera.h b/aravis/arvcamera.h
similarity index 99%
rename from src/arvcamera.h
rename to aravis/arvcamera.h
index 80eba037d..e87cd9d66 100644
--- a/src/arvcamera.h
+++ b/aravis/arvcamera.h
@@ -27,11 +27,11 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvstream.h>
-#include <arvgvstream.h>
-#include <arvgvdevice.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvstream.h>
+#include <aravis/arvgvstream.h>
+#include <aravis/arvgvdevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvcameratest.c b/aravis/arvcameratest.c
similarity index 99%
rename from src/arvcameratest.c
rename to aravis/arvcameratest.c
index 7779e8f16..6f2b5b01c 100644
--- a/src/arvcameratest.c
+++ b/aravis/arvcameratest.c
@@ -1,5 +1,5 @@
-#include <arvdebugprivate.h>
-#include <arvgvstreamprivate.h>
+#include "arvdebugprivate.h"
+#include "arvgvstreamprivate.h"
 #include <arv.h>
 #include <stdlib.h>
 #include <signal.h>
diff --git a/src/arvchunkparser.c b/aravis/arvchunkparser.c
similarity index 98%
rename from src/arvchunkparser.c
rename to aravis/arvchunkparser.c
index b10202ea0..e5b0c0dd1 100644
--- a/src/arvchunkparser.c
+++ b/aravis/arvchunkparser.c
@@ -36,13 +36,13 @@
  * Here is an example of this API in use: [tests/arvchunkparsertest.c](https://github.com/AravisProject/aravis/blob/main/tests/arvchunkparsertest.c)
  */
 
-#include <arvchunkparserprivate.h>
-#include <arvbuffer.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcstring.h>
-#include <arvgcboolean.h>
-#include <arvdebugprivate.h>
+#include "arvchunkparserprivate.h"
+#include "arvbuffer.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcstring.h"
+#include "arvgcboolean.h"
+#include "arvdebugprivate.h"
 
 enum {
 	ARV_CHUNK_PARSER_PROPERTY_0,
diff --git a/src/arvchunkparser.h b/aravis/arvchunkparser.h
similarity index 97%
rename from src/arvchunkparser.h
rename to aravis/arvchunkparser.h
index a1893d6cc..32b862adc 100644
--- a/src/arvchunkparser.h
+++ b/aravis/arvchunkparser.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgc.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgc.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvchunkparserprivate.h b/aravis/arvchunkparserprivate.h
similarity index 96%
rename from src/arvchunkparserprivate.h
rename to aravis/arvchunkparserprivate.h
index c92cfaf15..b7d0e7eb6 100644
--- a/src/arvchunkparserprivate.h
+++ b/aravis/arvchunkparserprivate.h
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvchunkparser.h>
+#include <aravis/arvchunkparser.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdebug.c b/aravis/arvdebug.c
similarity index 98%
rename from src/arvdebug.c
rename to aravis/arvdebug.c
index 46ef53a86..38cc07a37 100644
--- a/src/arvdebug.c
+++ b/aravis/arvdebug.c
@@ -26,9 +26,9 @@
 
 #include <glib/gprintf.h>
 #include <stdlib.h>
-#include <arvdebugprivate.h>
-#include <arvenumtypesprivate.h>
-#include <arvmiscprivate.h>
+#include "arvdebugprivate.h"
+#include "arvenumtypesprivate.h"
+#include "arvmiscprivate.h"
 
 #ifdef _MSC_VER
 #define STDERR_FILENO _fileno(stderr)
diff --git a/src/arvdebug.h b/aravis/arvdebug.h
similarity index 97%
rename from src/arvdebug.h
rename to aravis/arvdebug.h
index 6fc5555cb..15df46144 100644
--- a/src/arvdebug.h
+++ b/aravis/arvdebug.h
@@ -28,7 +28,7 @@
 #endif
 
 #include <glib.h>
-#include <arvapi.h>
+#include <aravis/arvapi.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdebugprivate.h b/aravis/arvdebugprivate.h
similarity index 99%
rename from src/arvdebugprivate.h
rename to aravis/arvdebugprivate.h
index d35ed79e3..d7c535c1b 100644
--- a/src/arvdebugprivate.h
+++ b/aravis/arvdebugprivate.h
@@ -23,7 +23,7 @@
 #ifndef ARV_DEBUG_PRIVATE_H
 #define ARV_DEBUG_PRIVATE_H
 
-#include <arvdebug.h>
+#include <aravis/arvdebug.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdevice.c b/aravis/arvdevice.c
similarity index 99%
rename from src/arvdevice.c
rename to aravis/arvdevice.c
index a35fa9f48..267d5c059 100644
--- a/src/arvdevice.c
+++ b/aravis/arvdevice.c
@@ -29,19 +29,19 @@
  * advanced uses.
  */
 
-#include <arvdevice.h>
-#include <arvdeviceprivate.h>
-#include <arvgc.h>
-#include <arvgccommand.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcboolean.h>
-#include <arvgcenumeration.h>
-#include <arvgcregister.h>
-#include <arvgcstring.h>
-#include <arvstream.h>
-#include <arvdebug.h>
+#include "arvdevice.h"
+#include "arvdeviceprivate.h"
+#include "arvgc.h"
+#include "arvgccommand.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcfeaturenode.h"
+#include "arvgcboolean.h"
+#include "arvgcenumeration.h"
+#include "arvgcregister.h"
+#include "arvgcstring.h"
+#include "arvstream.h"
+#include "arvdebug.h"
 
 enum {
 	ARV_DEVICE_SIGNAL_CONTROL_LOST,
diff --git a/src/arvdevice.h b/aravis/arvdevice.h
similarity index 98%
rename from src/arvdevice.h
rename to aravis/arvdevice.h
index 5372439fd..14213746e 100644
--- a/src/arvdevice.h
+++ b/aravis/arvdevice.h
@@ -27,11 +27,11 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcenums.h>
-#include <arvtypes.h>
-#include <arvstream.h>
-#include <arvchunkparser.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcenums.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvstream.h>
+#include <aravis/arvchunkparser.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdeviceprivate.h b/aravis/arvdeviceprivate.h
similarity index 97%
rename from src/arvdeviceprivate.h
rename to aravis/arvdeviceprivate.h
index 8c58326f2..89db90a67 100644
--- a/src/arvdeviceprivate.h
+++ b/aravis/arvdeviceprivate.h
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvdevice.h>
+#include <aravis/arvdevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdomcharacterdata.c b/aravis/arvdomcharacterdata.c
similarity index 98%
rename from src/arvdomcharacterdata.c
rename to aravis/arvdomcharacterdata.c
index 86a78394d..0e8f3cd99 100644
--- a/src/arvdomcharacterdata.c
+++ b/aravis/arvdomcharacterdata.c
@@ -26,8 +26,8 @@
  * @short_description: Base class for DOM character data nodes
  */
 
-#include <arvdomcharacterdata.h>
-#include <arvdebugprivate.h>
+#include "arvdomcharacterdata.h"
+#include "arvdebugprivate.h"
 #include <string.h>
 
 typedef struct {
diff --git a/src/arvdomcharacterdata.h b/aravis/arvdomcharacterdata.h
similarity index 96%
rename from src/arvdomcharacterdata.h
rename to aravis/arvdomcharacterdata.h
index 343161ddd..cde98eab9 100644
--- a/src/arvdomcharacterdata.h
+++ b/aravis/arvdomcharacterdata.h
@@ -28,8 +28,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvdomnode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvdomnode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdomdocument.c b/aravis/arvdomdocument.c
similarity index 98%
rename from src/arvdomdocument.c
rename to aravis/arvdomdocument.c
index 6adf365b0..8286e9717 100644
--- a/src/arvdomdocument.c
+++ b/aravis/arvdomdocument.c
@@ -26,11 +26,11 @@
  * @short_description: Base class for DOM document nodes
  */
 
-#include <arvdomdocument.h>
-#include <arvdomelement.h>
-#include <arvstr.h>
-#include <arvdebug.h>
-#include <arvdomtext.h>
+#include "arvdomdocument.h"
+#include "arvdomelement.h"
+#include "arvstr.h"
+#include "arvdebug.h"
+#include "arvdomtext.h"
 #include <gio/gio.h>
 #include <string.h>
 
diff --git a/src/arvdomdocument.h b/aravis/arvdomdocument.h
similarity index 96%
rename from src/arvdomdocument.h
rename to aravis/arvdomdocument.h
index 5a8599387..eaea1e305 100644
--- a/src/arvdomdocument.h
+++ b/aravis/arvdomdocument.h
@@ -28,9 +28,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvdomnode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdomnode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdomdocumentfragment.c b/aravis/arvdomdocumentfragment.c
similarity index 98%
rename from src/arvdomdocumentfragment.c
rename to aravis/arvdomdocumentfragment.c
index 94b7f9e2e..1cda9ab33 100644
--- a/src/arvdomdocumentfragment.c
+++ b/aravis/arvdomdocumentfragment.c
@@ -26,7 +26,7 @@
  * @short_description: Base class for DOM document fragments
  */
 
-#include <arvdomdocumentfragment.h>
+#include "arvdomdocumentfragment.h"
 #include <string.h>
 
 G_DEFINE_ABSTRACT_TYPE (ArvDomDocumentFragment, arv_dom_document_fragment, ARV_TYPE_DOM_NODE)
diff --git a/src/arvdomdocumentfragment.h b/aravis/arvdomdocumentfragment.h
similarity index 94%
rename from src/arvdomdocumentfragment.h
rename to aravis/arvdomdocumentfragment.h
index bde63622a..91c4918f1 100644
--- a/src/arvdomdocumentfragment.h
+++ b/aravis/arvdomdocumentfragment.h
@@ -28,9 +28,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvdomnode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdomnode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdomelement.c b/aravis/arvdomelement.c
similarity index 98%
rename from src/arvdomelement.c
rename to aravis/arvdomelement.c
index 2d770b741..b543ed50c 100644
--- a/src/arvdomelement.c
+++ b/aravis/arvdomelement.c
@@ -26,7 +26,7 @@
  * @short_description: Base class for DOM element nodes
  */
 
-#include <arvdomelement.h>
+#include "arvdomelement.h"
 #include <string.h>
 
 G_DEFINE_ABSTRACT_TYPE (ArvDomElement, arv_dom_element, ARV_TYPE_DOM_NODE)
diff --git a/src/arvdomelement.h b/aravis/arvdomelement.h
similarity index 96%
rename from src/arvdomelement.h
rename to aravis/arvdomelement.h
index d9fc84568..4820bd9d7 100644
--- a/src/arvdomelement.h
+++ b/aravis/arvdomelement.h
@@ -28,8 +28,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvdomnode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvdomnode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdomimplementation.c b/aravis/arvdomimplementation.c
similarity index 96%
rename from src/arvdomimplementation.c
rename to aravis/arvdomimplementation.c
index fd3945623..c9853c6d9 100644
--- a/src/arvdomimplementation.c
+++ b/aravis/arvdomimplementation.c
@@ -21,9 +21,9 @@
  * 	Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvdomimplementation.h>
-#include <arvdebugprivate.h>
-#include <arvgc.h>
+#include "arvdomimplementation.h"
+#include "arvdebugprivate.h"
+#include "arvgc.h"
 #include <string.h>
 
 static GHashTable *document_types = NULL;
diff --git a/src/arvdomimplementation.h b/aravis/arvdomimplementation.h
similarity index 94%
rename from src/arvdomimplementation.h
rename to aravis/arvdomimplementation.h
index 454721af1..a4d1430f2 100644
--- a/src/arvdomimplementation.h
+++ b/aravis/arvdomimplementation.h
@@ -28,9 +28,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvdomdocument.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdomdocument.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdomnamednodemap.c b/aravis/arvdomnamednodemap.c
similarity index 98%
rename from src/arvdomnamednodemap.c
rename to aravis/arvdomnamednodemap.c
index 4992ab41e..036b53a83 100644
--- a/src/arvdomnamednodemap.c
+++ b/aravis/arvdomnamednodemap.c
@@ -21,8 +21,8 @@
  * 	Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvdomnamednodemap.h>
-#include <arvdomnode.h>
+#include "arvdomnamednodemap.h"
+#include "arvdomnode.h"
 
 G_DEFINE_ABSTRACT_TYPE (ArvDomNamedNodeMap, arv_dom_named_node_map, G_TYPE_OBJECT)
 
diff --git a/src/arvdomnamednodemap.h b/aravis/arvdomnamednodemap.h
similarity index 97%
rename from src/arvdomnamednodemap.h
rename to aravis/arvdomnamednodemap.h
index 846a84dc9..f5037b4bd 100644
--- a/src/arvdomnamednodemap.h
+++ b/aravis/arvdomnamednodemap.h
@@ -24,8 +24,8 @@
 #ifndef ARV_DOM_NAMED_NODE_MAP_H
 #define ARV_DOM_NAMED_NODE_MAP_H
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 #if !defined (ARV_H_INSIDE) && !defined (ARAVIS_COMPILATION)
 #error "Only <arv.h> can be included directly."
diff --git a/src/arvdomnode.c b/aravis/arvdomnode.c
similarity index 99%
rename from src/arvdomnode.c
rename to aravis/arvdomnode.c
index d4443a660..339d095e3 100644
--- a/src/arvdomnode.c
+++ b/aravis/arvdomnode.c
@@ -26,11 +26,11 @@
  * @short_description: Base class for DOM nodes
  */
 
-#include <arvdomnode.h>
-#include <arvdomnodechildlist.h>
-#include <arvdomnodelist.h>
-#include <arvdomdocument.h>
-#include <arvdebugprivate.h>
+#include "arvdomnode.h"
+#include "arvdomnodechildlist.h"
+#include "arvdomnodelist.h"
+#include "arvdomdocument.h"
+#include "arvdebugprivate.h"
 #include <glib/gprintf.h>
 #include <stdio.h>
 
diff --git a/src/arvdomnode.h b/aravis/arvdomnode.h
similarity index 98%
rename from src/arvdomnode.h
rename to aravis/arvdomnode.h
index d78b6edcf..d1787830e 100644
--- a/src/arvdomnode.h
+++ b/aravis/arvdomnode.h
@@ -28,8 +28,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvdomnodechildlist.c b/aravis/arvdomnodechildlist.c
similarity index 97%
rename from src/arvdomnodechildlist.c
rename to aravis/arvdomnodechildlist.c
index c194cb06f..02d6d139e 100644
--- a/src/arvdomnodechildlist.c
+++ b/aravis/arvdomnodechildlist.c
@@ -21,9 +21,9 @@
  * 	Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvdomnodechildlist.h>
-#include <arvdomnode.h>
-#include <arvdomnodelist.h>
+#include "arvdomnodechildlist.h"
+#include "arvdomnode.h"
+#include "arvdomnodelist.h"
 
 /**
  * SECTION:arvdomnodechildlist
diff --git a/src/arvdomnodechildlist.h b/aravis/arvdomnodechildlist.h
similarity index 95%
rename from src/arvdomnodechildlist.h
rename to aravis/arvdomnodechildlist.h
index 0ca0096bf..0bb7aff81 100644
--- a/src/arvdomnodechildlist.h
+++ b/aravis/arvdomnodechildlist.h
@@ -28,8 +28,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvdomnodelist.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvdomnodelist.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdomnodelist.c b/aravis/arvdomnodelist.c
similarity index 97%
rename from src/arvdomnodelist.c
rename to aravis/arvdomnodelist.c
index c03e74f43..7f606c4a1 100644
--- a/src/arvdomnodelist.c
+++ b/aravis/arvdomnodelist.c
@@ -21,8 +21,8 @@
  * 	Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvdomnodelist.h>
-#include <arvdomnode.h>
+#include "arvdomnodelist.h"
+#include "arvdomnode.h"
 
 G_DEFINE_ABSTRACT_TYPE (ArvDomNodeList, arv_dom_node_list, G_TYPE_OBJECT)
 
diff --git a/src/arvdomnodelist.h b/aravis/arvdomnodelist.h
similarity index 96%
rename from src/arvdomnodelist.h
rename to aravis/arvdomnodelist.h
index 22b77414c..c07f0af17 100644
--- a/src/arvdomnodelist.h
+++ b/aravis/arvdomnodelist.h
@@ -28,8 +28,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvdomparser.c b/aravis/arvdomparser.c
similarity index 98%
rename from src/arvdomparser.c
rename to aravis/arvdomparser.c
index 47b3c92e9..3c44dc07b 100644
--- a/src/arvdomparser.c
+++ b/aravis/arvdomparser.c
@@ -21,12 +21,12 @@
  * 	Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvdebugprivate.h>
-#include <arvdomimplementation.h>
-#include <arvdomnode.h>
-#include <arvdomelement.h>
-#include <arvdomparser.h>
-#include <arvstr.h>
+#include "arvdebugprivate.h"
+#include "arvdomimplementation.h"
+#include "arvdomnode.h"
+#include "arvdomelement.h"
+#include "arvdomparser.h"
+#include "arvstr.h"
 #include <libxml/parser.h>
 #include <gio/gio.h>
 #include <string.h>
diff --git a/src/arvdomparser.h b/aravis/arvdomparser.h
similarity index 96%
rename from src/arvdomparser.h
rename to aravis/arvdomparser.h
index a67f051fd..898e675fa 100644
--- a/src/arvdomparser.h
+++ b/aravis/arvdomparser.h
@@ -28,8 +28,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvdomdocument.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvdomdocument.h>
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvdomtext.c b/aravis/arvdomtext.c
similarity index 98%
rename from src/arvdomtext.c
rename to aravis/arvdomtext.c
index 415fcc519..410469e07 100644
--- a/src/arvdomtext.c
+++ b/aravis/arvdomtext.c
@@ -26,7 +26,7 @@
  * @short_description: Base class for DOM text nodes
  */
 
-#include <arvdomtext.h>
+#include "arvdomtext.h"
 
 G_DEFINE_TYPE (ArvDomText, arv_dom_text, ARV_TYPE_DOM_CHARACTER_DATA)
 
diff --git a/src/arvdomtext.h b/aravis/arvdomtext.h
similarity index 95%
rename from src/arvdomtext.h
rename to aravis/arvdomtext.h
index 5266cd5be..bfd797549 100644
--- a/src/arvdomtext.h
+++ b/aravis/arvdomtext.h
@@ -28,8 +28,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvdomcharacterdata.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvdomcharacterdata.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvenums.c b/aravis/arvenums.c
similarity index 99%
rename from src/arvenums.c
rename to aravis/arvenums.c
index 726f82d58..4cf7bb8ff 100644
--- a/src/arvenums.c
+++ b/aravis/arvenums.c
@@ -20,7 +20,7 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvenums.h>
+#include "arvenums.h"
 
 static unsigned int
 _from_string (const char *string, const char **strings, unsigned int n_strings)
diff --git a/src/arvenums.h b/aravis/arvenums.h
similarity index 99%
rename from src/arvenums.h
rename to aravis/arvenums.h
index 2f7f6d502..12b1f2597 100644
--- a/src/arvenums.h
+++ b/aravis/arvenums.h
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
+#include <aravis/arvapi.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvevaluator.c b/aravis/arvevaluator.c
similarity index 99%
rename from src/arvevaluator.c
rename to aravis/arvevaluator.c
index 3eabd030e..075f7863b 100644
--- a/src/arvevaluator.c
+++ b/aravis/arvevaluator.c
@@ -25,10 +25,10 @@
  * @short_description: A math expression evaluator with Genicam syntax
  */
 
-#include <arvevaluator.h>
-#include <arvdebugprivate.h>
-#include <arvmiscprivate.h>
-#include <arvstr.h>
+#include "arvevaluator.h"
+#include "arvdebugprivate.h"
+#include "arvmiscprivate.h"
+#include "arvstr.h"
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/arvevaluator.h b/aravis/arvevaluator.h
similarity index 97%
rename from src/arvevaluator.h
rename to aravis/arvevaluator.h
index e2bc7309b..a3f7755f4 100644
--- a/src/arvevaluator.h
+++ b/aravis/arvevaluator.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvfakecamera.c b/aravis/arvfakecamera.c
similarity index 99%
rename from src/arvfakecamera.c
rename to aravis/arvfakecamera.c
index 236bccb5d..e19006102 100644
--- a/src/arvfakecamera.c
+++ b/aravis/arvfakecamera.c
@@ -30,14 +30,14 @@
  * arv-fake-gv-camera is a GV camera simulator based on this class.
  */
 
-#include <arvfakecamera.h>
-#include <arvversion.h>
-#include <arvgc.h>
-#include <arvgcregisternode.h>
-#include <arvgvcpprivate.h>
-#include <arvbufferprivate.h>
-#include <arvdebug.h>
-#include <arvmiscprivate.h>
+#include "arvfakecamera.h"
+#include "arvversion.h"
+#include "arvgc.h"
+#include "arvgcregisternode.h"
+#include "arvgvcpprivate.h"
+#include "arvbufferprivate.h"
+#include "arvdebug.h"
+#include "arvmiscprivate.h"
 #include <string.h>
 #include <math.h>
 
diff --git a/src/arvfakecamera.h b/aravis/arvfakecamera.h
similarity index 99%
rename from src/arvfakecamera.h
rename to aravis/arvfakecamera.h
index 037d80340..a902f0120 100644
--- a/src/arvfakecamera.h
+++ b/aravis/arvfakecamera.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvbuffer.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvbuffer.h>
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvfakedevice.c b/aravis/arvfakedevice.c
similarity index 97%
rename from src/arvfakedevice.c
rename to aravis/arvfakedevice.c
index 0565903f8..99c66ffbf 100644
--- a/src/arvfakedevice.c
+++ b/aravis/arvfakedevice.c
@@ -25,13 +25,13 @@
  * @short_description: Fake device
  */
 
-#include <arvdeviceprivate.h>
-#include <arvgvdeviceprivate.h>
-#include <arvfakedeviceprivate.h>
-#include <arvfakestreamprivate.h>
-#include <arvfakecamera.h>
-#include <arvgc.h>
-#include <arvdebugprivate.h>
+#include "arvdeviceprivate.h"
+#include "arvgvdeviceprivate.h"
+#include "arvfakedeviceprivate.h"
+#include "arvfakestreamprivate.h"
+#include "arvfakecamera.h"
+#include "arvgc.h"
+#include "arvdebugprivate.h"
 
 enum
 {
diff --git a/src/arvfakedevice.h b/aravis/arvfakedevice.h
similarity index 94%
rename from src/arvfakedevice.h
rename to aravis/arvfakedevice.h
index ba2422a73..16a7b1aea 100644
--- a/src/arvfakedevice.h
+++ b/aravis/arvfakedevice.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvdevice.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvfakedeviceprivate.h b/aravis/arvfakedeviceprivate.h
similarity index 97%
rename from src/arvfakedeviceprivate.h
rename to aravis/arvfakedeviceprivate.h
index 8838eb6e2..02e34df5e 100644
--- a/src/arvfakedeviceprivate.h
+++ b/aravis/arvfakedeviceprivate.h
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvfakedevice.h>
+#include <aravis/arvfakedevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvfakegvcamera.c b/aravis/arvfakegvcamera.c
similarity index 99%
rename from src/arvfakegvcamera.c
rename to aravis/arvfakegvcamera.c
index 4b3abfae4..7478633e3 100644
--- a/src/arvfakegvcamera.c
+++ b/aravis/arvfakegvcamera.c
@@ -20,7 +20,7 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvdebugprivate.h>
+#include "arvdebugprivate.h"
 #include <arv.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/arvfakeinterface.c b/aravis/arvfakeinterface.c
similarity index 95%
rename from src/arvfakeinterface.c
rename to aravis/arvfakeinterface.c
index 6ca6785d2..71dfab890 100644
--- a/src/arvfakeinterface.c
+++ b/aravis/arvfakeinterface.c
@@ -25,12 +25,12 @@
  * @short_description: Fake interface
  */
 
-#include <arvfakeinterfaceprivate.h>
-#include <arvfakedeviceprivate.h>
-#include <arvinterfaceprivate.h>
-#include <arvfakedevice.h>
-#include <arvdebug.h>
-#include <arvmisc.h>
+#include "arvfakeinterfaceprivate.h"
+#include "arvfakedeviceprivate.h"
+#include "arvinterfaceprivate.h"
+#include "arvfakedevice.h"
+#include "arvdebug.h"
+#include "arvmisc.h"
 
 #define ARV_FAKE_DEVICE_ID 	        "Fake_1"
 #define ARV_FAKE_PHYSICAL_ID 	        "Fake_1"
diff --git a/src/arvfakeinterface.h b/aravis/arvfakeinterface.h
similarity index 93%
rename from src/arvfakeinterface.h
rename to aravis/arvfakeinterface.h
index 7f2eed83f..bc39e87ea 100644
--- a/src/arvfakeinterface.h
+++ b/aravis/arvfakeinterface.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvinterface.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvinterface.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvfakeinterfaceprivate.h b/aravis/arvfakeinterfaceprivate.h
similarity index 94%
rename from src/arvfakeinterfaceprivate.h
rename to aravis/arvfakeinterfaceprivate.h
index 59945ecf8..26c5e904c 100644
--- a/src/arvfakeinterfaceprivate.h
+++ b/aravis/arvfakeinterfaceprivate.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvinterfaceprivate.h>
-#include <arvfakeinterface.h>
+#include <aravis/arvinterfaceprivate.h>
+#include <aravis/arvfakeinterface.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvfakestream.c b/aravis/arvfakestream.c
similarity index 97%
rename from src/arvfakestream.c
rename to aravis/arvfakestream.c
index 20f375a34..07ad633e4 100644
--- a/src/arvfakestream.c
+++ b/aravis/arvfakestream.c
@@ -25,13 +25,13 @@
  * @short_description: Fake stream
  */
 
-#include <arvfakestreamprivate.h>
-#include <arvfakecamera.h>
-#include <arvfakedevice.h>
-#include <arvstreamprivate.h>
-#include <arvbufferprivate.h>
-#include <arvdebug.h>
-#include <arvmisc.h>
+#include "arvfakestreamprivate.h"
+#include "arvfakecamera.h"
+#include "arvfakedevice.h"
+#include "arvstreamprivate.h"
+#include "arvbufferprivate.h"
+#include "arvdebug.h"
+#include "arvmisc.h"
 
 typedef struct {
 	ArvStream *stream;
diff --git a/src/arvfakestream.h b/aravis/arvfakestream.h
similarity index 95%
rename from src/arvfakestream.h
rename to aravis/arvfakestream.h
index e5567c204..6caae81c8 100644
--- a/src/arvfakestream.h
+++ b/aravis/arvfakestream.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvstream.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvstream.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvfakestreamprivate.h b/aravis/arvfakestreamprivate.h
similarity index 94%
rename from src/arvfakestreamprivate.h
rename to aravis/arvfakestreamprivate.h
index ab8730813..067a71410 100644
--- a/src/arvfakestreamprivate.h
+++ b/aravis/arvfakestreamprivate.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvfakestream.h>
-#include <arvfakedevice.h>
+#include <aravis/arvfakestream.h>
+#include <aravis/arvfakedevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvfeatures.h.in b/aravis/arvfeatures.h.in
similarity index 100%
rename from src/arvfeatures.h.in
rename to aravis/arvfeatures.h.in
diff --git a/src/arvgc.c b/aravis/arvgc.c
similarity index 93%
rename from src/arvgc.c
rename to aravis/arvgc.c
index 515a4c8e5..12a8a301c 100644
--- a/src/arvgc.c
+++ b/aravis/arvgc.c
@@ -29,39 +29,39 @@
  * standard format. See http://www.genicam.org.
  */
 
-#include <arvgcprivate.h>
-#include <arvgcnode.h>
-#include <arvgcpropertynode.h>
-#include <arvgcindexnode.h>
-#include <arvgcvalueindexednode.h>
-#include <arvgcinvalidatornode.h>
-#include <arvgcregisterdescriptionnode.h>
-#include <arvgcgroupnode.h>
-#include <arvgccategory.h>
-#include <arvgcenumeration.h>
-#include <arvgcenumentry.h>
-#include <arvgcintegernode.h>
-#include <arvgcfloatnode.h>
-#include <arvgcregisternode.h>
-#include <arvgcintregnode.h>
-#include <arvgcmaskedintregnode.h>
-#include <arvgcfloatregnode.h>
-#include <arvgcstringregnode.h>
-#include <arvgcstringnode.h>
-#include <arvgcstructregnode.h>
-#include <arvgcstructentrynode.h>
-#include <arvgccommand.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcboolean.h>
-#include <arvgcswissknifenode.h>
-#include <arvgcintswissknifenode.h>
-#include <arvgcconverternode.h>
-#include <arvgcintconverternode.h>
-#include <arvgcport.h>
-#include <arvbuffer.h>
-#include <arvdebugprivate.h>
-#include <arvdomparser.h>
+#include "arvgcprivate.h"
+#include "arvgcnode.h"
+#include "arvgcpropertynode.h"
+#include "arvgcindexnode.h"
+#include "arvgcvalueindexednode.h"
+#include "arvgcinvalidatornode.h"
+#include "arvgcregisterdescriptionnode.h"
+#include "arvgcgroupnode.h"
+#include "arvgccategory.h"
+#include "arvgcenumeration.h"
+#include "arvgcenumentry.h"
+#include "arvgcintegernode.h"
+#include "arvgcfloatnode.h"
+#include "arvgcregisternode.h"
+#include "arvgcintregnode.h"
+#include "arvgcmaskedintregnode.h"
+#include "arvgcfloatregnode.h"
+#include "arvgcstringregnode.h"
+#include "arvgcstringnode.h"
+#include "arvgcstructregnode.h"
+#include "arvgcstructentrynode.h"
+#include "arvgccommand.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcboolean.h"
+#include "arvgcswissknifenode.h"
+#include "arvgcintswissknifenode.h"
+#include "arvgcconverternode.h"
+#include "arvgcintconverternode.h"
+#include "arvgcport.h"
+#include "arvbuffer.h"
+#include "arvdebugprivate.h"
+#include "arvdomparser.h"
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/arvgc.h b/aravis/arvgc.h
similarity index 98%
rename from src/arvgc.h
rename to aravis/arvgc.h
index 0ece8497f..21cf77da8 100644
--- a/src/arvgc.h
+++ b/aravis/arvgc.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvbuffer.h>
-#include <arvdomdocument.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvbuffer.h>
+#include <aravis/arvdomdocument.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcboolean.c b/aravis/arvgcboolean.c
similarity index 98%
rename from src/arvgcboolean.c
rename to aravis/arvgcboolean.c
index e1890b2b3..49d1665a1 100644
--- a/src/arvgcboolean.c
+++ b/aravis/arvgcboolean.c
@@ -25,11 +25,11 @@
  * @short_description: Class for Boolean nodes
  */
 
-#include <arvgcboolean.h>
-#include <arvgcinteger.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgc.h>
-#include <arvmisc.h>
+#include "arvgcboolean.h"
+#include "arvgcinteger.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgc.h"
+#include "arvmisc.h"
 #include <string.h>
 
 static GObjectClass *parent_class = NULL;
diff --git a/src/arvgcboolean.h b/aravis/arvgcboolean.h
similarity index 92%
rename from src/arvgcboolean.h
rename to aravis/arvgcboolean.h
index be949b67b..a5aa7880d 100644
--- a/src/arvgcboolean.h
+++ b/aravis/arvgcboolean.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgccategory.c b/aravis/arvgccategory.c
similarity index 98%
rename from src/arvgccategory.c
rename to aravis/arvgccategory.c
index 50391b644..5725867c5 100644
--- a/src/arvgccategory.c
+++ b/aravis/arvgccategory.c
@@ -25,9 +25,9 @@
  * @short_description: Class for Category nodes
  */
 
-#include <arvgccategory.h>
-#include <arvgcpropertynode.h>
-#include <arvgc.h>
+#include "arvgccategory.h"
+#include "arvgcpropertynode.h"
+#include "arvgc.h"
 #include <string.h>
 
 struct _ArvGcCategory {
diff --git a/src/arvgccategory.h b/aravis/arvgccategory.h
similarity index 93%
rename from src/arvgccategory.h
rename to aravis/arvgccategory.h
index 55eed9cb1..29a36e8d9 100644
--- a/src/arvgccategory.h
+++ b/aravis/arvgccategory.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgccommand.c b/aravis/arvgccommand.c
similarity index 96%
rename from src/arvgccommand.c
rename to aravis/arvgccommand.c
index 4425dbf98..9ec4f48a3 100644
--- a/src/arvgccommand.c
+++ b/aravis/arvgccommand.c
@@ -25,13 +25,13 @@
  * @short_description: Class for Command nodes
  */
 
-#include <arvgccommand.h>
-#include <arvgcinteger.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgcport.h>
-#include <arvgc.h>
-#include <arvmisc.h>
-#include <arvdebugprivate.h>
+#include "arvgccommand.h"
+#include "arvgcinteger.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgcport.h"
+#include "arvgc.h"
+#include "arvmisc.h"
+#include "arvdebugprivate.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/arvgccommand.h b/aravis/arvgccommand.h
similarity index 91%
rename from src/arvgccommand.h
rename to aravis/arvgccommand.h
index 11f7f3308..1d8fc540a 100644
--- a/src/arvgccommand.h
+++ b/aravis/arvgccommand.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcconverter.c b/aravis/arvgcconverter.c
similarity index 98%
rename from src/arvgcconverter.c
rename to aravis/arvgcconverter.c
index 7cc45c2d3..00034dc80 100644
--- a/src/arvgcconverter.c
+++ b/aravis/arvgcconverter.c
@@ -25,14 +25,14 @@
  * @short_description: Class for Converter and IntConverter nodes
  */
 
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgcconverterprivate.h>
-#include <arvevaluator.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcdefaultsprivate.h>
-#include <arvgc.h>
-#include <arvdebugprivate.h>
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgcconverterprivate.h"
+#include "arvevaluator.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcdefaultsprivate.h"
+#include "arvgc.h"
+#include "arvdebugprivate.h"
 #include <string.h>
 
 typedef struct {
diff --git a/src/arvgcconverter.h b/aravis/arvgcconverter.h
similarity index 92%
rename from src/arvgcconverter.h
rename to aravis/arvgcconverter.h
index da9c487c7..2b6eb802c 100644
--- a/src/arvgcconverter.h
+++ b/aravis/arvgcconverter.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcconverternode.c b/aravis/arvgcconverternode.c
similarity index 97%
rename from src/arvgcconverternode.c
rename to aravis/arvgcconverternode.c
index f42611756..d7769b977 100644
--- a/src/arvgcconverternode.c
+++ b/aravis/arvgcconverternode.c
@@ -25,11 +25,11 @@
  * @short_description: Converter node class
  */
 
-#include <arvgcconverterprivate.h>
-#include <arvgcconverternode.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvevaluator.h>
-#include <arvgcfloat.h>
+#include "arvgcconverterprivate.h"
+#include "arvgcconverternode.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvevaluator.h"
+#include "arvgcfloat.h"
 
 struct _ArvGcConverterNode {
 	ArvGcConverter	converter;
diff --git a/src/arvgcconverternode.h b/aravis/arvgcconverternode.h
similarity index 95%
rename from src/arvgcconverternode.h
rename to aravis/arvgcconverternode.h
index 098f0cb1a..5b5850c52 100644
--- a/src/arvgcconverternode.h
+++ b/aravis/arvgcconverternode.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcconverter.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcconverter.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcconverterprivate.h b/aravis/arvgcconverterprivate.h
similarity index 96%
rename from src/arvgcconverterprivate.h
rename to aravis/arvgcconverterprivate.h
index d9b10caaf..8b16ba294 100644
--- a/src/arvgcconverterprivate.h
+++ b/aravis/arvgcconverterprivate.h
@@ -23,8 +23,8 @@
 #ifndef ARV_GC_CONVERTER_PRIVATE_H
 #define ARV_GC_CONVERTER_PRIVATE_H
 
-#include <arvgcconverter.h>
-#include <arvgcenums.h>
+#include <aravis/arvgcconverter.h>
+#include <aravis/arvgcenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcdefaultsprivate.h b/aravis/arvgcdefaultsprivate.h
similarity index 98%
rename from src/arvgcdefaultsprivate.h
rename to aravis/arvgcdefaultsprivate.h
index 8ac46900f..853532217 100644
--- a/src/arvgcdefaultsprivate.h
+++ b/aravis/arvgcdefaultsprivate.h
@@ -28,7 +28,7 @@
 #endif
 
 #include <glib-object.h>
-#include <arvgcenums.h>
+#include <aravis/arvgcenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcenumentry.c b/aravis/arvgcenumentry.c
similarity index 98%
rename from src/arvgcenumentry.c
rename to aravis/arvgcenumentry.c
index 29cbe6560..a61f507e1 100644
--- a/src/arvgcenumentry.c
+++ b/aravis/arvgcenumentry.c
@@ -25,8 +25,8 @@
  * @short_description: Class for EnumEntry nodes
  */
 
-#include <arvgcenumentry.h>
-#include <arvgc.h>
+#include "arvgcenumentry.h"
+#include "arvgc.h"
 #include <string.h>
 
 struct _ArvGcEnumEntry {
diff --git a/src/arvgcenumentry.h b/aravis/arvgcenumentry.h
similarity index 91%
rename from src/arvgcenumentry.h
rename to aravis/arvgcenumentry.h
index 961590c20..6e9f6152f 100644
--- a/src/arvgcenumentry.h
+++ b/aravis/arvgcenumentry.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcenumeration.c b/aravis/arvgcenumeration.c
similarity index 98%
rename from src/arvgcenumeration.c
rename to aravis/arvgcenumeration.c
index 3ea764910..6c2665e63 100644
--- a/src/arvgcenumeration.c
+++ b/aravis/arvgcenumeration.c
@@ -25,15 +25,15 @@
  * @short_description: Class for Enumeration nodes
  */
 
-#include <arvgcenumeration.h>
-#include <arvgcenumentry.h>
-#include <arvgcinteger.h>
-#include <arvgcselector.h>
-#include <arvgcstring.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgc.h>
-#include <arvmisc.h>
-#include <arvdebugprivate.h>
+#include "arvgcenumeration.h"
+#include "arvgcenumentry.h"
+#include "arvgcinteger.h"
+#include "arvgcselector.h"
+#include "arvgcstring.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgc.h"
+#include "arvmisc.h"
+#include "arvdebugprivate.h"
 #include <string.h>
 
 struct _ArvGcEnumeration {
diff --git a/src/arvgcenumeration.h b/aravis/arvgcenumeration.h
similarity index 94%
rename from src/arvgcenumeration.h
rename to aravis/arvgcenumeration.h
index ef44bd83f..b876f8312 100644
--- a/src/arvgcenumeration.h
+++ b/aravis/arvgcenumeration.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcenums.c b/aravis/arvgcenums.c
similarity index 98%
rename from src/arvgcenums.c
rename to aravis/arvgcenums.c
index 95183355a..47fb5f97e 100644
--- a/src/arvgcenums.c
+++ b/aravis/arvgcenums.c
@@ -20,7 +20,7 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvgcenums.h>
+#include "arvgcenums.h"
 
 static unsigned int
 _from_string (const char *string, const char **strings, unsigned int n_strings)
diff --git a/src/arvgcenums.h b/aravis/arvgcenums.h
similarity index 99%
rename from src/arvgcenums.h
rename to aravis/arvgcenums.h
index dca58b06c..f750bb2af 100644
--- a/src/arvgcenums.h
+++ b/aravis/arvgcenums.h
@@ -28,7 +28,7 @@
 #endif
 
 #include <glib-object.h>
-#include <arvapi.h>
+#include <aravis/arvapi.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcfeaturenode.c b/aravis/arvgcfeaturenode.c
similarity index 98%
rename from src/arvgcfeaturenode.c
rename to aravis/arvgcfeaturenode.c
index a011b9e99..f4652bee2 100644
--- a/src/arvgcfeaturenode.c
+++ b/aravis/arvgcfeaturenode.c
@@ -28,17 +28,17 @@
  * types of Genicam feature node (Group, Integer, Float, Enumeration...).
  */
 
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgcpropertynode.h>
-#include <arvgc.h>
-#include <arvgcboolean.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcstring.h>
-#include <arvgcenumeration.h>
-#include <arvgcenums.h>
-#include <arvmisc.h>
-#include <arvdebugprivate.h>
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgcpropertynode.h"
+#include "arvgc.h"
+#include "arvgcboolean.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcstring.h"
+#include "arvgcenumeration.h"
+#include "arvgcenums.h"
+#include "arvmisc.h"
+#include "arvdebugprivate.h"
 #include <string.h>
 
 typedef struct {
diff --git a/src/arvgcfeaturenode.h b/aravis/arvgcfeaturenode.h
similarity index 96%
rename from src/arvgcfeaturenode.h
rename to aravis/arvgcfeaturenode.h
index 416541a67..24b1569d0 100644
--- a/src/arvgcfeaturenode.h
+++ b/aravis/arvgcfeaturenode.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcnode.h>
-#include <arvgcenums.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcnode.h>
+#include <aravis/arvgcenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcfeaturenodeprivate.h b/aravis/arvgcfeaturenodeprivate.h
similarity index 96%
rename from src/arvgcfeaturenodeprivate.h
rename to aravis/arvgcfeaturenodeprivate.h
index 526f07ae5..0175a9de7 100644
--- a/src/arvgcfeaturenodeprivate.h
+++ b/aravis/arvgcfeaturenodeprivate.h
@@ -24,9 +24,9 @@
 #ifndef ARV_GC_FEATURE_NODE_PRIVATE_H
 #define ARV_GC_FEATURE_NODE_PRIVATE_H
 
-#include <arvgcfeaturenode.h>
-#include <arvgc.h>
-#include <arvgcenums.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgc.h>
+#include <aravis/arvgcenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcfloat.c b/aravis/arvgcfloat.c
similarity index 98%
rename from src/arvgcfloat.c
rename to aravis/arvgcfloat.c
index 71fda0eb4..714ae06de 100644
--- a/src/arvgcfloat.c
+++ b/aravis/arvgcfloat.c
@@ -25,13 +25,13 @@
  * @short_description: Float interface
  */
 
-#include <arvgcfloat.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgcdefaultsprivate.h>
-#include <arvgc.h>
-#include <arvmisc.h>
+#include "arvgcfloat.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgcdefaultsprivate.h"
+#include "arvgc.h"
+#include "arvmisc.h"
 #include <stdio.h>
-#include <arvdebugprivate.h>
+#include "arvdebugprivate.h"
 
 static void
 arv_gc_float_default_init (ArvGcFloatInterface *gc_float_iface)
diff --git a/src/arvgcfloat.h b/aravis/arvgcfloat.h
similarity index 97%
rename from src/arvgcfloat.h
rename to aravis/arvgcfloat.h
index 0244264e0..5ae188555 100644
--- a/src/arvgcfloat.h
+++ b/aravis/arvgcfloat.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcenums.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcfloatnode.c b/aravis/arvgcfloatnode.c
similarity index 98%
rename from src/arvgcfloatnode.c
rename to aravis/arvgcfloatnode.c
index 8ab859962..d40fd3a36 100644
--- a/src/arvgcfloatnode.c
+++ b/aravis/arvgcfloatnode.c
@@ -25,15 +25,15 @@
  * @short_description: Class for Float nodes
  */
 
-#include <arvgcfloatnode.h>
-#include <arvgcfloat.h>
-#include <arvgcinteger.h>
-#include <arvgcvalueindexednode.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgcdefaultsprivate.h>
-#include <arvgc.h>
-#include <arvmisc.h>
-#include <arvstr.h>
+#include "arvgcfloatnode.h"
+#include "arvgcfloat.h"
+#include "arvgcinteger.h"
+#include "arvgcvalueindexednode.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgcdefaultsprivate.h"
+#include "arvgc.h"
+#include "arvmisc.h"
+#include "arvstr.h"
 #include <string.h>
 
 struct _ArvGcFloatNode {
diff --git a/src/arvgcfloatnode.h b/aravis/arvgcfloatnode.h
similarity index 91%
rename from src/arvgcfloatnode.h
rename to aravis/arvgcfloatnode.h
index b874b5edd..4ba054e73 100644
--- a/src/arvgcfloatnode.h
+++ b/aravis/arvgcfloatnode.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcfloatregnode.c b/aravis/arvgcfloatregnode.c
similarity index 98%
rename from src/arvgcfloatregnode.c
rename to aravis/arvgcfloatregnode.c
index e6f16f3ea..da41c89f5 100644
--- a/src/arvgcfloatregnode.c
+++ b/aravis/arvgcfloatregnode.c
@@ -20,13 +20,13 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvgcfloatregnode.h>
-#include <arvgcpropertynode.h>
-#include <arvgcfloat.h>
-#include <arvgcregister.h>
-#include <arvgcdefaultsprivate.h>
-#include <arvgc.h>
-#include <arvmiscprivate.h>
+#include "arvgcfloatregnode.h"
+#include "arvgcpropertynode.h"
+#include "arvgcfloat.h"
+#include "arvgcregister.h"
+#include "arvgcdefaultsprivate.h"
+#include "arvgc.h"
+#include "arvmiscprivate.h"
 
 typedef struct {
 	ArvGcPropertyNode *endianness;
diff --git a/src/arvgcfloatregnode.h b/aravis/arvgcfloatregnode.h
similarity index 95%
rename from src/arvgcfloatregnode.h
rename to aravis/arvgcfloatregnode.h
index 5bc00fe8e..e6ebf6269 100644
--- a/src/arvgcfloatregnode.h
+++ b/aravis/arvgcfloatregnode.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcregisternode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcregisternode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcgroupnode.c b/aravis/arvgcgroupnode.c
similarity index 98%
rename from src/arvgcgroupnode.c
rename to aravis/arvgcgroupnode.c
index a45025b58..3b895bb1f 100644
--- a/src/arvgcgroupnode.c
+++ b/aravis/arvgcgroupnode.c
@@ -25,8 +25,8 @@
  * @short_description: Class for Group nodes
  */
 
-#include <arvgcgroupnode.h>
-#include <arvgc.h>
+#include "arvgcgroupnode.h"
+#include "arvgc.h"
 #include <string.h>
 
 struct _ArvGcGroupNode {
diff --git a/src/arvgcgroupnode.h b/aravis/arvgcgroupnode.h
similarity index 93%
rename from src/arvgcgroupnode.h
rename to aravis/arvgcgroupnode.h
index dbfb25214..aea93ba33 100644
--- a/src/arvgcgroupnode.h
+++ b/aravis/arvgcgroupnode.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcindexnode.c b/aravis/arvgcindexnode.c
similarity index 96%
rename from src/arvgcindexnode.c
rename to aravis/arvgcindexnode.c
index 564fd91f3..c719aa3f1 100644
--- a/src/arvgcindexnode.c
+++ b/aravis/arvgcindexnode.c
@@ -25,12 +25,12 @@
  * @short_description: Class for Index nodes
  */
 
-#include <arvgcindexnode.h>
-#include <arvgcpropertynode.h>
-#include <arvgcinteger.h>
-#include <arvgc.h>
-#include <arvdomtext.h>
-#include <arvmisc.h>
+#include "arvgcindexnode.h"
+#include "arvgcpropertynode.h"
+#include "arvgcinteger.h"
+#include "arvgc.h"
+#include "arvdomtext.h"
+#include "arvmisc.h"
 #include <string.h>
 
 struct _ArvGcIndexNode {
diff --git a/src/arvgcindexnode.h b/aravis/arvgcindexnode.h
similarity index 93%
rename from src/arvgcindexnode.h
rename to aravis/arvgcindexnode.h
index 3ffdd880a..673d9e49f 100644
--- a/src/arvgcindexnode.h
+++ b/aravis/arvgcindexnode.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcintconverternode.c b/aravis/arvgcintconverternode.c
similarity index 96%
rename from src/arvgcintconverternode.c
rename to aravis/arvgcintconverternode.c
index cb5109059..84abd3963 100644
--- a/src/arvgcintconverternode.c
+++ b/aravis/arvgcintconverternode.c
@@ -25,11 +25,11 @@
  * @short_description: IntConverter node class
  */
 
-#include <arvgcconverterprivate.h>
-#include <arvgcintconverternode.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvevaluator.h>
-#include <arvgcinteger.h>
+#include "arvgcconverterprivate.h"
+#include "arvgcintconverternode.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvevaluator.h"
+#include "arvgcinteger.h"
 
 struct _ArvGcIntConverterNode {
 	ArvGcConverter	converter;
diff --git a/src/arvgcintconverternode.h b/aravis/arvgcintconverternode.h
similarity index 95%
rename from src/arvgcintconverternode.h
rename to aravis/arvgcintconverternode.h
index c0cbc140a..3e310f850 100644
--- a/src/arvgcintconverternode.h
+++ b/aravis/arvgcintconverternode.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcconverter.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcconverter.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcinteger.c b/aravis/arvgcinteger.c
similarity index 98%
rename from src/arvgcinteger.c
rename to aravis/arvgcinteger.c
index 019a576e6..72ce5a387 100644
--- a/src/arvgcinteger.c
+++ b/aravis/arvgcinteger.c
@@ -25,11 +25,11 @@
  * @short_description: Integer interface
  */
 
-#include <arvgcinteger.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgc.h>
-#include <arvmisc.h>
-#include <arvdebugprivate.h>
+#include "arvgcinteger.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgc.h"
+#include "arvmisc.h"
+#include "arvdebugprivate.h"
 
 static void
 arv_gc_integer_default_init (ArvGcIntegerInterface *gc_integer_iface)
diff --git a/src/arvgcinteger.h b/aravis/arvgcinteger.h
similarity index 97%
rename from src/arvgcinteger.h
rename to aravis/arvgcinteger.h
index e1b7795db..abb6945fd 100644
--- a/src/arvgcinteger.h
+++ b/aravis/arvgcinteger.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcenums.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcintegernode.c b/aravis/arvgcintegernode.c
similarity index 98%
rename from src/arvgcintegernode.c
rename to aravis/arvgcintegernode.c
index eea1a46f6..60d50d0b3 100644
--- a/src/arvgcintegernode.c
+++ b/aravis/arvgcintegernode.c
@@ -25,14 +25,14 @@
  * @short_description: Class for Integer nodes
  */
 
-#include <arvgcintegernode.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcselector.h>
-#include <arvgcvalueindexednode.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgc.h>
-#include <arvmisc.h>
+#include "arvgcintegernode.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcselector.h"
+#include "arvgcvalueindexednode.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgc.h"
+#include "arvmisc.h"
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/arvgcintegernode.h b/aravis/arvgcintegernode.h
similarity index 91%
rename from src/arvgcintegernode.h
rename to aravis/arvgcintegernode.h
index a72618bb7..68de6481b 100644
--- a/src/arvgcintegernode.h
+++ b/aravis/arvgcintegernode.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcintregnode.c b/aravis/arvgcintregnode.c
similarity index 98%
rename from src/arvgcintregnode.c
rename to aravis/arvgcintregnode.c
index a32be2445..971b0374e 100644
--- a/src/arvgcintregnode.c
+++ b/aravis/arvgcintregnode.c
@@ -20,12 +20,12 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvgcintregnode.h>
-#include <arvgcregisternodeprivate.h>
-#include <arvgcpropertynode.h>
-#include <arvgcinteger.h>
-#include <arvgcselector.h>
-#include <arvgcregister.h>
+#include "arvgcintregnode.h"
+#include "arvgcregisternodeprivate.h"
+#include "arvgcpropertynode.h"
+#include "arvgcinteger.h"
+#include "arvgcselector.h"
+#include "arvgcregister.h"
 
 typedef struct {
 	ArvGcPropertyNode *sign;
diff --git a/src/arvgcintregnode.h b/aravis/arvgcintregnode.h
similarity index 95%
rename from src/arvgcintregnode.h
rename to aravis/arvgcintregnode.h
index 3534ab5c8..27b342245 100644
--- a/src/arvgcintregnode.h
+++ b/aravis/arvgcintregnode.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcregisternode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcregisternode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcintswissknifenode.c b/aravis/arvgcintswissknifenode.c
similarity index 95%
rename from src/arvgcintswissknifenode.c
rename to aravis/arvgcintswissknifenode.c
index 69b7c69b5..531fd7e16 100644
--- a/src/arvgcintswissknifenode.c
+++ b/aravis/arvgcintswissknifenode.c
@@ -20,12 +20,12 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvgcintswissknifenode.h>
-#include <arvgcswissknifeprivate.h>
-#include <arvgcinteger.h>
-#include <arvgcregister.h>
-#include <arvgc.h>
-#include <arvmisc.h>
+#include "arvgcintswissknifenode.h"
+#include "arvgcswissknifeprivate.h"
+#include "arvgcinteger.h"
+#include "arvgcregister.h"
+#include "arvgc.h"
+#include "arvmisc.h"
 
 static void arv_gc_int_swiss_knife_node_init (ArvGcIntSwissKnifeNode *self);
 static void arv_gc_int_swiss_knife_node_integer_interface_init (ArvGcIntegerInterface *interface);
diff --git a/src/arvgcintswissknifenode.h b/aravis/arvgcintswissknifenode.h
similarity index 96%
rename from src/arvgcintswissknifenode.h
rename to aravis/arvgcintswissknifenode.h
index 01b5ed651..a3b20cc56 100644
--- a/src/arvgcintswissknifenode.h
+++ b/aravis/arvgcintswissknifenode.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcswissknife.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcswissknife.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcinvalidatornode.c b/aravis/arvgcinvalidatornode.c
similarity index 93%
rename from src/arvgcinvalidatornode.c
rename to aravis/arvgcinvalidatornode.c
index 3f98e557b..9ba9d5e34 100644
--- a/src/arvgcinvalidatornode.c
+++ b/aravis/arvgcinvalidatornode.c
@@ -25,12 +25,12 @@
  * @short_description: Class for Invalidator nodes
  */
 
-#include <arvgcinvalidatornode.h>
-#include <arvgcpropertynode.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgc.h>
-#include <arvdomtext.h>
-#include <arvmisc.h>
+#include "arvgcinvalidatornode.h"
+#include "arvgcpropertynode.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgc.h"
+#include "arvdomtext.h"
+#include "arvmisc.h"
 #include <string.h>
 
 struct _ArvGcInvalidatorNode {
diff --git a/src/arvgcinvalidatornode.h b/aravis/arvgcinvalidatornode.h
similarity index 93%
rename from src/arvgcinvalidatornode.h
rename to aravis/arvgcinvalidatornode.h
index 3170c4233..c4d468648 100644
--- a/src/arvgcinvalidatornode.h
+++ b/aravis/arvgcinvalidatornode.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcmaskedintregnode.c b/aravis/arvgcmaskedintregnode.c
similarity index 98%
rename from src/arvgcmaskedintregnode.c
rename to aravis/arvgcmaskedintregnode.c
index 11a35616d..1cd096f78 100644
--- a/src/arvgcmaskedintregnode.c
+++ b/aravis/arvgcmaskedintregnode.c
@@ -20,12 +20,12 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvgcmaskedintregnode.h>
-#include <arvgcregisternodeprivate.h>
-#include <arvgcpropertynode.h>
-#include <arvgcinteger.h>
-#include <arvgcselector.h>
-#include <arvgc.h>
+#include "arvgcmaskedintregnode.h"
+#include "arvgcregisternodeprivate.h"
+#include "arvgcpropertynode.h"
+#include "arvgcinteger.h"
+#include "arvgcselector.h"
+#include "arvgc.h"
 
 #define ARV_GC_MASKED_INT_REG_NODE_DEFAULT_SIGNEDNESS ARV_GC_SIGNEDNESS_UNSIGNED
 #define ARV_GC_MASKED_INT_REG_NODE_DEFAULT_ENDIANNESS G_LITTLE_ENDIAN
diff --git a/src/arvgcmaskedintregnode.h b/aravis/arvgcmaskedintregnode.h
similarity index 95%
rename from src/arvgcmaskedintregnode.h
rename to aravis/arvgcmaskedintregnode.h
index 1ede3e6c3..26f300364 100644
--- a/src/arvgcmaskedintregnode.h
+++ b/aravis/arvgcmaskedintregnode.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcregisternode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcregisternode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcnode.c b/aravis/arvgcnode.c
similarity index 95%
rename from src/arvgcnode.c
rename to aravis/arvgcnode.c
index 9c09bef21..e872e6c17 100644
--- a/src/arvgcnode.c
+++ b/aravis/arvgcnode.c
@@ -28,10 +28,10 @@
  * types of Genicam nodes.
  */
 
-#include <arvgcnode.h>
-#include <arvgc.h>
-#include <arvmisc.h>
-#include <arvdebug.h>
+#include "arvgcnode.h"
+#include "arvgc.h"
+#include "arvmisc.h"
+#include "arvdebug.h"
 #include <string.h>
 
 static GObjectClass *parent_class = NULL;
diff --git a/src/arvgcnode.h b/aravis/arvgcnode.h
similarity index 94%
rename from src/arvgcnode.h
rename to aravis/arvgcnode.h
index 3ccd2cc36..072278810 100644
--- a/src/arvgcnode.h
+++ b/aravis/arvgcnode.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvdomelement.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdomelement.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcport.c b/aravis/arvgcport.c
similarity index 97%
rename from src/arvgcport.c
rename to aravis/arvgcport.c
index 357c25985..25d6313f3 100644
--- a/src/arvgcport.c
+++ b/aravis/arvgcport.c
@@ -25,16 +25,16 @@
  * @short_description: Class for Port nodes
  */
 
-#include <arvgcport.h>
-#include <arvgcregisterdescriptionnode.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvdevice.h>
-#include <arvgvdevice.h>
-#include <arvgentldeviceprivate.h>
-#include <arvchunkparserprivate.h>
-#include <arvbuffer.h>
-#include <arvgcpropertynode.h>
-#include <arvgc.h>
+#include "arvgcport.h"
+#include "arvgcregisterdescriptionnode.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvdevice.h"
+#include "arvgvdevice.h"
+#include "arvgentldeviceprivate.h"
+#include "arvchunkparserprivate.h"
+#include "arvbuffer.h"
+#include "arvgcpropertynode.h"
+#include "arvgc.h"
 #include <memory.h>
 
 typedef struct {
diff --git a/src/arvgcport.h b/aravis/arvgcport.h
similarity index 94%
rename from src/arvgcport.h
rename to aravis/arvgcport.h
index 5d6cda4e8..400c47e23 100644
--- a/src/arvgcport.h
+++ b/aravis/arvgcport.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcprivate.h b/aravis/arvgcprivate.h
similarity index 97%
rename from src/arvgcprivate.h
rename to aravis/arvgcprivate.h
index 3fe012cb2..f5a4548ed 100644
--- a/src/arvgcprivate.h
+++ b/aravis/arvgcprivate.h
@@ -23,7 +23,7 @@
 #ifndef ARV_GC_PRIVATE_H
 #define ARV_GC_PRIVATE_H
 
-#include <arvgc.h>
+#include <aravis/arvgc.h>
 
 ARV_API guint64            arv_gc_register_cache_error_add         (ArvGc *genicam, guint64 n_errors);
 
diff --git a/src/arvgcpropertynode.c b/aravis/arvgcpropertynode.c
similarity index 99%
rename from src/arvgcpropertynode.c
rename to aravis/arvgcpropertynode.c
index 39e530ee7..95465e609 100644
--- a/src/arvgcpropertynode.c
+++ b/aravis/arvgcpropertynode.c
@@ -28,17 +28,17 @@
  * types of Genicam property nodes (Value, pValue, Endianness...).
  */
 
-#include <arvgcpropertynode.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcboolean.h>
-#include <arvgcstring.h>
-#include <arvgc.h>
-#include <arvdomtext.h>
-#include <arvmiscprivate.h>
-#include <arvdebugprivate.h>
-#include <arvenumtypes.h>
+#include "arvgcpropertynode.h"
+#include "arvgcfeaturenode.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcboolean.h"
+#include "arvgcstring.h"
+#include "arvgc.h"
+#include "arvdomtext.h"
+#include "arvmiscprivate.h"
+#include "arvdebugprivate.h"
+#include "arvenumtypes.h"
 #include <string.h>
 
 enum {
diff --git a/src/arvgcpropertynode.h b/aravis/arvgcpropertynode.h
similarity index 98%
rename from src/arvgcpropertynode.h
rename to aravis/arvgcpropertynode.h
index 23bf12b2a..e48635e22 100644
--- a/src/arvgcpropertynode.h
+++ b/aravis/arvgcpropertynode.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcenums.h>
-#include <arvgcnode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcenums.h>
+#include <aravis/arvgcnode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcregister.c b/aravis/arvgcregister.c
similarity index 98%
rename from src/arvgcregister.c
rename to aravis/arvgcregister.c
index 5db1e173e..6057d747d 100644
--- a/src/arvgcregister.c
+++ b/aravis/arvgcregister.c
@@ -25,8 +25,8 @@
  * @short_description: Register interface
  */
 
-#include <arvgcregister.h>
-#include <arvmisc.h>
+#include "arvgcregister.h"
+#include "arvmisc.h"
 
 static void
 arv_gc_register_default_init (ArvGcRegisterInterface *gc_register_iface)
diff --git a/src/arvgcregister.h b/aravis/arvgcregister.h
similarity index 97%
rename from src/arvgcregister.h
rename to aravis/arvgcregister.h
index 9dc8cfe01..af4020783 100644
--- a/src/arvgcregister.h
+++ b/aravis/arvgcregister.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcregisterdescriptionnode.c b/aravis/arvgcregisterdescriptionnode.c
similarity index 99%
rename from src/arvgcregisterdescriptionnode.c
rename to aravis/arvgcregisterdescriptionnode.c
index 582116d7f..9affd731a 100644
--- a/src/arvgcregisterdescriptionnode.c
+++ b/aravis/arvgcregisterdescriptionnode.c
@@ -25,7 +25,7 @@
  * @short_description: Class for RegisterDescription nodes
  */
 
-#include <arvgcregisterdescriptionnode.h>
+#include "arvgcregisterdescriptionnode.h"
 #include <string.h>
 
 struct _ArvGcRegisterDescriptionNode {
diff --git a/src/arvgcregisterdescriptionnode.h b/aravis/arvgcregisterdescriptionnode.h
similarity index 96%
rename from src/arvgcregisterdescriptionnode.h
rename to aravis/arvgcregisterdescriptionnode.h
index 3636c40dc..856806652 100644
--- a/src/arvgcregisterdescriptionnode.h
+++ b/aravis/arvgcregisterdescriptionnode.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcregisternode.c b/aravis/arvgcregisternode.c
similarity index 98%
rename from src/arvgcregisternode.c
rename to aravis/arvgcregisternode.c
index 31ff42a91..a66bbd7dc 100644
--- a/src/arvgcregisternode.c
+++ b/aravis/arvgcregisternode.c
@@ -25,20 +25,20 @@
  * @short_description: Class for Register nodes
  */
 
-#include <arvgcregisternodeprivate.h>
-#include <arvgcindexnode.h>
-#include <arvgcinvalidatornode.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgcswissknife.h>
-#include <arvgcregister.h>
-#include <arvgcinteger.h>
-#include <arvgcselector.h>
-#include <arvgcfloat.h>
-#include <arvgcstring.h>
-#include <arvgcport.h>
-#include <arvgcprivate.h>
-#include <arvmiscprivate.h>
-#include <arvdebugprivate.h>
+#include "arvgcregisternodeprivate.h"
+#include "arvgcindexnode.h"
+#include "arvgcinvalidatornode.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgcswissknife.h"
+#include "arvgcregister.h"
+#include "arvgcinteger.h"
+#include "arvgcselector.h"
+#include "arvgcfloat.h"
+#include "arvgcstring.h"
+#include "arvgcport.h"
+#include "arvgcprivate.h"
+#include "arvmiscprivate.h"
+#include "arvdebugprivate.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/arvgcregisternode.h b/aravis/arvgcregisternode.h
similarity index 94%
rename from src/arvgcregisternode.h
rename to aravis/arvgcregisternode.h
index ce23c983d..c448146b8 100644
--- a/src/arvgcregisternode.h
+++ b/aravis/arvgcregisternode.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcregisternodeprivate.h b/aravis/arvgcregisternodeprivate.h
similarity index 97%
rename from src/arvgcregisternodeprivate.h
rename to aravis/arvgcregisternodeprivate.h
index 0fe629e52..d7034d1f6 100644
--- a/src/arvgcregisternodeprivate.h
+++ b/aravis/arvgcregisternodeprivate.h
@@ -23,7 +23,7 @@
 #ifndef ARV_GC_REGISTER_NODE_PRIVATE_H
 #define ARV_GC_REGISTER_NODE_PRIVATE_H
 
-#include <arvgcregisternode.h>
+#include <aravis/arvgcregisternode.h>
 
 gint64 		arv_gc_register_node_get_masked_integer_value 	(ArvGcRegisterNode *gc_register_node,
 								 guint lsb, guint msb,
diff --git a/src/arvgcselector.c b/aravis/arvgcselector.c
similarity index 96%
rename from src/arvgcselector.c
rename to aravis/arvgcselector.c
index d6bcc5808..daa6f4cfb 100644
--- a/src/arvgcselector.c
+++ b/aravis/arvgcselector.c
@@ -25,9 +25,9 @@
  * @short_description: Selector interface
  */
 
-#include <arvgcselector.h>
-#include <arvgc.h>
-#include <arvmisc.h>
+#include "arvgcselector.h"
+#include "arvgc.h"
+#include "arvmisc.h"
 
 static void
 arv_gc_selector_default_init (ArvGcSelectorInterface *gc_selector_iface)
diff --git a/src/arvgcselector.h b/aravis/arvgcselector.h
similarity index 96%
rename from src/arvgcselector.h
rename to aravis/arvgcselector.h
index 2c0119ab9..8894860c2 100644
--- a/src/arvgcselector.h
+++ b/aravis/arvgcselector.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcstring.c b/aravis/arvgcstring.c
similarity index 97%
rename from src/arvgcstring.c
rename to aravis/arvgcstring.c
index 6031f313f..36ffdbde5 100644
--- a/src/arvgcstring.c
+++ b/aravis/arvgcstring.c
@@ -25,9 +25,9 @@
  * @short_description: String interface
  */
 
-#include <arvgcstring.h>
-#include <arvmisc.h>
-#include <arvgcfeaturenodeprivate.h>
+#include "arvgcstring.h"
+#include "arvmisc.h"
+#include "arvgcfeaturenodeprivate.h"
 
 static void
 arv_gc_string_default_init (ArvGcStringInterface *gc_string_iface)
diff --git a/src/arvgcstring.h b/aravis/arvgcstring.h
similarity index 97%
rename from src/arvgcstring.h
rename to aravis/arvgcstring.h
index ed262de68..3a6558a0f 100644
--- a/src/arvgcstring.h
+++ b/aravis/arvgcstring.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcstringnode.c b/aravis/arvgcstringnode.c
similarity index 95%
rename from src/arvgcstringnode.c
rename to aravis/arvgcstringnode.c
index 671453949..839d9e335 100644
--- a/src/arvgcstringnode.c
+++ b/aravis/arvgcstringnode.c
@@ -25,15 +25,15 @@
  * @short_description: Class for String nodes
  */
 
-#include <arvgcstringnode.h>
-#include <arvgcstring.h>
-#include <arvgcinteger.h>
-#include <arvgcvalueindexednode.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgcdefaultsprivate.h>
-#include <arvgc.h>
-#include <arvmisc.h>
-#include <arvstr.h>
+#include "arvgcstringnode.h"
+#include "arvgcstring.h"
+#include "arvgcinteger.h"
+#include "arvgcvalueindexednode.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgcdefaultsprivate.h"
+#include "arvgc.h"
+#include "arvmisc.h"
+#include "arvstr.h"
 #include <string.h>
 
 struct _ArvGcStringNode {
diff --git a/src/arvgcstringnode.h b/aravis/arvgcstringnode.h
similarity index 91%
rename from src/arvgcstringnode.h
rename to aravis/arvgcstringnode.h
index af2f53a65..ea7555ad9 100644
--- a/src/arvgcstringnode.h
+++ b/aravis/arvgcstringnode.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcstringregnode.c b/aravis/arvgcstringregnode.c
similarity index 97%
rename from src/arvgcstringregnode.c
rename to aravis/arvgcstringregnode.c
index 6781d9814..953918141 100644
--- a/src/arvgcstringregnode.c
+++ b/aravis/arvgcstringregnode.c
@@ -20,10 +20,10 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvgcstringregnode.h>
-#include <arvgcstring.h>
-#include <arvgcregister.h>
-#include <arvgc.h>
+#include "arvgcstringregnode.h"
+#include "arvgcstring.h"
+#include "arvgcregister.h"
+#include "arvgc.h"
 #include <string.h>
 
 typedef struct {
diff --git a/src/arvgcstringregnode.h b/aravis/arvgcstringregnode.h
similarity index 95%
rename from src/arvgcstringregnode.h
rename to aravis/arvgcstringregnode.h
index 3574e6825..53b957ba5 100644
--- a/src/arvgcstringregnode.h
+++ b/aravis/arvgcstringregnode.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcregisternode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcregisternode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcstructentrynode.c b/aravis/arvgcstructentrynode.c
similarity index 97%
rename from src/arvgcstructentrynode.c
rename to aravis/arvgcstructentrynode.c
index 2bab9f22d..985cf1dbf 100644
--- a/src/arvgcstructentrynode.c
+++ b/aravis/arvgcstructentrynode.c
@@ -25,16 +25,16 @@
  * @short_description: Class for StructEntry nodes
  */
 
-#include <arvgcstructentrynode.h>
-#include <arvgcregisternode.h>
-#include <arvgcregister.h>
-#include <arvgcinteger.h>
-#include <arvgcfeaturenodeprivate.h>
-#include <arvgcregisternodeprivate.h>
-#include <arvgcport.h>
-#include <arvgc.h>
-#include <arvmisc.h>
-#include <arvdebug.h>
+#include "arvgcstructentrynode.h"
+#include "arvgcregisternode.h"
+#include "arvgcregister.h"
+#include "arvgcinteger.h"
+#include "arvgcfeaturenodeprivate.h"
+#include "arvgcregisternodeprivate.h"
+#include "arvgcport.h"
+#include "arvgc.h"
+#include "arvmisc.h"
+#include "arvdebug.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/arvgcstructentrynode.h b/aravis/arvgcstructentrynode.h
similarity index 91%
rename from src/arvgcstructentrynode.h
rename to aravis/arvgcstructentrynode.h
index e0e84abd0..ff6f8c33f 100644
--- a/src/arvgcstructentrynode.h
+++ b/aravis/arvgcstructentrynode.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcstructregnode.c b/aravis/arvgcstructregnode.c
similarity index 98%
rename from src/arvgcstructregnode.c
rename to aravis/arvgcstructregnode.c
index cf5122b0d..b3b4f9829 100644
--- a/src/arvgcstructregnode.c
+++ b/aravis/arvgcstructregnode.c
@@ -20,7 +20,7 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvgcstructregnode.h>
+#include "arvgcstructregnode.h"
 
 static void arv_gc_struct_reg_node_init (ArvGcStructRegNode *self);
 
diff --git a/src/arvgcstructregnode.h b/aravis/arvgcstructregnode.h
similarity index 95%
rename from src/arvgcstructregnode.h
rename to aravis/arvgcstructregnode.h
index 7fa895ce7..72f025b2f 100644
--- a/src/arvgcstructregnode.h
+++ b/aravis/arvgcstructregnode.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcregisternode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcregisternode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcswissknife.c b/aravis/arvgcswissknife.c
similarity index 98%
rename from src/arvgcswissknife.c
rename to aravis/arvgcswissknife.c
index 1c6adcf30..d41636006 100644
--- a/src/arvgcswissknife.c
+++ b/aravis/arvgcswissknife.c
@@ -25,13 +25,13 @@
  * @short_description: Class for SwissKnife and IntSwissKnife nodes
  */
 
-#include <arvgcswissknifeprivate.h>
-#include <arvevaluator.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcport.h>
-#include <arvgc.h>
-#include <arvdebug.h>
+#include "arvgcswissknifeprivate.h"
+#include "arvevaluator.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcport.h"
+#include "arvgc.h"
+#include "arvdebug.h"
 #include <string.h>
 
 typedef struct {
diff --git a/src/arvgcswissknife.h b/aravis/arvgcswissknife.h
similarity index 91%
rename from src/arvgcswissknife.h
rename to aravis/arvgcswissknife.h
index 68ddbd4d7..c02c85462 100644
--- a/src/arvgcswissknife.h
+++ b/aravis/arvgcswissknife.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcswissknifenode.c b/aravis/arvgcswissknifenode.c
similarity index 96%
rename from src/arvgcswissknifenode.c
rename to aravis/arvgcswissknifenode.c
index 353c38e91..6368ff6d7 100644
--- a/src/arvgcswissknifenode.c
+++ b/aravis/arvgcswissknifenode.c
@@ -20,13 +20,13 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvgcswissknifenode.h>
-#include <arvgcswissknifeprivate.h>
-#include <arvgcfloat.h>
-#include <arvgcregister.h>
-#include <arvgcdefaultsprivate.h>
-#include <arvgc.h>
-#include <arvmisc.h>
+#include "arvgcswissknifenode.h"
+#include "arvgcswissknifeprivate.h"
+#include "arvgcfloat.h"
+#include "arvgcregister.h"
+#include "arvgcdefaultsprivate.h"
+#include "arvgc.h"
+#include "arvmisc.h"
 
 typedef struct {
 	ArvGcPropertyNode *display_notation;
diff --git a/src/arvgcswissknifenode.h b/aravis/arvgcswissknifenode.h
similarity index 96%
rename from src/arvgcswissknifenode.h
rename to aravis/arvgcswissknifenode.h
index a033bb153..0d30ef3ce 100644
--- a/src/arvgcswissknifenode.h
+++ b/aravis/arvgcswissknifenode.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcswissknife.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcswissknife.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgcswissknifeprivate.h b/aravis/arvgcswissknifeprivate.h
similarity index 97%
rename from src/arvgcswissknifeprivate.h
rename to aravis/arvgcswissknifeprivate.h
index 18ba1c181..95eb90ab0 100644
--- a/src/arvgcswissknifeprivate.h
+++ b/aravis/arvgcswissknifeprivate.h
@@ -23,7 +23,7 @@
 #ifndef ARV_GC_SWISS_KNIFE_PRIVATE_H
 #define ARV_GC_SWISS_KNIFE_PRIVATE_H
 
-#include <arvgcswissknife.h>
+#include <aravis/arvgcswissknife.h>
 
 ArvGcRepresentation	arv_gc_swiss_knife_get_representation	(ArvGcSwissKnife *self);
 const char *		arv_gc_swiss_knife_get_unit		(ArvGcSwissKnife *self);
diff --git a/src/arvgcvalueindexednode.c b/aravis/arvgcvalueindexednode.c
similarity index 96%
rename from src/arvgcvalueindexednode.c
rename to aravis/arvgcvalueindexednode.c
index fd0c13614..e6af3ba81 100644
--- a/src/arvgcvalueindexednode.c
+++ b/aravis/arvgcvalueindexednode.c
@@ -25,12 +25,12 @@
  * @short_description: Class for Index nodes
  */
 
-#include <arvgcvalueindexednode.h>
-#include <arvgcpropertynode.h>
-#include <arvgcinteger.h>
-#include <arvgc.h>
-#include <arvdomtext.h>
-#include <arvmisc.h>
+#include "arvgcvalueindexednode.h"
+#include "arvgcpropertynode.h"
+#include "arvgcinteger.h"
+#include "arvgc.h"
+#include "arvdomtext.h"
+#include "arvmisc.h"
 #include <string.h>
 
 struct _ArvGcValueIndexedNode {
diff --git a/src/arvgcvalueindexednode.h b/aravis/arvgcvalueindexednode.h
similarity index 94%
rename from src/arvgcvalueindexednode.h
rename to aravis/arvgcvalueindexednode.h
index 8f75af7ed..10b6eccaf 100644
--- a/src/arvgcvalueindexednode.h
+++ b/aravis/arvgcvalueindexednode.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgcpropertynode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgcpropertynode.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgentldevice.c b/aravis/arvgentldevice.c
similarity index 98%
rename from src/arvgentldevice.c
rename to aravis/arvgentldevice.c
index 43e11a8a3..941b003bf 100644
--- a/src/arvgentldevice.c
+++ b/aravis/arvgentldevice.c
@@ -25,16 +25,16 @@
  * @short_description: GenTL device
  */
 
-#include <arvdeviceprivate.h>
-#include <arvgentldeviceprivate.h>
-#include <arvgentlsystemprivate.h>
-#include <arvgentlinterfaceprivate.h>
-#include <arvgentlstreamprivate.h>
-#include <arvmiscprivate.h>
-#include <arvgc.h>
-#include <arvdebugprivate.h>
-#include <arvzip.h>
-#include <arvstr.h>
+#include "arvdeviceprivate.h"
+#include "arvgentldeviceprivate.h"
+#include "arvgentlsystemprivate.h"
+#include "arvgentlinterfaceprivate.h"
+#include "arvgentlstreamprivate.h"
+#include "arvmiscprivate.h"
+#include "arvgc.h"
+#include "arvdebugprivate.h"
+#include "arvzip.h"
+#include "arvstr.h"
 
 enum
 {
diff --git a/src/arvgentldevice.h b/aravis/arvgentldevice.h
similarity index 92%
rename from src/arvgentldevice.h
rename to aravis/arvgentldevice.h
index 354c04e82..9ba9865a5 100644
--- a/src/arvgentldevice.h
+++ b/aravis/arvgentldevice.h
@@ -27,10 +27,10 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvdevice.h>
-#include <arvgentlsystem.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdevice.h>
+#include <aravis/arvgentlsystem.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgentldeviceprivate.h b/aravis/arvgentldeviceprivate.h
similarity index 94%
rename from src/arvgentldeviceprivate.h
rename to aravis/arvgentldeviceprivate.h
index a97f3e8bf..b41f0dadb 100644
--- a/src/arvgentldeviceprivate.h
+++ b/aravis/arvgentldeviceprivate.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvgentldevice.h>
-#include <arvgentlsystemprivate.h>
+#include <aravis/arvgentldevice.h>
+#include <aravis/arvgentlsystemprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgentlinterface.c b/aravis/arvgentlinterface.c
similarity index 98%
rename from src/arvgentlinterface.c
rename to aravis/arvgentlinterface.c
index 2b8c3a362..745a2832f 100644
--- a/src/arvgentlinterface.c
+++ b/aravis/arvgentlinterface.c
@@ -24,14 +24,14 @@
  * SECTION: arvgentlinterface
  * @short_description: GenTL interface
  */
-#include <arvgentlprivate.h>
-#include <arvgentlsystemprivate.h>
-#include <arvgentlinterfaceprivate.h>
-#include <arvgentldeviceprivate.h>
-#include <arvinterfaceprivate.h>
-#include <arvdebugprivate.h>
-#include <arvmiscprivate.h>
-#include <arvstr.h>
+#include "arvgentlprivate.h"
+#include "arvgentlsystemprivate.h"
+#include "arvgentlinterfaceprivate.h"
+#include "arvgentldeviceprivate.h"
+#include "arvinterfaceprivate.h"
+#include "arvdebugprivate.h"
+#include "arvmiscprivate.h"
+#include "arvstr.h"
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/src/arvgentlinterface.h b/aravis/arvgentlinterface.h
similarity index 93%
rename from src/arvgentlinterface.h
rename to aravis/arvgentlinterface.h
index 2d76f2b7a..0dbc64204 100644
--- a/src/arvgentlinterface.h
+++ b/aravis/arvgentlinterface.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvinterface.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvinterface.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgentlinterfaceprivate.h b/aravis/arvgentlinterfaceprivate.h
similarity index 91%
rename from src/arvgentlinterfaceprivate.h
rename to aravis/arvgentlinterfaceprivate.h
index 1043453c2..84e6b445c 100644
--- a/src/arvgentlinterfaceprivate.h
+++ b/aravis/arvgentlinterfaceprivate.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvgentlinterface.h>
-#include <arvinterfaceprivate.h>
-#include <arvgentlprivate.h>
+#include <aravis/arvgentlinterface.h>
+#include <aravis/arvinterfaceprivate.h>
+#include <aravis/arvgentlprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgentlprivate.h b/aravis/arvgentlprivate.h
similarity index 99%
rename from src/arvgentlprivate.h
rename to aravis/arvgentlprivate.h
index e3bf231b0..a7277c784 100644
--- a/src/arvgentlprivate.h
+++ b/aravis/arvgentlprivate.h
@@ -23,8 +23,8 @@
 #ifndef ARV_GENTL_H
 #define ARV_GENTL_H
 
-#include <arvtypes.h>
-#include <arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvapi.h>
 #include <stdint.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvgentlstream.c b/aravis/arvgentlstream.c
similarity index 99%
rename from src/arvgentlstream.c
rename to aravis/arvgentlstream.c
index d78ec2492..d07e27856 100644
--- a/src/arvgentlstream.c
+++ b/aravis/arvgentlstream.c
@@ -25,14 +25,14 @@
  * @short_description: GenTL stream
  */
 
-#include <arvdebugprivate.h>
-#include <arvgentlsystemprivate.h>
-#include <arvgentlstreamprivate.h>
-#include <arvgentldeviceprivate.h>
-#include <arvstreamprivate.h>
-#include <arvbufferprivate.h>
-#include <arvmiscprivate.h>
-#include <arvdebug.h>
+#include "arvdebugprivate.h"
+#include "arvgentlsystemprivate.h"
+#include "arvgentlstreamprivate.h"
+#include "arvgentldeviceprivate.h"
+#include "arvstreamprivate.h"
+#include "arvbufferprivate.h"
+#include "arvmiscprivate.h"
+#include "arvdebug.h"
 #include <stdio.h>
 
 /* This structure allows to Revoke a GenTL buffer even after ArvStream object is finalized, which may happen if a buffer
diff --git a/src/arvgentlstream.h b/aravis/arvgentlstream.h
similarity index 93%
rename from src/arvgentlstream.h
rename to aravis/arvgentlstream.h
index 12a0aef39..4aa1b671d 100644
--- a/src/arvgentlstream.h
+++ b/aravis/arvgentlstream.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvstream.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvstream.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgentlstreamprivate.h b/aravis/arvgentlstreamprivate.h
similarity index 92%
rename from src/arvgentlstreamprivate.h
rename to aravis/arvgentlstreamprivate.h
index f7f9c9118..39c13fac7 100644
--- a/src/arvgentlstreamprivate.h
+++ b/aravis/arvgentlstreamprivate.h
@@ -23,9 +23,9 @@
 #ifndef ARV_GENTL_STREAM_PRIVATE_H
 #define ARV_GENTL_STREAM_PRIVATE_H
 
-#include <arvgentldeviceprivate.h>
-#include <arvgentlstream.h>
-#include <arvstream.h>
+#include <aravis/arvgentldeviceprivate.h>
+#include <aravis/arvgentlstream.h>
+#include <aravis/arvstream.h>
 
 
 G_BEGIN_DECLS
diff --git a/src/arvgentlsystem.c b/aravis/arvgentlsystem.c
similarity index 99%
rename from src/arvgentlsystem.c
rename to aravis/arvgentlsystem.c
index d83d7131c..b66a4cc0d 100644
--- a/src/arvgentlsystem.c
+++ b/aravis/arvgentlsystem.c
@@ -29,9 +29,9 @@
 
 #include <gmodule.h>
 
-#include <arvgentlsystemprivate.h>
-#include <arvgentlinterfaceprivate.h>
-#include <arvdebugprivate.h>
+#include "arvgentlsystemprivate.h"
+#include "arvgentlinterfaceprivate.h"
+#include "arvdebugprivate.h"
 
 enum
 {
diff --git a/src/arvgentlsystem.h b/aravis/arvgentlsystem.h
similarity index 95%
rename from src/arvgentlsystem.h
rename to aravis/arvgentlsystem.h
index 1fb7f6175..9ec9e2fc9 100644
--- a/src/arvgentlsystem.h
+++ b/aravis/arvgentlsystem.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgentlsystemprivate.h b/aravis/arvgentlsystemprivate.h
similarity index 98%
rename from src/arvgentlsystemprivate.h
rename to aravis/arvgentlsystemprivate.h
index d9b8ea919..bffd28031 100644
--- a/src/arvgentlsystemprivate.h
+++ b/aravis/arvgentlsystemprivate.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvgentlsystem.h>
-#include <arvgentlprivate.h>
+#include <aravis/arvgentlsystem.h>
+#include <aravis/arvgentlprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgvcp.c b/aravis/arvgvcp.c
similarity index 99%
rename from src/arvgvcp.c
rename to aravis/arvgvcp.c
index ea15ff5b8..94881aff3 100644
--- a/src/arvgvcp.c
+++ b/aravis/arvgvcp.c
@@ -25,14 +25,14 @@
  * @short_description: GigEVision control packet handling
  */
 
-#include <arvgvcpprivate.h>
-#include <arvgvspprivate.h>
-#include <arvmiscprivate.h>
-#include <arvenumtypes.h>
-#include <arvenumtypesprivate.h>
+#include "arvgvcpprivate.h"
+#include "arvgvspprivate.h"
+#include "arvmiscprivate.h"
+#include "arvenumtypes.h"
+#include "arvenumtypesprivate.h"
 #include <string.h>
-#include <arvdebug.h>
-#include <arvstr.h>
+#include "arvdebug.h"
+#include "arvstr.h"
 
 void
 arv_gvcp_packet_free (ArvGvcpPacket *packet)
diff --git a/src/arvgvcpprivate.h b/aravis/arvgvcpprivate.h
similarity index 99%
rename from src/arvgvcpprivate.h
rename to aravis/arvgvcpprivate.h
index ba85e7aff..893e36b0c 100644
--- a/src/arvgvcpprivate.h
+++ b/aravis/arvgvcpprivate.h
@@ -23,8 +23,8 @@
 #ifndef ARV_GVCP_PRIVATE_H
 #define ARV_GVCP_PRIVATE_H
 
-#include <arvtypes.h>
-#include <arvdebugprivate.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdebugprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgvdevice.c b/aravis/arvgvdevice.c
similarity index 99%
rename from src/arvgvdevice.c
rename to aravis/arvgvdevice.c
index 870e59dfc..dc68a6b25 100644
--- a/src/arvgvdevice.c
+++ b/aravis/arvgvdevice.c
@@ -25,21 +25,21 @@
  * @short_description: GigEVision device
  */
 
-#include <arvgvdeviceprivate.h>
-#include <arvdeviceprivate.h>
-#include <arvgc.h>
-#include <arvgccommand.h>
-#include <arvgcboolean.h>
-#include <arvgcregisterdescriptionnode.h>
-#include <arvdebugprivate.h>
-#include <arvgvstreamprivate.h>
-#include <arvgvcpprivate.h>
-#include <arvgvspprivate.h>
-#include <arvnetworkprivate.h>
-#include <arvzip.h>
-#include <arvstr.h>
-#include <arvmiscprivate.h>
-#include <arvenumtypes.h>
+#include "arvgvdeviceprivate.h"
+#include "arvdeviceprivate.h"
+#include "arvgc.h"
+#include "arvgccommand.h"
+#include "arvgcboolean.h"
+#include "arvgcregisterdescriptionnode.h"
+#include "arvdebugprivate.h"
+#include "arvgvstreamprivate.h"
+#include "arvgvcpprivate.h"
+#include "arvgvspprivate.h"
+#include "arvnetworkprivate.h"
+#include "arvzip.h"
+#include "arvstr.h"
+#include "arvmiscprivate.h"
+#include "arvenumtypes.h"
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/arvgvdevice.h b/aravis/arvgvdevice.h
similarity index 98%
rename from src/arvgvdevice.h
rename to aravis/arvgvdevice.h
index 9b2585157..20990d4f8 100644
--- a/src/arvgvdevice.h
+++ b/aravis/arvgvdevice.h
@@ -27,10 +27,10 @@
 #ifndef ARV_GV_DEVICE_H
 #define ARV_GV_DEVICE_H
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvdevice.h>
-#include <arvgvstream.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdevice.h>
+#include <aravis/arvgvstream.h>
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvgvdeviceprivate.h b/aravis/arvgvdeviceprivate.h
similarity index 98%
rename from src/arvgvdeviceprivate.h
rename to aravis/arvgvdeviceprivate.h
index 8a68fbf81..e2524fd45 100644
--- a/src/arvgvdeviceprivate.h
+++ b/aravis/arvgvdeviceprivate.h
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvgvdevice.h>
+#include <aravis/arvgvdevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgvfakecamera.c b/aravis/arvgvfakecamera.c
similarity index 99%
rename from src/arvgvfakecamera.c
rename to aravis/arvgvfakecamera.c
index 12dfd9df3..43637569f 100644
--- a/src/arvgvfakecamera.c
+++ b/aravis/arvgvfakecamera.c
@@ -20,14 +20,14 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvgvfakecamera.h>
-#include <arvfakecamera.h>
-#include <arvbufferprivate.h>
-#include <arvgvcpprivate.h>
-#include <arvgvspprivate.h>
-#include <arvmisc.h>
-#include <arvmiscprivate.h>
-#include <arvnetworkprivate.h>
+#include "arvgvfakecamera.h"
+#include "arvfakecamera.h"
+#include "arvbufferprivate.h"
+#include "arvgvcpprivate.h"
+#include "arvgvspprivate.h"
+#include "arvmisc.h"
+#include "arvmiscprivate.h"
+#include "arvnetworkprivate.h"
 
 /**
  * SECTION: arvgvfakecamera
diff --git a/src/arvgvfakecamera.h b/aravis/arvgvfakecamera.h
similarity index 97%
rename from src/arvgvfakecamera.h
rename to aravis/arvgvfakecamera.h
index c07d11ae0..1f731729d 100644
--- a/src/arvgvfakecamera.h
+++ b/aravis/arvgvfakecamera.h
@@ -27,8 +27,8 @@
 #ifndef ARV_GV_FAKE_CAMERA_H
 #define ARV_GV_FAKE_CAMERA_H
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgvinterface.c b/aravis/arvgvinterface.c
similarity index 99%
rename from src/arvgvinterface.c
rename to aravis/arvgvinterface.c
index 1fc4f3715..5f0b5ad8c 100644
--- a/src/arvgvinterface.c
+++ b/aravis/arvgvinterface.c
@@ -25,15 +25,15 @@
  * @short_description: GigEVision interface
  */
 
-#include <arvgvinterfaceprivate.h>
-#include <arvinterfaceprivate.h>
-#include <arvgvdeviceprivate.h>
-#include <arvgvcpprivate.h>
-#include <arvdebugprivate.h>
-#include <arvmisc.h>
-#include <arvmiscprivate.h>
-#include <arvnetworkprivate.h>
-#include <arvstr.h>
+#include "arvgvinterfaceprivate.h"
+#include "arvinterfaceprivate.h"
+#include "arvgvdeviceprivate.h"
+#include "arvgvcpprivate.h"
+#include "arvdebugprivate.h"
+#include "arvmisc.h"
+#include "arvmiscprivate.h"
+#include "arvnetworkprivate.h"
+#include "arvstr.h"
 #include <glib/gprintf.h>
 #include <gio/gio.h>
 #include <sys/types.h>
diff --git a/src/arvgvinterface.h b/aravis/arvgvinterface.h
similarity index 95%
rename from src/arvgvinterface.h
rename to aravis/arvgvinterface.h
index c3ad6aa24..a23eda3c8 100644
--- a/src/arvgvinterface.h
+++ b/aravis/arvgvinterface.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvinterface.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvinterface.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgvinterfaceprivate.h b/aravis/arvgvinterfaceprivate.h
similarity index 94%
rename from src/arvgvinterfaceprivate.h
rename to aravis/arvgvinterfaceprivate.h
index 80b747806..a982fdd01 100644
--- a/src/arvgvinterfaceprivate.h
+++ b/aravis/arvgvinterfaceprivate.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvgvinterface.h>
-#include <arvinterfaceprivate.h>
+#include <aravis/arvgvinterface.h>
+#include <aravis/arvinterfaceprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgvsp.c b/aravis/arvgvsp.c
similarity index 98%
rename from src/arvgvsp.c
rename to aravis/arvgvsp.c
index 2aefd1c19..c02fb0249 100644
--- a/src/arvgvsp.c
+++ b/aravis/arvgvsp.c
@@ -25,11 +25,11 @@
  * @short_description: GigEVision stream packet handling
  */
 
-#include <arvdebug.h>
-#include <arvmiscprivate.h>
-#include <arvenumtypes.h>
-#include <arvgvspprivate.h>
-#include <arvenumtypesprivate.h>
+#include "arvdebug.h"
+#include "arvmiscprivate.h"
+#include "arvenumtypes.h"
+#include "arvgvspprivate.h"
+#include "arvenumtypesprivate.h"
 #include <stddef.h>
 #include <string.h>
 
diff --git a/src/arvgvspprivate.h b/aravis/arvgvspprivate.h
similarity index 99%
rename from src/arvgvspprivate.h
rename to aravis/arvgvspprivate.h
index 32f2acfe9..627defc22 100644
--- a/src/arvgvspprivate.h
+++ b/aravis/arvgvspprivate.h
@@ -23,9 +23,9 @@
 #ifndef ARV_GVSP_PRIVATE_H
 #define ARV_GVSP_PRIVATE_H
 
-#include <arvtypes.h>
-#include <arvbuffer.h>
-#include <arvdebugprivate.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvbuffer.h>
+#include <aravis/arvdebugprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgvstream.c b/aravis/arvgvstream.c
similarity index 99%
rename from src/arvgvstream.c
rename to aravis/arvgvstream.c
index e1426c525..a46b5f468 100644
--- a/src/arvgvstream.c
+++ b/aravis/arvgvstream.c
@@ -25,21 +25,21 @@
  * @short_description: GigEVision stream
  */
 
-#include <arvdebugprivate.h>
-#include <arvgvstreamprivate.h>
-#include <arvgvdeviceprivate.h>
-#include <arvstreamprivate.h>
-#include <arvbufferprivate.h>
-#include <arvfeatures.h>
-#include <arvparamsprivate.h>
-#include <arvgvspprivate.h>
-#include <arvgvcpprivate.h>
-#include <arvdebug.h>
-#include <arvmisc.h>
-#include <arvmiscprivate.h>
-#include <arvnetworkprivate.h>
-#include <arvstr.h>
-#include <arvenumtypes.h>
+#include "arvdebugprivate.h"
+#include "arvgvstreamprivate.h"
+#include "arvgvdeviceprivate.h"
+#include "arvstreamprivate.h"
+#include "arvbufferprivate.h"
+#include "arvfeatures.h"
+#include "arvparamsprivate.h"
+#include "arvgvspprivate.h"
+#include "arvgvcpprivate.h"
+#include "arvdebug.h"
+#include "arvmisc.h"
+#include "arvmiscprivate.h"
+#include "arvnetworkprivate.h"
+#include "arvstr.h"
+#include "arvenumtypes.h"
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/arvgvstream.h b/aravis/arvgvstream.h
similarity index 96%
rename from src/arvgvstream.h
rename to aravis/arvgvstream.h
index 2dc964273..4539b1ba4 100644
--- a/src/arvgvstream.h
+++ b/aravis/arvgvstream.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvstream.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvstream.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvgvstreamprivate.h b/aravis/arvgvstreamprivate.h
similarity index 95%
rename from src/arvgvstreamprivate.h
rename to aravis/arvgvstreamprivate.h
index 37e1ab705..075fa8386 100644
--- a/src/arvgvstreamprivate.h
+++ b/aravis/arvgvstreamprivate.h
@@ -23,8 +23,8 @@
 #ifndef ARV_GV_STREAM_PRIVATE_H
 #define ARV_GV_STREAM_PRIVATE_H
 
-#include <arvgvstream.h>
-#include <arvstream.h>
+#include <aravis/arvgvstream.h>
+#include <aravis/arvstream.h>
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvinterface.c b/aravis/arvinterface.c
similarity index 99%
rename from src/arvinterface.c
rename to aravis/arvinterface.c
index 1a3f667e3..e3de3f1cd 100644
--- a/src/arvinterface.c
+++ b/aravis/arvinterface.c
@@ -31,7 +31,7 @@
  * arv_open_device().
  */
 
-#include <arvinterfaceprivate.h>
+#include "arvinterfaceprivate.h"
 
 typedef struct {
 	GArray *device_ids;
diff --git a/src/arvinterface.h b/aravis/arvinterface.h
similarity index 96%
rename from src/arvinterface.h
rename to aravis/arvinterface.h
index efb664690..35530ba45 100644
--- a/src/arvinterface.h
+++ b/aravis/arvinterface.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvdevice.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvinterfaceprivate.h b/aravis/arvinterfaceprivate.h
similarity index 98%
rename from src/arvinterfaceprivate.h
rename to aravis/arvinterfaceprivate.h
index 906c0804a..7bed64b29 100644
--- a/src/arvinterfaceprivate.h
+++ b/aravis/arvinterfaceprivate.h
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvinterface.h>
+#include <aravis/arvinterface.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvmisc.c b/aravis/arvmisc.c
similarity index 99%
rename from src/arvmisc.c
rename to aravis/arvmisc.c
index 2e3b45a70..1600d8a60 100644
--- a/src/arvmisc.c
+++ b/aravis/arvmisc.c
@@ -20,9 +20,9 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvmiscprivate.h>
-#include <arvdebugprivate.h>
-#include <arvversion.h>
+#include "arvmiscprivate.h"
+#include "arvdebugprivate.h"
+#include "arvversion.h"
 #include <string.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/src/arvmisc.h b/aravis/arvmisc.h
similarity index 97%
rename from src/arvmisc.h
rename to aravis/arvmisc.h
index 3346ff089..c7c99e2e9 100644
--- a/src/arvmisc.h
+++ b/aravis/arvmisc.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvmiscprivate.h b/aravis/arvmiscprivate.h
similarity index 98%
rename from src/arvmiscprivate.h
rename to aravis/arvmiscprivate.h
index f82244802..10384d9d7 100644
--- a/src/arvmiscprivate.h
+++ b/aravis/arvmiscprivate.h
@@ -23,9 +23,9 @@
 #ifndef ARV_MISC_PRIVATE_H
 #define ARV_MISC_PRIVATE_H
 
-#include <arvapi.h>
-#include <arvmisc.h>
-#include <arvgentlprivate.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvmisc.h>
+#include <aravis/arvgentlprivate.h>
 
 typedef struct _ArvHistogram ArvHistogram;
 
diff --git a/src/arvnetwork.c b/aravis/arvnetwork.c
similarity index 99%
rename from src/arvnetwork.c
rename to aravis/arvnetwork.c
index 6fcc77465..73434b86e 100644
--- a/src/arvnetwork.c
+++ b/aravis/arvnetwork.c
@@ -21,9 +21,9 @@
  *          Václav Šmilauer <eu@doxos.eu>
  */
 
-#include <arvnetworkprivate.h>
-#include <arvdebugprivate.h>
-#include <arvmiscprivate.h>
+#include "arvnetworkprivate.h"
+#include "arvdebugprivate.h"
+#include "arvmiscprivate.h"
 #include <errno.h>
 
 GQuark
diff --git a/src/arvnetwork.h b/aravis/arvnetwork.h
similarity index 96%
rename from src/arvnetwork.h
rename to aravis/arvnetwork.h
index 6a250afca..d1590b981 100644
--- a/src/arvnetwork.h
+++ b/aravis/arvnetwork.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvnetworkprivate.h b/aravis/arvnetworkprivate.h
similarity index 99%
rename from src/arvnetworkprivate.h
rename to aravis/arvnetworkprivate.h
index 06f9445b0..21fd053d4 100644
--- a/src/arvnetworkprivate.h
+++ b/aravis/arvnetworkprivate.h
@@ -24,7 +24,7 @@
 #ifndef ARV_NETWORK_PRIVATE_H
 #define ARV_NETWORK_PRIVATE_H
 
-#include <arvnetwork.h>
+#include <aravis/arvnetwork.h>
 
 #include <gio/gnetworking.h>
 #include <gio/gio.h>
diff --git a/src/arvparamsprivate.h.in b/aravis/arvparamsprivate.h.in
similarity index 100%
rename from src/arvparamsprivate.h.in
rename to aravis/arvparamsprivate.h.in
diff --git a/src/arvrealtime.c b/aravis/arvrealtime.c
similarity index 99%
rename from src/arvrealtime.c
rename to aravis/arvrealtime.c
index 2172c353d..49bb2384c 100644
--- a/src/arvrealtime.c
+++ b/aravis/arvrealtime.c
@@ -27,8 +27,8 @@
 
 */
 
-#include <arvrealtimeprivate.h>
-#include <arvdebugprivate.h>
+#include "arvrealtimeprivate.h"
+#include "arvdebugprivate.h"
 #include <memory.h>
 #include <errno.h>
 
diff --git a/src/arvrealtime.h b/aravis/arvrealtime.h
similarity index 95%
rename from src/arvrealtime.h
rename to aravis/arvrealtime.h
index b3d5dbac3..1d3c15e85 100644
--- a/src/arvrealtime.h
+++ b/aravis/arvrealtime.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvrealtimeprivate.h b/aravis/arvrealtimeprivate.h
similarity index 98%
rename from src/arvrealtimeprivate.h
rename to aravis/arvrealtimeprivate.h
index 900a2dfb0..bfae1c6db 100644
--- a/src/arvrealtimeprivate.h
+++ b/aravis/arvrealtimeprivate.h
@@ -23,7 +23,7 @@
 #ifndef ARV_REALTIME_PRIVATE_H
 #define ARV_REALTIME_PRIVATE_H
 
-#include <arvrealtime.h>
+#include <aravis/arvrealtime.h>
 #include <gio/gio.h>
 
 #ifndef G_OS_WIN32
diff --git a/src/arvresources.xml b/aravis/arvresources.xml
similarity index 100%
rename from src/arvresources.xml
rename to aravis/arvresources.xml
diff --git a/src/arvstr.c b/aravis/arvstr.c
similarity index 99%
rename from src/arvstr.c
rename to aravis/arvstr.c
index 5f938c32a..32e85756e 100644
--- a/src/arvstr.c
+++ b/aravis/arvstr.c
@@ -20,7 +20,7 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvstr.h>
+#include "arvstr.h"
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/arvstr.h b/aravis/arvstr.h
similarity index 97%
rename from src/arvstr.h
rename to aravis/arvstr.h
index b887f4152..4b8aa3751 100644
--- a/src/arvstr.h
+++ b/aravis/arvstr.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvstream.c b/aravis/arvstream.c
similarity index 99%
rename from src/arvstream.c
rename to aravis/arvstream.c
index 249bcbcdf..f27037db4 100644
--- a/src/arvstream.c
+++ b/aravis/arvstream.c
@@ -30,10 +30,10 @@
  * objects.
  */
 
-#include <arvstreamprivate.h>
-#include <arvbuffer.h>
-#include <arvdevice.h>
-#include <arvdebugprivate.h>
+#include "arvstreamprivate.h"
+#include "arvbuffer.h"
+#include "arvdevice.h"
+#include "arvdebugprivate.h"
 #include <gio/gio.h>
 
 typedef struct {
diff --git a/src/arvstream.h b/aravis/arvstream.h
similarity index 98%
rename from src/arvstream.h
rename to aravis/arvstream.h
index 259bcf847..f3e78efbb 100644
--- a/src/arvstream.h
+++ b/aravis/arvstream.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvbuffer.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvbuffer.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvstreamprivate.h b/aravis/arvstreamprivate.h
similarity index 98%
rename from src/arvstreamprivate.h
rename to aravis/arvstreamprivate.h
index 1bb89f901..57bd2b7a0 100644
--- a/src/arvstreamprivate.h
+++ b/aravis/arvstreamprivate.h
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvstream.h>
+#include <aravis/arvstream.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvsystem.c b/aravis/arvsystem.c
similarity index 97%
rename from src/arvsystem.c
rename to aravis/arvsystem.c
index 2e3ad3f97..7378aa3ee 100644
--- a/src/arvsystem.c
+++ b/aravis/arvsystem.c
@@ -20,22 +20,22 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvsystem.h>
-#include <arvgvinterfaceprivate.h>
-#include <arvfeatures.h>
+#include "arvsystem.h"
+#include "arvgvinterfaceprivate.h"
+#include "arvfeatures.h"
 #if ARAVIS_HAS_USB
-#include <arvuvinterfaceprivate.h>
+#include "arvuvinterfaceprivate.h"
 #endif
 #if ARAVIS_HAS_V4L2
-#include <arvv4l2interfaceprivate.h>
+#include "arvv4l2interfaceprivate.h"
 #endif
-#include <arvfakeinterfaceprivate.h>
-#include <arvgentlinterfaceprivate.h>
-#include <arvdevice.h>
-#include <arvdebugprivate.h>
+#include "arvfakeinterfaceprivate.h"
+#include "arvgentlinterfaceprivate.h"
+#include "arvdevice.h"
+#include "arvdebugprivate.h"
 #include <string.h>
-#include <arvmisc.h>
-#include <arvdomimplementation.h>
+#include "arvmisc.h"
+#include "arvdomimplementation.h"
 
 static GMutex arv_system_mutex;
 
diff --git a/src/arvsystem.h b/aravis/arvsystem.h
similarity index 97%
rename from src/arvsystem.h
rename to aravis/arvsystem.h
index 1269a0881..b0f639dd5 100644
--- a/src/arvsystem.h
+++ b/aravis/arvsystem.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvtest.c b/aravis/arvtest.c
similarity index 99%
rename from src/arvtest.c
rename to aravis/arvtest.c
index 29a3e3e9d..6b10c7322 100644
--- a/src/arvtest.c
+++ b/aravis/arvtest.c
@@ -24,10 +24,10 @@
 #include <arv.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <arvdebugprivate.h>
-#include <arvmiscprivate.h>
-#include <arvgcprivate.h>
-#include <arvbufferprivate.h>
+#include "arvdebugprivate.h"
+#include "arvmiscprivate.h"
+#include "arvgcprivate.h"
+#include "arvbufferprivate.h"
 #include <math.h>
 
 #ifdef _MSC_VER
diff --git a/src/arvtestresources.xml b/aravis/arvtestresources.xml
similarity index 100%
rename from src/arvtestresources.xml
rename to aravis/arvtestresources.xml
diff --git a/src/arvtool.c b/aravis/arvtool.c
similarity index 99%
rename from src/arvtool.c
rename to aravis/arvtool.c
index 71838b18f..b7f6ac18f 100644
--- a/src/arvtool.c
+++ b/aravis/arvtool.c
@@ -20,8 +20,8 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvdebugprivate.h>
-#include <arvmiscprivate.h>
+#include "arvdebugprivate.h"
+#include "arvmiscprivate.h"
 #include <arv.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/arvtypes.h b/aravis/arvtypes.h
similarity index 98%
rename from src/arvtypes.h
rename to aravis/arvtypes.h
index de2cadbb4..a1cc1edef 100644
--- a/src/arvtypes.h
+++ b/aravis/arvtypes.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvenums.h>
-#include <arvfeatures.h>
+#include <aravis/arvenums.h>
+#include <aravis/arvfeatures.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvuvcp.c b/aravis/arvuvcp.c
similarity index 98%
rename from src/arvuvcp.c
rename to aravis/arvuvcp.c
index 694b60530..513596820 100644
--- a/src/arvuvcp.c
+++ b/aravis/arvuvcp.c
@@ -25,11 +25,11 @@
  * @short_description: USB3Vision control packet handling
  */
 
-#include <arvmiscprivate.h>
-#include <arvuvcpprivate.h>
-#include <arvenumtypesprivate.h>
-#include <arvdebug.h>
-#include <arvstr.h>
+#include "arvmiscprivate.h"
+#include "arvuvcpprivate.h"
+#include "arvenumtypesprivate.h"
+#include "arvdebug.h"
+#include "arvstr.h"
 #include <string.h>
 
 void
diff --git a/src/arvuvcpprivate.h b/aravis/arvuvcpprivate.h
similarity index 99%
rename from src/arvuvcpprivate.h
rename to aravis/arvuvcpprivate.h
index 2ee351ee0..32d83386d 100644
--- a/src/arvuvcpprivate.h
+++ b/aravis/arvuvcpprivate.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvtypes.h>
-#include <arvdebugprivate.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdebugprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvuvdevice.c b/aravis/arvuvdevice.c
similarity index 99%
rename from src/arvuvdevice.c
rename to aravis/arvuvdevice.c
index ac768922f..d50b18cf5 100644
--- a/src/arvuvdevice.c
+++ b/aravis/arvuvdevice.c
@@ -25,18 +25,18 @@
  * @short_description: USB3Vision device
  */
 
-#include <arvuvstreamprivate.h>
-#include <arvuvdeviceprivate.h>
-#include <arvuvinterfaceprivate.h>
-#include <arvuvcpprivate.h>
-#include <arvgc.h>
-#include <arvdebug.h>
-#include <arvenumtypes.h>
+#include "arvuvstreamprivate.h"
+#include "arvuvdeviceprivate.h"
+#include "arvuvinterfaceprivate.h"
+#include "arvuvcpprivate.h"
+#include "arvgc.h"
+#include "arvdebug.h"
+#include "arvenumtypes.h"
 #include <libusb.h>
 #include <string.h>
-#include <arvstr.h>
-#include <arvzip.h>
-#include <arvmisc.h>
+#include "arvstr.h"
+#include "arvzip.h"
+#include "arvmisc.h"
 
 enum
 {
diff --git a/src/arvuvdevice.h b/aravis/arvuvdevice.h
similarity index 95%
rename from src/arvuvdevice.h
rename to aravis/arvuvdevice.h
index 650ee63cb..e067a414c 100644
--- a/src/arvuvdevice.h
+++ b/aravis/arvuvdevice.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvdevice.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvuvdeviceprivate.h b/aravis/arvuvdeviceprivate.h
similarity index 97%
rename from src/arvuvdeviceprivate.h
rename to aravis/arvuvdeviceprivate.h
index 9d9f3028a..47c759aa4 100644
--- a/src/arvuvdeviceprivate.h
+++ b/aravis/arvuvdeviceprivate.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvuvdevice.h>
-#include <arvdeviceprivate.h>
+#include <aravis/arvuvdevice.h>
+#include <aravis/arvdeviceprivate.h>
 #include <libusb.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvuvinterface.c b/aravis/arvuvinterface.c
similarity index 98%
rename from src/arvuvinterface.c
rename to aravis/arvuvinterface.c
index b1bf786f7..178b004fb 100644
--- a/src/arvuvinterface.c
+++ b/aravis/arvuvinterface.c
@@ -25,12 +25,12 @@
  * @short_description: USB3Vision interface
  */
 
-#include <arvuvinterfaceprivate.h>
-#include <arvinterfaceprivate.h>
-#include <arvuvdeviceprivate.h>
-#include <arvdebugprivate.h>
-#include <arvmiscprivate.h>
-#include <arvstr.h>
+#include "arvuvinterfaceprivate.h"
+#include "arvinterfaceprivate.h"
+#include "arvuvdeviceprivate.h"
+#include "arvdebugprivate.h"
+#include "arvmiscprivate.h"
+#include "arvstr.h"
 #include <libusb.h>
 #include <stdio.h>
 
diff --git a/src/arvuvinterface.h b/aravis/arvuvinterface.h
similarity index 93%
rename from src/arvuvinterface.h
rename to aravis/arvuvinterface.h
index df1f69e9a..7c1550799 100644
--- a/src/arvuvinterface.h
+++ b/aravis/arvuvinterface.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvinterface.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvinterface.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvuvinterfaceprivate.h b/aravis/arvuvinterfaceprivate.h
similarity index 96%
rename from src/arvuvinterfaceprivate.h
rename to aravis/arvuvinterfaceprivate.h
index caf5162dc..b8f78ce68 100644
--- a/src/arvuvinterfaceprivate.h
+++ b/aravis/arvuvinterfaceprivate.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvuvinterface.h>
-#include <arvinterfaceprivate.h>
+#include <aravis/arvuvinterface.h>
+#include <aravis/arvinterfaceprivate.h>
 
 #define ARV_UV_INTERFACE_DEVICE_CLASS			0xef	/* Miscellaneous device */
 #define ARV_UV_INTERFACE_DEVICE_SUBCLASS		0x02
diff --git a/src/arvuvsp.c b/aravis/arvuvsp.c
similarity index 98%
rename from src/arvuvsp.c
rename to aravis/arvuvsp.c
index bfe84444d..d9910406e 100644
--- a/src/arvuvsp.c
+++ b/aravis/arvuvsp.c
@@ -20,9 +20,9 @@
  * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
  */
 
-#include <arvuvspprivate.h>
-#include <arvstr.h>
-#include <arvmiscprivate.h>
+#include "arvuvspprivate.h"
+#include "arvstr.h"
+#include "arvmiscprivate.h"
 
 /*
  * SECTION: arvuvsp
diff --git a/src/arvuvspprivate.h b/aravis/arvuvspprivate.h
similarity index 99%
rename from src/arvuvspprivate.h
rename to aravis/arvuvspprivate.h
index a3ca33ef7..f4ae722dd 100644
--- a/src/arvuvspprivate.h
+++ b/aravis/arvuvspprivate.h
@@ -23,9 +23,9 @@
 #ifndef ARV_UVSP_PRIVATE_H
 #define ARV_UVSP_PRIVATE_H
 
-#include <arvtypes.h>
-#include <arvdebug.h>
-#include <arvbufferprivate.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdebug.h>
+#include <aravis/arvbufferprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvuvstream.c b/aravis/arvuvstream.c
similarity index 99%
rename from src/arvuvstream.c
rename to aravis/arvuvstream.c
index 594dc7832..a840390d6 100644
--- a/src/arvuvstream.c
+++ b/aravis/arvuvstream.c
@@ -25,14 +25,14 @@
  * @short_description: USB3Vision video stream
  */
 
-#include <arvenumtypes.h>
-#include <arvuvstreamprivate.h>
-#include <arvstreamprivate.h>
-#include <arvbufferprivate.h>
-#include <arvuvspprivate.h>
-#include <arvuvcpprivate.h>
-#include <arvdebug.h>
-#include <arvmisc.h>
+#include "arvenumtypes.h"
+#include "arvuvstreamprivate.h"
+#include "arvstreamprivate.h"
+#include "arvbufferprivate.h"
+#include "arvuvspprivate.h"
+#include "arvuvcpprivate.h"
+#include "arvdebug.h"
+#include "arvmisc.h"
 #include <libusb.h>
 #include <string.h>
 
diff --git a/src/arvuvstream.h b/aravis/arvuvstream.h
similarity index 93%
rename from src/arvuvstream.h
rename to aravis/arvuvstream.h
index c391164c7..91c5bcedb 100644
--- a/src/arvuvstream.h
+++ b/aravis/arvuvstream.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvstream.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvstream.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvuvstreamprivate.h b/aravis/arvuvstreamprivate.h
similarity index 93%
rename from src/arvuvstreamprivate.h
rename to aravis/arvuvstreamprivate.h
index ff4464315..052d7722b 100644
--- a/src/arvuvstreamprivate.h
+++ b/aravis/arvuvstreamprivate.h
@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvuvstream.h>
-#include <arvstream.h>
-#include <arvuvdeviceprivate.h>
+#include <aravis/arvuvstream.h>
+#include <aravis/arvstream.h>
+#include <aravis/arvuvdeviceprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvv4l2device.c b/aravis/arvv4l2device.c
similarity index 99%
rename from src/arvv4l2device.c
rename to aravis/arvv4l2device.c
index 426d04269..6465c44e3 100644
--- a/src/arvv4l2device.c
+++ b/aravis/arvv4l2device.c
@@ -25,12 +25,12 @@
  * @short_description: V4l2 device
  */
 
-#include <arvdeviceprivate.h>
-#include <arvv4l2deviceprivate.h>
-#include <arvv4l2streamprivate.h>
-#include <arvv4l2miscprivate.h>
-#include <arvdebugprivate.h>
-#include <arvmisc.h>
+#include "arvdeviceprivate.h"
+#include "arvv4l2deviceprivate.h"
+#include "arvv4l2streamprivate.h"
+#include "arvv4l2miscprivate.h"
+#include "arvdebugprivate.h"
+#include "arvmisc.h"
 #include <linux/videodev2.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/src/arvv4l2device.h b/aravis/arvv4l2device.h
similarity index 95%
rename from src/arvv4l2device.h
rename to aravis/arvv4l2device.h
index b9b1f54a6..e8c4567f4 100644
--- a/src/arvv4l2device.h
+++ b/aravis/arvv4l2device.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvtypes.h>
-#include <arvdevice.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvdevice.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvv4l2deviceprivate.h b/aravis/arvv4l2deviceprivate.h
similarity index 97%
rename from src/arvv4l2deviceprivate.h
rename to aravis/arvv4l2deviceprivate.h
index 4aac2521a..9d58f619c 100644
--- a/src/arvv4l2deviceprivate.h
+++ b/aravis/arvv4l2deviceprivate.h
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvv4l2device.h>
+#include <aravis/arvv4l2device.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvv4l2interface.c b/aravis/arvv4l2interface.c
similarity index 98%
rename from src/arvv4l2interface.c
rename to aravis/arvv4l2interface.c
index 06e0a5af7..cdb928128 100644
--- a/src/arvv4l2interface.c
+++ b/aravis/arvv4l2interface.c
@@ -25,13 +25,13 @@
  * @short_description: V4l2 interface
  */
 
-#include <arvv4l2interfaceprivate.h>
-#include <arvv4l2deviceprivate.h>
-#include <arvv4l2miscprivate.h>
-#include <arvinterfaceprivate.h>
-#include <arvv4l2device.h>
-#include <arvdebugprivate.h>
-#include <arvmisc.h>
+#include "arvv4l2interfaceprivate.h"
+#include "arvv4l2deviceprivate.h"
+#include "arvv4l2miscprivate.h"
+#include "arvinterfaceprivate.h"
+#include "arvv4l2device.h"
+#include "arvdebugprivate.h"
+#include "arvmisc.h"
 #include <fcntl.h>
 #include <gudev/gudev.h>
 #include <sys/stat.h>
diff --git a/src/arvv4l2interface.h b/aravis/arvv4l2interface.h
similarity index 95%
rename from src/arvv4l2interface.h
rename to aravis/arvv4l2interface.h
index 5ff93c624..529951b6a 100644
--- a/src/arvv4l2interface.h
+++ b/aravis/arvv4l2interface.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvtypes.h>
-#include <arvinterface.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvinterface.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvv4l2interfaceprivate.h b/aravis/arvv4l2interfaceprivate.h
similarity index 93%
rename from src/arvv4l2interfaceprivate.h
rename to aravis/arvv4l2interfaceprivate.h
index 70bf41aff..fb92a293f 100644
--- a/src/arvv4l2interfaceprivate.h
+++ b/aravis/arvv4l2interfaceprivate.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvinterfaceprivate.h>
-#include <arvv4l2interface.h>
+#include <aravis/arvinterfaceprivate.h>
+#include <aravis/arvv4l2interface.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvv4l2misc.c b/aravis/arvv4l2misc.c
similarity index 99%
rename from src/arvv4l2misc.c
rename to aravis/arvv4l2misc.c
index fc77aebb6..43870750a 100644
--- a/src/arvv4l2misc.c
+++ b/aravis/arvv4l2misc.c
@@ -1,4 +1,4 @@
-#include <arvv4l2miscprivate.h>
+#include "arvv4l2miscprivate.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/src/arvv4l2miscprivate.h b/aravis/arvv4l2miscprivate.h
similarity index 98%
rename from src/arvv4l2miscprivate.h
rename to aravis/arvv4l2miscprivate.h
index e5d0f76eb..e9afca2ac 100644
--- a/src/arvv4l2miscprivate.h
+++ b/aravis/arvv4l2miscprivate.h
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvtypes.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvv4l2stream.c b/aravis/arvv4l2stream.c
similarity index 99%
rename from src/arvv4l2stream.c
rename to aravis/arvv4l2stream.c
index 4547ce4c9..d30f1185f 100644
--- a/src/arvv4l2stream.c
+++ b/aravis/arvv4l2stream.c
@@ -25,14 +25,14 @@
  * @short_description: V4l2 stream
  */
 
-#include <arvv4l2streamprivate.h>
-#include <arvv4l2deviceprivate.h>
-#include <arvv4l2miscprivate.h>
-#include <arvstreamprivate.h>
-#include <arvbufferprivate.h>
-#include <arvdebug.h>
-#include <arvmisc.h>
-#include <arvstr.h>
+#include "arvv4l2streamprivate.h"
+#include "arvv4l2deviceprivate.h"
+#include "arvv4l2miscprivate.h"
+#include "arvstreamprivate.h"
+#include "arvbufferprivate.h"
+#include "arvdebug.h"
+#include "arvmisc.h"
+#include "arvstr.h"
 #include <linux/videodev2.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/src/arvv4l2stream.h b/aravis/arvv4l2stream.h
similarity index 97%
rename from src/arvv4l2stream.h
rename to aravis/arvv4l2stream.h
index 3b77c15c9..8ad1102d1 100644
--- a/src/arvv4l2stream.h
+++ b/aravis/arvv4l2stream.h
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvstream.h>
+#include <aravis/arvstream.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvv4l2streamprivate.h b/aravis/arvv4l2streamprivate.h
similarity index 95%
rename from src/arvv4l2streamprivate.h
rename to aravis/arvv4l2streamprivate.h
index e12edbbd6..d5ed76e0e 100644
--- a/src/arvv4l2streamprivate.h
+++ b/aravis/arvv4l2streamprivate.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvv4l2stream.h>
-#include <arvv4l2device.h>
+#include <aravis/arvv4l2stream.h>
+#include <aravis/arvv4l2device.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvversion.h.in b/aravis/arvversion.h.in
similarity index 98%
rename from src/arvversion.h.in
rename to aravis/arvversion.h.in
index 427f4b750..de5eb14da 100644
--- a/src/arvversion.h.in
+++ b/aravis/arvversion.h.in
@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvtypes.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/arvwakeup.c b/aravis/arvwakeup.c
similarity index 99%
rename from src/arvwakeup.c
rename to aravis/arvwakeup.c
index 98208a665..15468a232 100644
--- a/src/arvwakeup.c
+++ b/aravis/arvwakeup.c
@@ -24,7 +24,7 @@
  * (and at all other use sites).
  */
 
-#include <arvwakeupprivate.h>
+#include "arvwakeupprivate.h"
 
 /*< private >
  * SECTION:arvwakeup
diff --git a/src/arvwakeupprivate.h b/aravis/arvwakeupprivate.h
similarity index 97%
rename from src/arvwakeupprivate.h
rename to aravis/arvwakeupprivate.h
index e03c85deb..a0c64eda7 100644
--- a/src/arvwakeupprivate.h
+++ b/aravis/arvwakeupprivate.h
@@ -21,7 +21,7 @@
 #ifndef ARV_WAKEUP_PRIVATE_H
 #define ARV_WAKEUP_PRIVATE_H
 
-#include <arvtypes.h>
+#include <aravis/arvtypes.h>
 
 typedef struct _ArvWakeup ArvWakeup;
 
diff --git a/src/arvxmlschema.c b/aravis/arvxmlschema.c
similarity index 98%
rename from src/arvxmlschema.c
rename to aravis/arvxmlschema.c
index ec6fe85cf..4c7ff50b7 100644
--- a/src/arvxmlschema.c
+++ b/aravis/arvxmlschema.c
@@ -26,14 +26,14 @@
  * @short_description: XML Schema storage
  */
 
-#include <arvxmlschema.h>
+#include "arvxmlschema.h"
 #include <libxml/parser.h>
 #include <libxml/valid.h>
 #include <libxml/xmlschemas.h>
 #include <libxml/xmlversion.h>
 #include <gio/gio.h>
-#include <arvdebugprivate.h>
-#include <arvmiscprivate.h>
+#include "arvdebugprivate.h"
+#include "arvmiscprivate.h"
 
 typedef struct {
 	char *xsd;
diff --git a/src/arvxmlschema.h b/aravis/arvxmlschema.h
similarity index 97%
rename from src/arvxmlschema.h
rename to aravis/arvxmlschema.h
index cdff84b2b..bcb2c1e0d 100644
--- a/src/arvxmlschema.h
+++ b/aravis/arvxmlschema.h
@@ -28,8 +28,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
diff --git a/src/arvzip.c b/aravis/arvzip.c
similarity index 99%
rename from src/arvzip.c
rename to aravis/arvzip.c
index d67a33465..a22970470 100644
--- a/src/arvzip.c
+++ b/aravis/arvzip.c
@@ -30,8 +30,8 @@
  * @short_description: A simple zip extractor
  */
 
-#include <arvzip.h>
-#include <arvdebugprivate.h>
+#include "arvzip.h"
+#include "arvdebugprivate.h"
 #include <string.h>
 #include <zlib.h>
 
diff --git a/src/arvzip.h b/aravis/arvzip.h
similarity index 98%
rename from src/arvzip.h
rename to aravis/arvzip.h
index 2a5e589f7..53c4bec7c 100644
--- a/src/arvzip.h
+++ b/aravis/arvzip.h
@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/gentl/README.md b/aravis/gentl/README.md
similarity index 100%
rename from src/gentl/README.md
rename to aravis/gentl/README.md
diff --git a/src/gentl/TODO.md b/aravis/gentl/TODO.md
similarity index 100%
rename from src/gentl/TODO.md
rename to aravis/gentl/TODO.md
diff --git a/src/gentl/dev.c b/aravis/gentl/dev.c
similarity index 98%
rename from src/gentl/dev.c
rename to aravis/gentl/dev.c
index c69778e87..b28f53718 100644
--- a/src/gentl/dev.c
+++ b/aravis/gentl/dev.c
@@ -20,8 +20,8 @@
  * Authors: Václav Šmilauer <eu@doxos.eu>
  */
 
-#include"private.h"
-#include<arvcamera.h>
+#include "private.h"
+#include "../arvcamera.h"
 
 /*
 GenTL's Device is Aravis' Camera. GenTL's Device port is Aravis' Device.
diff --git a/src/gentl/ds.c b/aravis/gentl/ds.c
similarity index 100%
rename from src/gentl/ds.c
rename to aravis/gentl/ds.c
diff --git a/src/gentl/event.c b/aravis/gentl/event.c
similarity index 100%
rename from src/gentl/event.c
rename to aravis/gentl/event.c
diff --git a/src/gentl/gc.c b/aravis/gentl/gc.c
similarity index 99%
rename from src/gentl/gc.c
rename to aravis/gentl/gc.c
index b60703de5..8fe6d6e89 100644
--- a/src/gentl/gc.c
+++ b/aravis/gentl/gc.c
@@ -20,14 +20,14 @@
  * Authors: Václav Šmilauer <eu@doxos.eu>
  */
 
-#include"private.h"
+#include "private.h"
 
-#include<stdio.h>
-#include<string.h>
+#include <stdio.h>
+#include <string.h>
 
-#include<arv.h>
-#include<arvgvcpprivate.h>
-#include<arvmiscprivate.h>
+#include "../arv.h"
+#include "../arvgvcpprivate.h"
+#include "../arvmiscprivate.h"
 
 /* minimal validating GenICam description used for System and Interface modules respectively */
 
diff --git a/src/gentl/if.c b/aravis/gentl/if.c
similarity index 99%
rename from src/gentl/if.c
rename to aravis/gentl/if.c
index 5b36d913f..ce3a35b88 100644
--- a/src/gentl/if.c
+++ b/aravis/gentl/if.c
@@ -21,8 +21,8 @@
  */
 
 #include "private.h"
-#include <arvinterface.h>
-#include <arvcamera.h>
+#include "../arvinterface.h"
+#include "../arvcamera.h"
 
 #define _IF_CHECK_HANDLE GENTL_ENSURE_INIT; if(hIface==NULL || !(ARV_IS_INTERFACE(hIface))) return GC_ERR_INVALID_HANDLE;
 
diff --git a/src/gentl/meson.build b/aravis/gentl/meson.build
similarity index 100%
rename from src/gentl/meson.build
rename to aravis/gentl/meson.build
diff --git a/src/gentl/private-buf.c b/aravis/gentl/private-buf.c
similarity index 100%
rename from src/gentl/private-buf.c
rename to aravis/gentl/private-buf.c
diff --git a/src/gentl/private.c b/aravis/gentl/private.c
similarity index 100%
rename from src/gentl/private.c
rename to aravis/gentl/private.c
diff --git a/src/gentl/private.h b/aravis/gentl/private.h
similarity index 98%
rename from src/gentl/private.h
rename to aravis/gentl/private.h
index 0d61cf564..7cc41cd62 100644
--- a/src/gentl/private.h
+++ b/aravis/gentl/private.h
@@ -23,13 +23,13 @@
 #ifndef ARV_GENTL_PRIVATE_H
 #define ARV_GENTL_PRIVATE_H
 
-#include <arvgentlprivate.h>
+#include "../arvgentlprivate.h"
 #include <glib-object.h>
 
 /*
 logging macros
 */
-#include <arvdebugprivate.h>
+#include "..//arvdebugprivate.h"
 
 /*
 Routine for copying anything into buffer. Implementation in private-buf.c
diff --git a/src/gentl/tl.c b/aravis/gentl/tl.c
similarity index 98%
rename from src/gentl/tl.c
rename to aravis/gentl/tl.c
index 549faea84..ce52c8364 100644
--- a/src/gentl/tl.c
+++ b/aravis/gentl/tl.c
@@ -20,10 +20,10 @@
  * Authors: Václav Šmilauer <eu@doxos.eu>
  */
 
-#include"private.h"
+#include "private.h"
 
-#include<arvsystem.h>
-#include<arvinterface.h>
+#include "../arvsystem.h"
+#include "../arvinterface.h"
 
 #define _TL_CHECK_HANDLE { GENTL_ENSURE_INIT; if(hTL==NULL || !ARV_IS_TRANSPORT_LAYER(hTL)) return GC_ERR_INVALID_HANDLE; if(gentl_transport_layer==NULL) return GC_ERR_NOT_INITIALIZED; }
 
diff --git a/src/meson.build b/aravis/meson.build
similarity index 81%
rename from src/meson.build
rename to aravis/meson.build
index f8a298dd3..5a933017c 100644
--- a/src/meson.build
+++ b/aravis/meson.build
@@ -1,4 +1,44 @@
-library_sources = [
+api_config_data = configuration_data ()
+api_config_data.set ('ARV_API', cc_export_define)
+arvapi_h = configure_file (
+  input: 'arvapi.h.in',
+  output: 'arvapi.h',
+  configuration: api_config_data
+)
+
+version_config_data = configuration_data ()
+version_config_data.set ('ARAVIS_VERSION', aravis_version)
+version_config_data.set ('ARAVIS_API_VERSION', aravis_api_version)
+version_config_data.set ('ARAVIS_MAJOR_VERSION', aravis_major_version)
+version_config_data.set ('ARAVIS_MINOR_VERSION', aravis_minor_version)
+version_config_data.set ('ARAVIS_MICRO_VERSION', aravis_micro_version)
+arvversion_h = configure_file (
+  input: 'arvversion.h.in',
+  output: 'arvversion.h',
+  configuration: version_config_data
+)
+
+features_library_config_data = configuration_data ()
+features_library_config_data.set10 ('ARAVIS_HAS_USB', usb_dep.found())
+features_library_config_data.set10 ('ARAVIS_HAS_EVENT', get_option('event'))
+features_library_config_data.set10 ('ARAVIS_HAS_V4L2', v4l2_enabled)
+features_library_config_data.set10 ('ARAVIS_HAS_PACKET_SOCKET', packet_socket_enabled)
+features_library_config_data.set10 ('ARAVIS_HAS_FAST_HEARTBEAT', get_option ('fast-heartbeat'))
+arvfeatures_h = configure_file (
+  input: 'arvfeatures.h.in',
+  output: 'arvfeatures.h',
+  configuration: features_library_config_data
+)
+
+params_library_config_data = configuration_data ()
+params_library_config_data.set ('ARV_GV_STREAM_NUM_BUFFERS', get_option ('gv-n-buffers'))
+arvparamsprivate_h = configure_file (
+  input: 'arvparamsprivate.h.in',
+  output: 'arvparamsprivate.h',
+  configuration: params_library_config_data
+)
+
+library_sources = files (
 	'arvenums.c',
 	'arvdebug.c',
 	'arvsystem.c',
@@ -71,9 +111,9 @@ library_sources = [
 	'arvgvfakecamera.c',
 	'arvrealtime.c',
 	'arvxmlschema.c'
-]
+)
 
-library_no_introspection_sources = [
+library_no_introspection_sources = files (
 	'arvmisc.c',
 	'arvnetwork.c',
 	'arvzip.c',
@@ -81,10 +121,13 @@ library_no_introspection_sources = [
 	'arvgvcp.c',
 	'arvgvsp.c',
 	'arvwakeup.c'
-]
+)
+
+library_main_header = files (
+  'arv.h'
+)
 
-library_headers = [
-	'arv.h',
+library_headers = files (
 	'arvtypes.h',
 
 	'arvbuffer.h',
@@ -167,9 +210,10 @@ library_headers = [
 	'arvrealtime.h',
 	'arvstream.h',
 	'arvxmlschema.h'
-]
+)
+library_headers += arvapi_h
 
-library_private_headers = [
+library_private_headers = files (
 	'arvbufferprivate.h',
 	'arvchunkparserprivate.h',
 	'arvdebugprivate.h',
@@ -199,111 +243,84 @@ library_private_headers = [
 	'arvrealtimeprivate.h',
 	'arvstreamprivate.h',
 	'arvwakeupprivate.h'
-]
+)
+library_private_headers += arvparamsprivate_h
 
-library_no_introspection_headers = [
+library_no_introspection_headers = files (
 	'arvmisc.h',
 	'arvzip.h',
 	'arvstr.h'
-]
+)
+library_no_introspection_headers += arvversion_h
+library_no_introspection_headers += arvfeatures_h
 
 if usb_dep.found()
-	library_sources += [
+	library_sources += files (
 		'arvuvinterface.c',
 		'arvuvdevice.c',
 		'arvuvstream.c'
-	]
-	library_no_introspection_sources += [
+	)
+	library_no_introspection_sources += files (
 		'arvuvcp.c',
 		'arvuvsp.c'
-	]
-	library_headers += [
+	)
+	library_headers += files (
 		'arvuvinterface.h',
 		'arvuvdevice.h',
 		'arvuvstream.h'
-	]
-	library_private_headers += [
+	)
+	library_private_headers += files (
 		'arvuvcpprivate.h',
 		'arvuvdeviceprivate.h',
 		'arvuvinterfaceprivate.h',
 		'arvuvstreamprivate.h',
 		'arvuvspprivate.h'
-		]
+	)
 endif
 
 if v4l2_enabled
-  library_sources += [
+  library_sources += files (
     'arvv4l2interface.c',
     'arvv4l2device.c',
     'arvv4l2stream.c',
     'arvv4l2misc.c',
-  ]
-  library_no_introspection_sources += [
-  ]
-  library_headers += [
+  )
+  library_headers += files (
     'arvv4l2interface.h',
     'arvv4l2device.h',
     'arvv4l2stream.h',
-  ]
-  library_private_headers += [
+  )
+  library_private_headers += files (
     'arvv4l2deviceprivate.h',
     'arvv4l2interfaceprivate.h',
     'arvv4l2streamprivate.h',
     'arvv4l2miscprivate.h',
-  ]
+  )
 endif
 
-library_enums = gnome.mkenums_simple ('arvenumtypes', decorator: 'ARV_API', header_prefix: '#include <arvapi.h>',
-				      sources: library_headers + library_no_introspection_headers)
+library_enums = gnome.mkenums_simple ('arvenumtypes', decorator: 'ARV_API', header_prefix: '#include <aravis/arvapi.h>',
+				      sources: library_main_header + library_headers + library_no_introspection_headers)
 library_private_enums = gnome.mkenums_simple ('arvenumtypesprivate', sources: library_private_headers)
 library_resources = gnome.compile_resources('arvresources','arvresources.xml')
 
 library_include_dir = get_option ('includedir') / 'aravis-@0@'.format (aravis_api_version)
 
-api_config_data = configuration_data ()
-api_config_data.set ('ARV_API', cc_export_define)
-configure_file (input: 'arvapi.h.in', output: 'arvapi.h',
-		configuration: api_config_data, install_dir: library_include_dir)
-
-features_library_config_data = configuration_data ()
-features_library_config_data.set10 ('ARAVIS_HAS_USB', usb_dep.found())
-features_library_config_data.set10 ('ARAVIS_HAS_EVENT', get_option('event'))
-features_library_config_data.set10 ('ARAVIS_HAS_V4L2', v4l2_enabled)
-features_library_config_data.set10 ('ARAVIS_HAS_PACKET_SOCKET', packet_socket_enabled)
-features_library_config_data.set10 ('ARAVIS_HAS_FAST_HEARTBEAT', get_option ('fast-heartbeat'))
-configure_file (input: 'arvfeatures.h.in', output: 'arvfeatures.h',
-		configuration: features_library_config_data, install_dir: library_include_dir)
-
-params_library_config_data = configuration_data ()
-params_library_config_data.set ('ARV_GV_STREAM_NUM_BUFFERS', get_option ('gv-n-buffers'))
-configure_file (input: 'arvparamsprivate.h.in', output: 'arvparamsprivate.h',
-		configuration: params_library_config_data)
-
-version_config_data = configuration_data ()
-version_config_data.set ('ARAVIS_VERSION', aravis_version)
-version_config_data.set ('ARAVIS_API_VERSION', aravis_api_version)
-version_config_data.set ('ARAVIS_MAJOR_VERSION', aravis_major_version)
-version_config_data.set ('ARAVIS_MINOR_VERSION', aravis_minor_version)
-version_config_data.set ('ARAVIS_MICRO_VERSION', aravis_micro_version)
-configure_file (input: 'arvversion.h.in', output: 'arvversion.h',
-		configuration: version_config_data, install_dir: library_include_dir)
-
-library_inc = include_directories ('.')
+library_inc = include_directories (['../', '.'])
 
-install_headers (library_headers + library_no_introspection_headers, install_dir: library_include_dir)
+install_headers (library_main_header, install_dir: library_include_dir)
+install_headers (library_headers + library_no_introspection_headers, install_dir: library_include_dir / 'aravis')
 
-library_c_args = [
-	'-DARAVIS_COMPILATION'
-	]
+library_c_args = [ '-DARAVIS_COMPILATION' ]
 
 aravis_library = library ('aravis-@0@'.format (aravis_api_version),
-	library_sources, library_headers,
+	library_sources, library_main_header, library_headers,
 	library_no_introspection_sources, library_no_introspection_headers, library_private_headers,
 	library_enums, library_private_enums,
 	library_resources,
 	version: aravis_version,
 	soversion: '0',
 	dependencies: aravis_dependencies,
+        include_directories: library_inc,
 	c_args: library_c_args,
 	install: true)
 
@@ -332,7 +349,7 @@ foreach p: progs
 		p[1],
 		link_with: aravis_library,
 		c_args: library_c_args,
-		dependencies: aravis_dependencies,
+		dependencies: aravis_library_dependencies,
 		install: true)
 endforeach
 
@@ -344,7 +361,7 @@ if introspection_option.auto() or introspection_option.enabled()
 
   if gir_scanner.found() and gi_dep.found()
     aravis_gir = gnome.generate_gir(aravis_library,
-      sources : [library_sources, library_headers, library_enums],
+      sources : [library_sources, library_main_header, library_headers, library_enums],
       nsversion : aravis_api_version,
       namespace : 'Aravis',
       symbol_prefix : 'arv_',
@@ -352,7 +369,7 @@ if introspection_option.auto() or introspection_option.enabled()
       header: 'arv.h',
       export_packages : 'aravis-@0@'.format(aravis_api_version),
       includes : ['GObject-2.0', 'Gio-2.0'],
-      extra_args: '-DARAVIS_COMPILATION',
+      extra_args: ['-DARAVIS_COMPILATION'],
       install : true)
     introspection_enabled = true
   endif
diff --git a/meson.build b/meson.build
index 24f9ef01b..c5fb2873f 100644
--- a/meson.build
+++ b/meson.build
@@ -118,7 +118,7 @@ else # not Linux
 	packet_socket_enabled = false
 endif
 
-subdir ('src')
+subdir ('aravis')
 subdir ('tests')
 
 viewer_enabled = false
diff --git a/scripts/change-c-includes.sh b/scripts/change-c-includes.sh
new file mode 100755
index 000000000..568174c35
--- /dev/null
+++ b/scripts/change-c-includes.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for file in "$@"; do
+    sed -i -E \
+        's/^([[:space:]]*#[[:space:]]*include[[:space:]]+)<(arv[^>]+\.h)>/\1"\2"/' \
+        "$file"
+done
diff --git a/scripts/change-header-includes.sh b/scripts/change-header-includes.sh
new file mode 100755
index 000000000..3e31044bc
--- /dev/null
+++ b/scripts/change-header-includes.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for file in "$@"; do
+    sed -i -E \
+        's/^([[:space:]]*#[[:space:]]*include[[:space:]]+)<(arv[^>]+\.h)>/\1<aravis\/\2>/' \
+        "$file"
+done
diff --git a/src/arv.h b/src/arv.h
deleted file mode 100644
index 3924f7ec4..000000000
--- a/src/arv.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Aravis - Digital camera library
- *
- * Copyright © 2009-2025 Emmanuel Pacaud <emmanuel.pacaud@free.fr>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
- */
-
-#ifndef ARV_H
-#define ARV_H
-
-#define ARV_H_INSIDE
-
-#include <arvtypes.h>
-
-#include <arvbuffer.h>
-#include <arvcamera.h>
-#include <arvchunkparser.h>
-#include <arvdebug.h>
-#include <arvdevice.h>
-
-#include <arvdomcharacterdata.h>
-#include <arvdomdocumentfragment.h>
-#include <arvdomdocument.h>
-#include <arvdomelement.h>
-#include <arvdomimplementation.h>
-#include <arvdomnamednodemap.h>
-#include <arvdomnode.h>
-#include <arvdomnodelist.h>
-#include <arvdomnodechildlist.h>
-#include <arvdomparser.h>
-#include <arvdomtext.h>
-
-#include <arvenums.h>
-#include <arvevaluator.h>
-
-#include <arvfakecamera.h>
-#include <arvfakedevice.h>
-#include <arvfakeinterface.h>
-#include <arvfakestream.h>
-
-#include <arvfeatures.h>
-
-#include <arvgc.h>
-#include <arvgcboolean.h>
-#include <arvgccategory.h>
-#include <arvgccommand.h>
-#include <arvgcconverter.h>
-#include <arvgcconverternode.h>
-#include <arvgcenumentry.h>
-#include <arvgcenumeration.h>
-#include <arvgcenums.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcfloat.h>
-#include <arvgcfloatnode.h>
-#include <arvgcfloatregnode.h>
-#include <arvgcgroupnode.h>
-#include <arvgcindexnode.h>
-#include <arvgcintconverternode.h>
-#include <arvgcinteger.h>
-#include <arvgcintegernode.h>
-#include <arvgcintregnode.h>
-#include <arvgcintswissknifenode.h>
-#include <arvgcinvalidatornode.h>
-#include <arvgcnode.h>
-#include <arvgcmaskedintregnode.h>
-#include <arvgcport.h>
-#include <arvgcpropertynode.h>
-#include <arvgcregisterdescriptionnode.h>
-#include <arvgcregister.h>
-#include <arvgcregisternode.h>
-#include <arvgcselector.h>
-#include <arvgcstring.h>
-#include <arvgcstringnode.h>
-#include <arvgcstringregnode.h>
-#include <arvgcstructregnode.h>
-#include <arvgcstructentrynode.h>
-#include <arvgcswissknife.h>
-#include <arvgcswissknifenode.h>
-#include <arvgcvalueindexednode.h>
-
-#include <arvgvdevice.h>
-#include <arvgvfakecamera.h>
-#include <arvgvinterface.h>
-#include <arvgvstream.h>
-
-#include <arvgentlsystem.h>
-#include <arvgentlinterface.h>
-#include <arvgentldevice.h>
-#include <arvgentlstream.h>
-
-#include <arvinterface.h>
-#include <arvmisc.h>
-#include <arvnetwork.h>
-#include <arvrealtime.h>
-#include <arvstream.h>
-#include <arvstr.h>
-#include <arvsystem.h>
-
-#if ARAVIS_HAS_USB
-#include <arvuvinterface.h>
-#include <arvuvdevice.h>
-#include <arvuvstream.h>
-#endif
-
-#if ARAVIS_HAS_V4L2
-#include <arvv4l2interface.h>
-#include <arvv4l2device.h>
-#include <arvv4l2stream.h>
-#endif
-
-#include <arvversion.h>
-#include <arvzip.h>
-#include <arvxmlschema.h>
-
-#undef ARV_H_INSIDE
-
-#endif
diff --git a/tests/arvdevicetest.c b/tests/arvdevicetest.c
index e36fb2172..2f9fd7284 100644
--- a/tests/arvdevicetest.c
+++ b/tests/arvdevicetest.c
@@ -3,8 +3,8 @@
 #include <arv.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "../src/arvgvspprivate.h"
-#include "../src/arvgvcpprivate.h"
+#include "arvgvspprivate.h"
+#include "arvgvcpprivate.h"
 
 static gboolean cancel = FALSE;
 
diff --git a/tests/arvnetworktest.c b/tests/arvnetworktest.c
index a8527c2a9..92184cfc0 100644
--- a/tests/arvnetworktest.c
+++ b/tests/arvnetworktest.c
@@ -3,7 +3,7 @@
 #include <arv.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "../src/arvnetworkprivate.h"
+#include "arvnetworkprivate.h"
 
 #define _ALEN 16
 #define _ALENS "16"
diff --git a/tests/meson.build b/tests/meson.build
index 4cd3aaaa7..67bb72ee8 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -24,25 +24,25 @@ if get_option('tests')
 		['genicam',	['main'],
                 ['-DGENICAM_FILENAME="@0@/tests/data/genicam.xml"'.format (meson.project_source_root ())]],
 		['fake',	['main'],
-                ['-DGENICAM_FILENAME="@0@/src/arv-fake-camera.xml"'.format (meson.project_source_root ())]],
+                ['-DGENICAM_FILENAME="@0@/aravis/arv-fake-camera.xml"'.format (meson.project_source_root ())]],
 		['fakegv',	['network'],
-                ['-DGENICAM_FILENAME="@0@/src/arv-fake-camera.xml"'.format (meson.project_source_root ())]]
+                ['-DGENICAM_FILENAME="@0@/aravis/arv-fake-camera.xml"'.format (meson.project_source_root ())]]
 	]
 
 	foreach t: tests
 		exe = executable (t[0], '@0@.c'.format (t[0]),
 				  c_args: [t[2]],
 				  link_with: aravis_library,
-				  dependencies: aravis_dependencies,
+				  dependencies: aravis_library_dependencies,
 				  include_directories: [library_inc])
 		test (t[0], exe, suite: t[1], timeout: 60)
 	endforeach
 
         py_script_config_data = configuration_data ()
-        py_script_config_data.set ('GI_TYPELIB_PATH', meson.project_build_root() / 'src')
-        py_script_config_data.set ('LD_LIBRARY_PATH', meson.project_build_root() / 'src')
+        py_script_config_data.set ('GI_TYPELIB_PATH', meson.project_build_root() / 'aravis')
+        py_script_config_data.set ('LD_LIBRARY_PATH', meson.project_build_root() / 'aravis')
         py_script_config_data.set ('GST_PLUGIN_PATH', meson.project_build_root() / 'gst')
-        py_script_config_data.set ('FAKE_GENICAM_PATH', meson.project_source_root() / 'src' / 'arv-fake-camera.xml')
+        py_script_config_data.set ('FAKE_GENICAM_PATH', meson.project_source_root() / 'aravis' / 'arv-fake-camera.xml')
         py_script_config_data.set ('ARV_PRODUCER_PATH', get_option('gentl-producer') ? gentl_producer_library.full_path() : '')
 
         configure_file (input: 'pylaunch.in', output: 'pylaunch', configuration: py_script_config_data)
@@ -63,9 +63,9 @@ if get_option('tests')
 			]
 
 			environment = [
-				'GI_TYPELIB_PATH=' + meson.project_build_root() / 'src',
-				'LD_LIBRARY_PATH=' + meson.project_build_root() / 'src',
-				'FAKE_GENICAM_PATH=' + meson.project_source_root() / 'src' / 'arv-fake-camera.xml'
+				'GI_TYPELIB_PATH=' + meson.project_build_root() / 'aravis',
+				'LD_LIBRARY_PATH=' + meson.project_build_root() / 'aravis',
+				'FAKE_GENICAM_PATH=' + meson.project_source_root() / 'aravis' / 'arv-fake-camera.xml'
 			]
 
 			foreach t: python_tests
@@ -107,7 +107,7 @@ if get_option('tests')
 	foreach example: examples
 		executable (example[0], example[1],
 			link_with: aravis_library,
-			dependencies: aravis_dependencies,
+			dependencies: aravis_library_dependencies,
 			include_directories: [library_inc])
 	endforeach
 
diff --git a/tests/misc.c b/tests/misc.c
index 8007ce106..9c697bf42 100644
--- a/tests/misc.c
+++ b/tests/misc.c
@@ -4,7 +4,7 @@
 #include <arv.h>
 #include <arvstr.h>
 #include <string.h>
-#include "../src/arvmiscprivate.h"
+#include "arvmiscprivate.h"
 
 #if !ARAVIS_CHECK_VERSION (ARAVIS_MAJOR_VERSION, ARAVIS_MINOR_VERSION, ARAVIS_MICRO_VERSION)
 #error