Renamed 'doc' to 'docs'.

Moved Doxygen files to docs/.
Removed cJSON directory.
Moved libraries into lib/.
Renamed 'config' to 'm4'.
Renamed 'dyn' library to 'config'.

.gitignore

@@ -42,5 +42,5 @@ debian/icinga2.postrm.debhelper
 debian/icinga2.substvars
 debian/icinga2
 compat/include
-doc
+docs/dev
 Doxyfile

Makefile.am

@@ -5,11 +5,7 @@ include aminclude.am
 
 SUBDIRS = \
 	third-party \
-	base \
+	lib \
-	dyn \
-	jsonrpc \
-	icinga \
-	cib \
 	components \
 	icinga-app \
 	test

autogen.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I config"
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.

cJSON/cJSON.vcxproj.filters

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="cJSON.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="cJSON.h" />
-  </ItemGroup>
-</Project>

components/checker/Makefile.am

@@ -10,11 +10,11 @@ checker_la_SOURCES = \
 
 checker_la_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/base \
+	-I${top_srcdir}/lib/base \
-	-I${top_srcdir}/dyn \
+	-I${top_srcdir}/lib/config \
-	-I${top_srcdir}/jsonrpc \
+	-I${top_srcdir}/lib/jsonrpc \
-	-I${top_srcdir}/icinga \
+	-I${top_srcdir}/lib/icinga \
-	-I${top_srcdir}/cib
+	-I${top_srcdir}/lib/cib
 
 checker_la_LDFLAGS = \
 	$(BOOST_LDFLAGS) \
@@ -26,8 +26,8 @@ checker_la_LDFLAGS = \
 checker_la_LIBADD = \
 	$(BOOST_SIGNALS_LIB) \
 	$(BOOST_THREAD_LIB) \
-	${top_builddir}/base/libbase.la \
+	${top_builddir}/lib/base/libbase.la \
-	${top_builddir}/dyn/libdyn.la \
+	${top_builddir}/lib/config/libconfig.la \
-	${top_builddir}/jsonrpc/libjsonrpc.la \
+	${top_builddir}/lib/jsonrpc/libjsonrpc.la \
-	${top_builddir}/icinga/libicinga.la \
+	${top_builddir}/lib/icinga/libicinga.la \
-	${top_builddir}/cib/libcib.la
+	${top_builddir}/lib/cib/libcib.la

components/checker/checker.vcxproj

@@ -40,12 +40,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\config;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\config;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -76,7 +76,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -89,4 +89,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

components/cibsync/Makefile.am

@@ -10,11 +10,11 @@ cibsync_la_SOURCES = \
 
 cibsync_la_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/base \
+	-I${top_srcdir}/lib/base \
-	-I${top_srcdir}/dyn \
+	-I${top_srcdir}/lib/config \
-	-I${top_srcdir}/jsonrpc \
+	-I${top_srcdir}/lib/jsonrpc \
-	-I${top_srcdir}/icinga \
+	-I${top_srcdir}/lib/icinga \
-	-I${top_srcdir}/cib
+	-I${top_srcdir}/lib/cib
 
 cibsync_la_LDFLAGS = \
 	$(BOOST_LDFLAGS) \
@@ -26,8 +26,8 @@ cibsync_la_LDFLAGS = \
 cibsync_la_LIBADD = \
 	$(BOOST_SIGNALS_LIB) \
 	$(BOOST_THREAD_LIB) \
-	${top_builddir}/base/libbase.la \
+	${top_builddir}/lib/base/libbase.la \
-	${top_builddir}/dyn/libdyn.la \
+	${top_builddir}/lib/config/libconfig.la \
-	${top_builddir}/jsonrpc/libjsonrpc.la \
+	${top_builddir}/lib/jsonrpc/libjsonrpc.la \
-	${top_builddir}/icinga/libicinga.la \
+	${top_builddir}/lib/icinga/libicinga.la \
-	${top_builddir}/cib/libcib.la
+	${top_builddir}/lib/cib/libcib.la

