--- a/libupnpp/upnpplib.cxx
+++ b/libupnpp/upnpplib.cxx
@@ -17,6 +17,7 @@
#include "config.h"
#include <string.h>
+#include <ctype.h>
#include <string>
#include <iostream>
@@ -35,6 +36,9 @@
}
#include "md5.hxx"
#include "log.hxx"
+#include "upnpputils.hxx"
+
+namespace UPnPP {
static LibUPnP *theLib;
@@ -421,8 +425,6 @@
return true;
}
-#include <ctype.h>
-
// s1 is already uppercase
int stringuppercmp(const string & s1, const string& s2)
{
@@ -452,10 +454,6 @@
}
}
-#include "upnpputils.hxx"
-
-namespace UPnPP {
-
static const long long BILLION = 1000 * 1000 * 1000;
void timespec_addnanos(struct timespec *ts, long long nanos)