Index: /trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.cpp
===================================================================
--- /trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.cpp	(revision 79762)
+++ /trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.cpp	(revision 79763)
@@ -22,8 +22,12 @@
 #include "DhcpdInternal.h"
 #include "DhcpOptions.h"
-#include "DhcpMessage.h"
+#ifndef IN_VBOXSVC
+# include "DhcpMessage.h"
+#endif
 
 #include <iprt/cidr.h>
 
+
+#ifndef IN_VBOXSVC
 
 optmap_t &operator<<(optmap_t &optmap, DhcpOption *option)
@@ -54,4 +58,6 @@
 }
 
+#endif /* !IN_VBOXSVC */
+
 
 int DhcpOption::encode(octets_t &dst) const
@@ -102,8 +108,10 @@
 
 
+#ifndef IN_VBOXSVC
 int DhcpOption::decode(const DhcpClientMessage &req)
 {
     return decode(req.rawopts());
 }
+#endif
 
 
Index: /trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.h
===================================================================
--- /trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.h	(revision 79762)
+++ /trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.h	(revision 79763)
@@ -211,6 +211,8 @@
 
 
+#ifndef IN_VBOXSVC
 optmap_t &operator<<(optmap_t &optmap, DhcpOption *option);
 optmap_t &operator<<(optmap_t &optmap, const std::shared_ptr<DhcpOption> &option);
+#endif
 
 
Index: /trunk/src/VBox/NetworkServices/Dhcpd/DhcpdInternal.h
===================================================================
--- /trunk/src/VBox/NetworkServices/Dhcpd/DhcpdInternal.h	(revision 79762)
+++ /trunk/src/VBox/NetworkServices/Dhcpd/DhcpdInternal.h	(revision 79763)
@@ -49,7 +49,9 @@
 typedef std::map<uint8_t, octets_t> rawopts_t;
 
+#ifndef IN_VBOXSVC
 class DhcpOption;
 /** DHCP option map (keyed by option number, DhcpOption value). */
 typedef std::map<uint8_t, std::shared_ptr<DhcpOption> > optmap_t;
+#endif