components/cibsync/cibsync.vcxproj

@@ -39,12 +39,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\config;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\config;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -57,7 +57,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -74,7 +74,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -87,4 +87,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

components/compat/Makefile.am

@@ -10,11 +10,11 @@ compat_la_SOURCES = \
 
 compat_la_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/base \
+	-I${top_srcdir}/lib/base \
-	-I${top_srcdir}/dyn \
+	-I${top_srcdir}/lib/config \
-	-I${top_srcdir}/jsonrpc \
+	-I${top_srcdir}/lib/jsonrpc \
-	-I${top_srcdir}/icinga \
+	-I${top_srcdir}/lib/icinga \
-	-I${top_srcdir}/cib
+	-I${top_srcdir}/lib/cib
 
 compat_la_LDFLAGS = \
 	$(BOOST_LDFLAGS) \
@@ -26,8 +26,8 @@ compat_la_LDFLAGS = \
 compat_la_LIBADD = \
 	$(BOOST_SIGNALS_LIB) \
 	$(BOOST_THREAD_LIB) \
-	${top_builddir}/base/libbase.la \
+	${top_builddir}/lib/base/libbase.la \
-	${top_builddir}/dyn/libdyn.la \
+	${top_builddir}/lib/config/libconfig.la \
-	${top_builddir}/jsonrpc/libjsonrpc.la \
+	${top_builddir}/lib/jsonrpc/libjsonrpc.la \
-	${top_builddir}/icinga/libicinga.la \
+	${top_builddir}/lib/icinga/libicinga.la \
-	${top_builddir}/cib/libcib.la
+	${top_builddir}/lib/cib/libcib.la

components/convenience/Makefile.am

@@ -10,11 +10,11 @@ convenience_la_SOURCES = \
 
 convenience_la_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/base \
+	-I${top_srcdir}/lib/base \
-	-I${top_srcdir}/dyn \
+	-I${top_srcdir}/lib/config \
-	-I${top_srcdir}/jsonrpc \
+	-I${top_srcdir}/lib/jsonrpc \
-	-I${top_srcdir}/icinga \
+	-I${top_srcdir}/lib/icinga \
-	-I${top_srcdir}/cib
+	-I${top_srcdir}/lib/cib
 
 convenience_la_LDFLAGS = \
 	$(BOOST_LDFLAGS) \
@@ -26,8 +26,8 @@ convenience_la_LDFLAGS = \
 convenience_la_LIBADD = \
 	$(BOOST_SIGNALS_LIB) \
 	$(BOOST_THREAD_LIB) \
-	${top_builddir}/base/libbase.la \
+	${top_builddir}/lib/base/libbase.la \
-	${top_builddir}/dyn/libdyn.la \
+	${top_builddir}/lib/config/libconfig.la \
-	${top_builddir}/jsonrpc/libjsonrpc.la \
+	${top_builddir}/lib/jsonrpc/libjsonrpc.la \
-	${top_builddir}/icinga/libicinga.la \
+	${top_builddir}/lib/icinga/libicinga.la \
-	${top_builddir}/cib/libcib.la
+	${top_builddir}/lib/cib/libcib.la

components/convenience/i2-convenience.h

@@ -29,7 +29,7 @@
  */
 
 #include <i2-base.h>
-#include <i2-dyn.h>
+#include <i2-config.h>
 #include <i2-jsonrpc.h>
 #include <i2-icinga.h>
 #include <i2-cib.h>

components/delegation/Makefile.am

@@ -10,11 +10,11 @@ delegation_la_SOURCES = \
 
 delegation_la_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/base \
+	-I${top_srcdir}/lib/base \
-	-I${top_srcdir}/dyn \
+	-I${top_srcdir}/lib/config \
-	-I${top_srcdir}/jsonrpc \
+	-I${top_srcdir}/lib/jsonrpc \
-	-I${top_srcdir}/icinga \
+	-I${top_srcdir}/lib/icinga \
-	-I${top_srcdir}/cib
+	-I${top_srcdir}/lib/cib
 
 delegation_la_LDFLAGS = \
 	$(BOOST_LDFLAGS) \
