Use the new include files UpnpIntTypes.h, UpnpStdInt.h and UpnpUniStd.h.

Trying to keep platform dependency on the headers and clean the main
code a little bit.

upnp/sample/common/tv_ctrlpt.h

@@ -1,3 +1,6 @@
+#ifndef UPNP_TV_CTRLPT_H
+#define UPNP_TV_CTRLPT_H
+
 /**************************************************************************
  *
  * Copyright (c) 2000-2003 Intel Corporation 
@@ -29,9 +32,6 @@
  *
  **************************************************************************/
 
-#ifndef UPNP_TV_CTRLPT_H
-#define UPNP_TV_CTRLPT_H
-
 /*!
  * \file
  */
@@ -46,6 +46,7 @@ extern "C" {
 #include "upnp.h"
 #include "UpnpString.h"
 #include "upnptools.h"
+#include "UpnpUniStd.h" /* for close() */
 
 #include <signal.h>
 #include <stdarg.h>
@@ -53,12 +54,6 @@ extern "C" {
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef WIN32
-	/* Do not #include <unistd.h> */
-#else
-	#include <unistd.h>
-#endif
-
 #define TV_SERVICE_SERVCOUNT	2
 #define TV_SERVICE_CONTROL	0
 #define TV_SERVICE_PICTURE	1

upnp/sample/common/tv_device.h

@@ -1,3 +1,6 @@
+#ifndef UPNP_TV_DEVICE_H
+#define UPNP_TV_DEVICE_H
+
 /**************************************************************************
  *
  * Copyright (c) 2000-2003 Intel Corporation 
@@ -29,9 +32,6 @@
  *
  **************************************************************************/
 
-#ifndef UPNP_TV_DEVICE_H
-#define UPNP_TV_DEVICE_H
-
 /*!
  * \file
  */
@@ -47,16 +47,11 @@ extern "C" {
 
 #include "ithread.h"
 #include "upnp.h"
+#include "UpnpUniStd.h" /* for close() */
 
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef WIN32
-	/* Do not #include <unistd.h> */
-#else
-	#include <unistd.h>
-#endif
-
 /*! Color constants */
 #define MAX_COLOR 10
 #define MIN_COLOR 1