@@ -26,8 +26,8 @@ delegation_la_LDFLAGS = \
 delegation_la_LIBADD = \
 	$(BOOST_SIGNALS_LIB) \
 	$(BOOST_THREAD_LIB) \
-	${top_builddir}/base/libbase.la \
+	${top_builddir}/lib/base/libbase.la \
-	${top_builddir}/dyn/libdyn.la \
+	${top_builddir}/lib/config/libconfig.la \
-	${top_builddir}/jsonrpc/libjsonrpc.la \
+	${top_builddir}/lib/jsonrpc/libjsonrpc.la \
-	${top_builddir}/icinga/libicinga.la \
+	${top_builddir}/lib/icinga/libicinga.la \
-	${top_builddir}/cib/libcib.la
+	${top_builddir}/lib/cib/libcib.la

components/demo/Makefile.am

@@ -10,10 +10,10 @@ demo_la_SOURCES = \
 
 demo_la_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/base \
+	-I${top_srcdir}/lib/base \
-	-I${top_srcdir}/dyn \
+	-I${top_srcdir}/lib/config \
-	-I${top_srcdir}/jsonrpc \
+	-I${top_srcdir}/lib/jsonrpc \
-	-I${top_srcdir}/icinga
+	-I${top_srcdir}/lib/icinga
 
 demo_la_LDFLAGS = \
 	$(BOOST_LDFLAGS) \
@@ -25,7 +25,7 @@ demo_la_LDFLAGS = \
 demo_la_LIBADD = \
 	$(BOOST_SIGNALS_LIB) \
 	$(BOOST_THREAD_LIB) \
-	${top_builddir}/base/libbase.la \
+	${top_builddir}/lib/base/libbase.la \
-	${top_builddir}/dyn/libdyn.la \
+	${top_builddir}/lib/config/libconfig.la \
-	${top_builddir}/jsonrpc/libjsonrpc.la \
+	${top_builddir}/lib/jsonrpc/libjsonrpc.la \
-	${top_builddir}/icinga/libicinga.la
+	${top_builddir}/lib/icinga/libicinga.la

configure.ac

@@ -21,7 +21,7 @@ AC_INIT
 AX_SPEC_FILE([icinga2.spec])
 AX_SPEC_DEFAULTS
 AX_SET_VERSION_INFO
-AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_AUX_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
@@ -44,7 +44,7 @@ DX_RTF_FEATURE(OFF)
 DX_XML_FEATURE(OFF)
 DX_PDF_FEATURE(OFF)
 DX_PS_FEATURE(OFF)
-DX_INIT_DOXYGEN([icinga], [Doxyfile], [doc])
+DX_INIT_DOXYGEN([icinga], [docs/Doxyfile], [docs/dev])
 
 AC_PROG_INSTALL
 AM_PROG_LEX
@@ -67,8 +67,6 @@ AC_CHECK_LIB(shlwapi, PathRemoveFileSpecA)
 
 AC_CONFIG_FILES([
 Makefile
-base/Makefile
-cib/Makefile
 components/Makefile
 components/checker/Makefile
 components/cibsync/Makefile
@@ -76,16 +74,19 @@ components/compat/Makefile
 components/convenience/Makefile
 components/delegation/Makefile
 components/demo/Makefile
-dyn/Makefile
+docs/Doxyfile
-icinga/Makefile
 icinga-app/Makefile
-jsonrpc/Makefile
+lib/Makefile
+lib/base/Makefile
+lib/cib/Makefile
+lib/config/Makefile
+lib/icinga/Makefile
+lib/jsonrpc/Makefile
 test/Makefile
 third-party/Makefile
 third-party/cJSON/Makefile
 third-party/mmatch/Makefile
 third-party/popen-noshell/Makefile
-Doxyfile
 ])
 AC_OUTPUT
 

icinga-app/Makefile.am

@@ -11,10 +11,10 @@ icinga_CPPFLAGS = \
 	-DI2_ICINGALAUNCHER_BUILD \
 	$(LTDLINCL) \
 	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/base \
+	-I${top_srcdir}/lib/base \
-	-I${top_srcdir}/dyn \
+	-I${top_srcdir}/lib/config \
-	-I${top_srcdir}/jsonrpc \
+	-I${top_srcdir}/lib/jsonrpc \
-	-I${top_srcdir}/icinga \
+	-I${top_srcdir}/lib/icinga \
 	-I${top_srcdir}
 
 icinga_LDFLAGS = \
@@ -25,9 +25,9 @@ icinga_LDADD = \
 	$(BOOST_SIGNALS_LIB) \
 	$(BOOST_THREAD_LIB) \
 	$(BOOST_SYSTEM_LIB) \
-	${top_builddir}/base/libbase.la \
+	${top_builddir}/lib/base/libbase.la \
-	${top_builddir}/dyn/libdyn.la \
+	${top_builddir}/lib/config/libconfig.la \
-	${top_builddir}/icinga/libicinga.la \
+	${top_builddir}/lib/icinga/libicinga.la \
 	-dlopen ${top_builddir}/components/checker/checker.la \
 	-dlopen ${top_builddir}/components/cibsync/cibsync.la \
 	-dlopen ${top_builddir}/components/compat/compat.la \

lib/Makefile.am

@@ -0,0 +1,9 @@
+## Process this file with automake to produce Makefile.in
+## Created by Anjuta
+
+SUBDIRS = \
+	base \
+	config \
+	jsonrpc \
+	icinga \
+	cib

lib/cib/Makefile.am

@@ -27,10 +27,10 @@ libcib_la_SOURCES = \
 libcib_la_CPPFLAGS = \
 	-DI2_CIB_BUILD \
 	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/base \
+	-I${top_srcdir}/lib/base \
-	-I${top_srcdir}/dyn \
+	-I${top_srcdir}/lib/config \
-	-I${top_srcdir}/jsonrpc \
+	-I${top_srcdir}/lib/jsonrpc \
-	-I${top_srcdir}/icinga
+	-I${top_srcdir}/lib/icinga
 
 libcib_la_LDFLAGS = \
 	$(BOOST_LDFLAGS) \
@@ -41,7 +41,7 @@ libcib_la_LDFLAGS = \
 libcib_la_LIBADD = \
 	$(BOOST_SIGNALS_LIB) \
 	$(BOOST_THREAD_LIB) \
-	${top_builddir}/base/libbase.la \
+	${top_builddir}/lib/base/libbase.la \
-	${top_builddir}/dyn/libdyn.la \
+	${top_builddir}/lib/config/libconfig.la \
-	${top_builddir}/jsonrpc/libjsonrpc.la \
+	${top_builddir}/lib/jsonrpc/libjsonrpc.la \
-	${top_builddir}/icinga/libicinga.la
+	${top_builddir}/lib/icinga/libicinga.la

lib/cib/cib.vcxproj

@@ -39,12 +39,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(SolutionDir)\dyn;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(SolutionDir)\config;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(SolutionDir)\dyn;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(SolutionDir)\config;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -59,7 +59,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;icinga.lib;jsonrpc.lib;dyn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;icinga.lib;jsonrpc.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -78,7 +78,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;icinga.lib;jsonrpc.lib;dyn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;icinga.lib;jsonrpc.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -111,4 +111,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

lib/cib/i2-cib.h

@@ -27,7 +27,7 @@
  * updates from all the other Icinga components.
  */
 
-#include <i2-dyn.h>
+#include <i2-config.h>
 #include <i2-icinga.h>
 
 #ifdef I2_CIB_BUILD