aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/os/Mutex.cxx4
-rw-r--r--common/os/Thread.cxx4
-rw-r--r--common/os/os.h4
-rw-r--r--common/rdr/FileInStream.cxx4
-rw-r--r--common/rdr/HexInStream.cxx4
-rw-r--r--common/rdr/HexOutStream.cxx4
-rw-r--r--common/rdr/RandomStream.cxx4
-rw-r--r--common/rdr/TLSInStream.h4
-rw-r--r--common/rdr/TLSOutStream.h4
-rw-r--r--common/rdr/ZlibInStream.cxx4
-rw-r--r--common/rdr/ZlibOutStream.cxx4
-rw-r--r--common/rfb/Blacklist.cxx5
-rw-r--r--common/rfb/CConnection.cxx5
-rw-r--r--common/rfb/CMsgHandler.cxx5
-rw-r--r--common/rfb/CMsgReader.cxx4
-rw-r--r--common/rfb/CMsgWriter.cxx5
-rw-r--r--common/rfb/CSecurityPlain.cxx4
-rw-r--r--common/rfb/CSecurityStack.cxx4
-rw-r--r--common/rfb/CSecurityTLS.h4
-rw-r--r--common/rfb/CSecurityVeNCrypt.cxx4
-rw-r--r--common/rfb/CSecurityVncAuth.cxx4
-rw-r--r--common/rfb/ClientParams.cxx5
-rw-r--r--common/rfb/ComparingUpdateTracker.cxx5
-rw-r--r--common/rfb/Configuration.cxx4
-rw-r--r--common/rfb/Congestion.cxx4
-rw-r--r--common/rfb/CopyRectDecoder.cxx5
-rw-r--r--common/rfb/Cursor.cxx5
-rw-r--r--common/rfb/DecodeManager.cxx4
-rw-r--r--common/rfb/Decoder.cxx5
-rw-r--r--common/rfb/EncodeManager.cxx4
-rw-r--r--common/rfb/Encoder.cxx4
-rw-r--r--common/rfb/HextileDecoder.cxx4
-rw-r--r--common/rfb/HextileEncoder.cxx5
-rw-r--r--common/rfb/JpegCompressor.cxx4
-rw-r--r--common/rfb/JpegDecompressor.cxx4
-rw-r--r--common/rfb/KeyRemapper.cxx4
-rw-r--r--common/rfb/LogWriter.cxx4
-rw-r--r--common/rfb/Logger.cxx4
-rw-r--r--common/rfb/Logger_file.cxx4
-rw-r--r--common/rfb/Logger_stdio.cxx4
-rw-r--r--common/rfb/Logger_syslog.cxx4
-rw-r--r--common/rfb/Password.cxx4
-rw-r--r--common/rfb/PixelBuffer.cxx4
-rw-r--r--common/rfb/PixelFormat.cxx5
-rw-r--r--common/rfb/RREDecoder.cxx4
-rw-r--r--common/rfb/RREEncoder.cxx5
-rw-r--r--common/rfb/RawDecoder.cxx4
-rw-r--r--common/rfb/RawEncoder.cxx5
-rw-r--r--common/rfb/Region.cxx4
-rw-r--r--common/rfb/SConnection.cxx5
-rw-r--r--common/rfb/SMsgHandler.cxx5
-rw-r--r--common/rfb/SMsgReader.cxx5
-rw-r--r--common/rfb/SMsgWriter.cxx5
-rw-r--r--common/rfb/SSecurityPlain.h4
-rw-r--r--common/rfb/SSecurityStack.cxx4
-rw-r--r--common/rfb/SSecurityTLS.h4
-rw-r--r--common/rfb/SSecurityVeNCrypt.h4
-rw-r--r--common/rfb/SSecurityVncAuth.cxx4
-rw-r--r--common/rfb/ScaleFilters.cxx4
-rw-r--r--common/rfb/ServerCore.cxx4
-rw-r--r--common/rfb/ServerParams.cxx5
-rw-r--r--common/rfb/TightDecoder.cxx4
-rw-r--r--common/rfb/TightEncoder.cxx5
-rw-r--r--common/rfb/TightJPEGEncoder.cxx5
-rw-r--r--common/rfb/Timer.cxx4
-rw-r--r--common/rfb/UpdateTracker.cxx4
-rw-r--r--common/rfb/VNCSConnectionST.cxx4
-rw-r--r--common/rfb/VNCServerST.cxx4
-rw-r--r--common/rfb/WinPasswdValidator.cxx4
-rw-r--r--common/rfb/ZRLEDecoder.cxx4
-rw-r--r--common/rfb/ZRLEEncoder.cxx5
-rw-r--r--common/rfb/encodings.cxx5
-rw-r--r--common/rfb/util.h4
73 files changed, 282 insertions, 32 deletions
diff --git a/common/os/Mutex.cxx b/common/os/Mutex.cxx
index 13013cfb..e6532a7d 100644
--- a/common/os/Mutex.cxx
+++ b/common/os/Mutex.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
#include <windows.h>
#else
diff --git a/common/os/Thread.cxx b/common/os/Thread.cxx
index 2b08dbf9..92cc68d5 100644
--- a/common/os/Thread.cxx
+++ b/common/os/Thread.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
#include <windows.h>
#else
diff --git a/common/os/os.h b/common/os/os.h
index 6a8272f1..9b1de597 100644
--- a/common/os/os.h
+++ b/common/os/os.h
@@ -19,10 +19,6 @@
#ifndef OS_OS_H
#define OS_OS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <os/w32tiger.h>
/*
diff --git a/common/rdr/FileInStream.cxx b/common/rdr/FileInStream.cxx
index 9975fde6..198b9ab9 100644
--- a/common/rdr/FileInStream.cxx
+++ b/common/rdr/FileInStream.cxx
@@ -18,6 +18,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <errno.h>
#include <rdr/Exception.h>
diff --git a/common/rdr/HexInStream.cxx b/common/rdr/HexInStream.cxx
index c31623b6..9f871f1a 100644
--- a/common/rdr/HexInStream.cxx
+++ b/common/rdr/HexInStream.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/HexInStream.h>
#include <rdr/Exception.h>
diff --git a/common/rdr/HexOutStream.cxx b/common/rdr/HexOutStream.cxx
index 798f6bdf..85aff47b 100644
--- a/common/rdr/HexOutStream.cxx
+++ b/common/rdr/HexOutStream.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/HexOutStream.h>
#include <rdr/Exception.h>
diff --git a/common/rdr/RandomStream.cxx b/common/rdr/RandomStream.cxx
index e2da0957..ec367212 100644
--- a/common/rdr/RandomStream.cxx
+++ b/common/rdr/RandomStream.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/RandomStream.h>
#include <rdr/Exception.h>
#include <rfb/LogWriter.h>
diff --git a/common/rdr/TLSInStream.h b/common/rdr/TLSInStream.h
index 8fe35d26..4564d118 100644
--- a/common/rdr/TLSInStream.h
+++ b/common/rdr/TLSInStream.h
@@ -20,10 +20,6 @@
#ifndef __RDR_TLSINSTREAM_H__
#define __RDR_TLSINSTREAM_H__
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef HAVE_GNUTLS
#include <gnutls/gnutls.h>
diff --git a/common/rdr/TLSOutStream.h b/common/rdr/TLSOutStream.h
index c5579127..5e725bd5 100644
--- a/common/rdr/TLSOutStream.h
+++ b/common/rdr/TLSOutStream.h
@@ -20,10 +20,6 @@
#ifndef __RDR_TLSOUTSTREAM_H__
#define __RDR_TLSOUTSTREAM_H__
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef HAVE_GNUTLS
#include <gnutls/gnutls.h>
#include <rdr/OutStream.h>
diff --git a/common/rdr/ZlibInStream.cxx b/common/rdr/ZlibInStream.cxx
index 0cacc21f..377147ac 100644
--- a/common/rdr/ZlibInStream.cxx
+++ b/common/rdr/ZlibInStream.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <rdr/ZlibInStream.h>
diff --git a/common/rdr/ZlibOutStream.cxx b/common/rdr/ZlibOutStream.cxx
index ba6f1785..0d4d39a7 100644
--- a/common/rdr/ZlibOutStream.cxx
+++ b/common/rdr/ZlibOutStream.cxx
@@ -17,6 +17,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <rdr/ZlibOutStream.h>
diff --git a/common/rfb/Blacklist.cxx b/common/rfb/Blacklist.cxx
index 86917c14..f052eafb 100644
--- a/common/rfb/Blacklist.cxx
+++ b/common/rfb/Blacklist.cxx
@@ -15,6 +15,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/Blacklist.h>
#include <rfb/Configuration.h>
diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx
index 1c949009..c474921b 100644
--- a/common/rfb/CConnection.cxx
+++ b/common/rfb/CConnection.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <stdio.h>
#include <string.h>
diff --git a/common/rfb/CMsgHandler.cxx b/common/rfb/CMsgHandler.cxx
index c6ab87ef..8cdfc451 100644
--- a/common/rfb/CMsgHandler.cxx
+++ b/common/rfb/CMsgHandler.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <rfb/Exception.h>
diff --git a/common/rfb/CMsgReader.cxx b/common/rfb/CMsgReader.cxx
index 2c823d56..88a31eca 100644
--- a/common/rfb/CMsgReader.cxx
+++ b/common/rfb/CMsgReader.cxx
@@ -17,6 +17,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <stdio.h>
diff --git a/common/rfb/CMsgWriter.cxx b/common/rfb/CMsgWriter.cxx
index c452f5eb..0ac1bd73 100644
--- a/common/rfb/CMsgWriter.cxx
+++ b/common/rfb/CMsgWriter.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <rdr/OutStream.h>
diff --git a/common/rfb/CSecurityPlain.cxx b/common/rfb/CSecurityPlain.cxx
index b2fb7364..464dfcb5 100644
--- a/common/rfb/CSecurityPlain.cxx
+++ b/common/rfb/CSecurityPlain.cxx
@@ -17,6 +17,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/CConnection.h>
#include <rfb/CSecurityPlain.h>
#include <rfb/UserPasswdGetter.h>
diff --git a/common/rfb/CSecurityStack.cxx b/common/rfb/CSecurityStack.cxx
index 2541d81e..5691fd48 100644
--- a/common/rfb/CSecurityStack.cxx
+++ b/common/rfb/CSecurityStack.cxx
@@ -17,6 +17,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/CSecurityStack.h>
using namespace rfb;
diff --git a/common/rfb/CSecurityTLS.h b/common/rfb/CSecurityTLS.h
index 9709926e..c21d9d8e 100644
--- a/common/rfb/CSecurityTLS.h
+++ b/common/rfb/CSecurityTLS.h
@@ -22,10 +22,6 @@
#ifndef __C_SECURITY_TLS_H__
#define __C_SECURITY_TLS_H__
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef HAVE_GNUTLS
#error "This header should not be compiled without HAVE_GNUTLS defined"
#endif
diff --git a/common/rfb/CSecurityVeNCrypt.cxx b/common/rfb/CSecurityVeNCrypt.cxx
index c0fe3273..6040dd34 100644
--- a/common/rfb/CSecurityVeNCrypt.cxx
+++ b/common/rfb/CSecurityVeNCrypt.cxx
@@ -22,6 +22,10 @@
// CSecurityVeNCrypt
//
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/Exception.h>
#include <rdr/InStream.h>
#include <rdr/OutStream.h>
diff --git a/common/rfb/CSecurityVncAuth.cxx b/common/rfb/CSecurityVncAuth.cxx
index 78a3a061..a899b5e7 100644
--- a/common/rfb/CSecurityVncAuth.cxx
+++ b/common/rfb/CSecurityVncAuth.cxx
@@ -21,6 +21,10 @@
// XXX not thread-safe, because d3des isn't - do we need to worry about this?
//
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <stdio.h>
diff --git a/common/rfb/ClientParams.cxx b/common/rfb/ClientParams.cxx
index c0cc3641..d933aa34 100644
--- a/common/rfb/ClientParams.cxx
+++ b/common/rfb/ClientParams.cxx
@@ -17,6 +17,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/Exception.h>
#include <rfb/encodings.h>
#include <rfb/ledStates.h>
diff --git a/common/rfb/ComparingUpdateTracker.cxx b/common/rfb/ComparingUpdateTracker.cxx
index 14ed908c..e0964ac2 100644
--- a/common/rfb/ComparingUpdateTracker.cxx
+++ b/common/rfb/ComparingUpdateTracker.cxx
@@ -15,6 +15,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <vector>
diff --git a/common/rfb/Configuration.cxx b/common/rfb/Configuration.cxx
index d5d3f252..8848e08d 100644
--- a/common/rfb/Configuration.cxx
+++ b/common/rfb/Configuration.cxx
@@ -20,6 +20,10 @@
// -=- Configuration.cxx
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
diff --git a/common/rfb/Congestion.cxx b/common/rfb/Congestion.cxx
index f3f9ceea..32339a14 100644
--- a/common/rfb/Congestion.cxx
+++ b/common/rfb/Congestion.cxx
@@ -33,6 +33,10 @@
* as we have too much noise for it to be reliable.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <sys/time.h>
diff --git a/common/rfb/CopyRectDecoder.cxx b/common/rfb/CopyRectDecoder.cxx
index bca8da48..82ae06f1 100644
--- a/common/rfb/CopyRectDecoder.cxx
+++ b/common/rfb/CopyRectDecoder.cxx
@@ -15,6 +15,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/MemInStream.h>
#include <rdr/OutStream.h>
#include <rfb/PixelBuffer.h>
diff --git a/common/rfb/Cursor.cxx b/common/rfb/Cursor.cxx
index 3ca69f7c..425cc8c4 100644
--- a/common/rfb/Cursor.cxx
+++ b/common/rfb/Cursor.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <string.h>
#include <rfb/Cursor.h>
diff --git a/common/rfb/DecodeManager.cxx b/common/rfb/DecodeManager.cxx
index b05683bb..b9faf689 100644
--- a/common/rfb/DecodeManager.cxx
+++ b/common/rfb/DecodeManager.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <string.h>
diff --git a/common/rfb/Decoder.cxx b/common/rfb/Decoder.cxx
index 9827a732..72641a43 100644
--- a/common/rfb/Decoder.cxx
+++ b/common/rfb/Decoder.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <rfb/encodings.h>
#include <rfb/Region.h>
diff --git a/common/rfb/EncodeManager.cxx b/common/rfb/EncodeManager.cxx
index a29502ae..e49fa254 100644
--- a/common/rfb/EncodeManager.cxx
+++ b/common/rfb/EncodeManager.cxx
@@ -19,6 +19,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <rfb/EncodeManager.h>
diff --git a/common/rfb/Encoder.cxx b/common/rfb/Encoder.cxx
index 0e29f1df..d6d4a81d 100644
--- a/common/rfb/Encoder.cxx
+++ b/common/rfb/Encoder.cxx
@@ -17,6 +17,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/Encoder.h>
#include <rfb/PixelBuffer.h>
#include <rfb/Palette.h>
diff --git a/common/rfb/HextileDecoder.cxx b/common/rfb/HextileDecoder.cxx
index 34392ea8..73655da0 100644
--- a/common/rfb/HextileDecoder.cxx
+++ b/common/rfb/HextileDecoder.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/InStream.h>
#include <rdr/MemInStream.h>
#include <rdr/OutStream.h>
diff --git a/common/rfb/HextileEncoder.cxx b/common/rfb/HextileEncoder.cxx
index 1e20eb92..e3845a83 100644
--- a/common/rfb/HextileEncoder.cxx
+++ b/common/rfb/HextileEncoder.cxx
@@ -17,6 +17,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/encodings.h>
#include <rfb/SConnection.h>
#include <rfb/HextileEncoder.h>
diff --git a/common/rfb/JpegCompressor.cxx b/common/rfb/JpegCompressor.cxx
index 64c6d3f0..18d34c3d 100644
--- a/common/rfb/JpegCompressor.cxx
+++ b/common/rfb/JpegCompressor.cxx
@@ -18,6 +18,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/JpegCompressor.h>
#include <rdr/Exception.h>
#include <rfb/Rect.h>
diff --git a/common/rfb/JpegDecompressor.cxx b/common/rfb/JpegDecompressor.cxx
index 4f94faa8..7b24e783 100644
--- a/common/rfb/JpegDecompressor.cxx
+++ b/common/rfb/JpegDecompressor.cxx
@@ -19,6 +19,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/JpegDecompressor.h>
#include <rdr/Exception.h>
#include <rfb/Rect.h>
diff --git a/common/rfb/KeyRemapper.cxx b/common/rfb/KeyRemapper.cxx
index b4c2793c..1431a21e 100644
--- a/common/rfb/KeyRemapper.cxx
+++ b/common/rfb/KeyRemapper.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <os/Mutex.h>
diff --git a/common/rfb/LogWriter.cxx b/common/rfb/LogWriter.cxx
index d0eaed6c..7feee2fe 100644
--- a/common/rfb/LogWriter.cxx
+++ b/common/rfb/LogWriter.cxx
@@ -18,6 +18,10 @@
// -=- LogWriter.cxx - client-side logging interface
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <rfb/LogWriter.h>
diff --git a/common/rfb/Logger.cxx b/common/rfb/Logger.cxx
index ad10a4cf..e815dad4 100644
--- a/common/rfb/Logger.cxx
+++ b/common/rfb/Logger.cxx
@@ -18,6 +18,10 @@
// -=- Logger.cxx - support for the Logger and LogWriter classes
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/common/rfb/Logger_file.cxx b/common/rfb/Logger_file.cxx
index 149ad404..89ff7433 100644
--- a/common/rfb/Logger_file.cxx
+++ b/common/rfb/Logger_file.cxx
@@ -18,6 +18,10 @@
// -=- Logger_file.cxx - Logger instance for a file
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <string.h>
diff --git a/common/rfb/Logger_stdio.cxx b/common/rfb/Logger_stdio.cxx
index 581dcd5b..5e5c6dea 100644
--- a/common/rfb/Logger_stdio.cxx
+++ b/common/rfb/Logger_stdio.cxx
@@ -18,6 +18,10 @@
// -=- Logger_stdio.cxx - Logger instances for stderr and stdout
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/Logger_stdio.h>
using namespace rfb;
diff --git a/common/rfb/Logger_syslog.cxx b/common/rfb/Logger_syslog.cxx
index dc1d0c1a..0f5c8423 100644
--- a/common/rfb/Logger_syslog.cxx
+++ b/common/rfb/Logger_syslog.cxx
@@ -18,6 +18,10 @@
// -=- Logger_syslog.cxx - Logger instance for a syslog
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
diff --git a/common/rfb/Password.cxx b/common/rfb/Password.cxx
index e4a508c8..a7aaeccc 100644
--- a/common/rfb/Password.cxx
+++ b/common/rfb/Password.cxx
@@ -20,6 +20,10 @@
// XXX not thread-safe, because d3des isn't - do we need to worry about this?
//
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
extern "C" {
#include <rfb/d3des.h>
diff --git a/common/rfb/PixelBuffer.cxx b/common/rfb/PixelBuffer.cxx
index fe406b96..1b39a9ec 100644
--- a/common/rfb/PixelBuffer.cxx
+++ b/common/rfb/PixelBuffer.cxx
@@ -22,6 +22,10 @@
// The PixelBuffer class encapsulates the PixelFormat and dimensions
// of a block of pixel data.
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/Exception.h>
#include <rfb/LogWriter.h>
#include <rfb/PixelBuffer.h>
diff --git a/common/rfb/PixelFormat.cxx b/common/rfb/PixelFormat.cxx
index 1b4ab1ba..0abf53b6 100644
--- a/common/rfb/PixelFormat.cxx
+++ b/common/rfb/PixelFormat.cxx
@@ -17,6 +17,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <stdio.h>
#include <stdint.h>
diff --git a/common/rfb/RREDecoder.cxx b/common/rfb/RREDecoder.cxx
index af821cb9..a0818987 100644
--- a/common/rfb/RREDecoder.cxx
+++ b/common/rfb/RREDecoder.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/InStream.h>
#include <rdr/MemInStream.h>
#include <rdr/OutStream.h>
diff --git a/common/rfb/RREEncoder.cxx b/common/rfb/RREEncoder.cxx
index 83585490..f5b9be72 100644
--- a/common/rfb/RREEncoder.cxx
+++ b/common/rfb/RREEncoder.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/OutStream.h>
#include <rfb/encodings.h>
#include <rfb/SConnection.h>
diff --git a/common/rfb/RawDecoder.cxx b/common/rfb/RawDecoder.cxx
index a7648f97..a86696e9 100644
--- a/common/rfb/RawDecoder.cxx
+++ b/common/rfb/RawDecoder.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <rdr/OutStream.h>
diff --git a/common/rfb/RawEncoder.cxx b/common/rfb/RawEncoder.cxx
index b12cf06f..a820c32c 100644
--- a/common/rfb/RawEncoder.cxx
+++ b/common/rfb/RawEncoder.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/OutStream.h>
#include <rfb/encodings.h>
#include <rfb/SConnection.h>
diff --git a/common/rfb/Region.cxx b/common/rfb/Region.cxx
index 2664fb11..fecc881e 100644
--- a/common/rfb/Region.cxx
+++ b/common/rfb/Region.cxx
@@ -17,6 +17,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/Region.h>
#include <rfb/LogWriter.h>
diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx
index 8277844c..02865af1 100644
--- a/common/rfb/SConnection.cxx
+++ b/common/rfb/SConnection.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <rfb/Exception.h>
diff --git a/common/rfb/SMsgHandler.cxx b/common/rfb/SMsgHandler.cxx
index 972facb0..0f813178 100644
--- a/common/rfb/SMsgHandler.cxx
+++ b/common/rfb/SMsgHandler.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/Exception.h>
#include <rfb/LogWriter.h>
#include <rfb/SMsgHandler.h>
diff --git a/common/rfb/SMsgReader.cxx b/common/rfb/SMsgReader.cxx
index 63188f21..a2cb8bf8 100644
--- a/common/rfb/SMsgReader.cxx
+++ b/common/rfb/SMsgReader.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <rdr/InStream.h>
diff --git a/common/rfb/SMsgWriter.cxx b/common/rfb/SMsgWriter.cxx
index 2f40c0a6..c8b50b67 100644
--- a/common/rfb/SMsgWriter.cxx
+++ b/common/rfb/SMsgWriter.cxx
@@ -17,6 +17,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <rdr/OutStream.h>
diff --git a/common/rfb/SSecurityPlain.h b/common/rfb/SSecurityPlain.h
index 4b12da05..1a81adda 100644
--- a/common/rfb/SSecurityPlain.h
+++ b/common/rfb/SSecurityPlain.h
@@ -20,10 +20,6 @@
#ifndef __RFB_SSECURITYPLAIN_H__
#define __RFB_SSECURITYPLAIN_H__
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <rfb/SConnection.h>
#include <rfb/SSecurity.h>
#include <rfb/SSecurityVeNCrypt.h>
diff --git a/common/rfb/SSecurityStack.cxx b/common/rfb/SSecurityStack.cxx
index 81395113..8b1c2a47 100644
--- a/common/rfb/SSecurityStack.cxx
+++ b/common/rfb/SSecurityStack.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/SSecurityStack.h>
using namespace rfb;
diff --git a/common/rfb/SSecurityTLS.h b/common/rfb/SSecurityTLS.h
index 0cb463d4..4e06d6ba 100644
--- a/common/rfb/SSecurityTLS.h
+++ b/common/rfb/SSecurityTLS.h
@@ -22,10 +22,6 @@
#ifndef __S_SECURITY_TLS_H__
#define __S_SECURITY_TLS_H__
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef HAVE_GNUTLS
#error "This header should not be included without HAVE_GNUTLS defined"
#endif
diff --git a/common/rfb/SSecurityVeNCrypt.h b/common/rfb/SSecurityVeNCrypt.h
index 06758b88..afbf7247 100644
--- a/common/rfb/SSecurityVeNCrypt.h
+++ b/common/rfb/SSecurityVeNCrypt.h
@@ -25,10 +25,6 @@
#ifndef __SSECURITYVENCRYPT_H__
#define __SSECURITYVENCRYPT_H__
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <rfb/SSecurityStack.h>
#include <rfb/SConnection.h>
diff --git a/common/rfb/SSecurityVncAuth.cxx b/common/rfb/SSecurityVncAuth.cxx
index c2a348b9..a19404d3 100644
--- a/common/rfb/SSecurityVncAuth.cxx
+++ b/common/rfb/SSecurityVncAuth.cxx
@@ -21,6 +21,10 @@
// XXX not thread-safe, because d3des isn't - do we need to worry about this?
//
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/SSecurityVncAuth.h>
#include <rdr/RandomStream.h>
#include <rfb/SConnection.h>
diff --git a/common/rfb/ScaleFilters.cxx b/common/rfb/ScaleFilters.cxx
index 3e414d90..823dc740 100644
--- a/common/rfb/ScaleFilters.cxx
+++ b/common/rfb/ScaleFilters.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <assert.h>
#include <math.h>
diff --git a/common/rfb/ServerCore.cxx b/common/rfb/ServerCore.cxx
index 8f49848c..274458fa 100644
--- a/common/rfb/ServerCore.cxx
+++ b/common/rfb/ServerCore.cxx
@@ -21,6 +21,10 @@
// This header will define the Server interface, from which ServerMT and
// ServerST will be derived.
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <rfb/util.h>
#include <rfb/ServerCore.h>
diff --git a/common/rfb/ServerParams.cxx b/common/rfb/ServerParams.cxx
index a9a96b6e..729b3cfb 100644
--- a/common/rfb/ServerParams.cxx
+++ b/common/rfb/ServerParams.cxx
@@ -17,6 +17,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/Exception.h>
#include <rfb/ledStates.h>
#include <rfb/ServerParams.h>
diff --git a/common/rfb/TightDecoder.cxx b/common/rfb/TightDecoder.cxx
index fe03e453..ce01104e 100644
--- a/common/rfb/TightDecoder.cxx
+++ b/common/rfb/TightDecoder.cxx
@@ -19,6 +19,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <rdr/InStream.h>
diff --git a/common/rfb/TightEncoder.cxx b/common/rfb/TightEncoder.cxx
index 5cefa5c5..5cce03e9 100644
--- a/common/rfb/TightEncoder.cxx
+++ b/common/rfb/TightEncoder.cxx
@@ -17,6 +17,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <rdr/OutStream.h>
diff --git a/common/rfb/TightJPEGEncoder.cxx b/common/rfb/TightJPEGEncoder.cxx
index 75575389..11701e74 100644
--- a/common/rfb/TightJPEGEncoder.cxx
+++ b/common/rfb/TightJPEGEncoder.cxx
@@ -17,6 +17,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/OutStream.h>
#include <rfb/encodings.h>
#include <rfb/SConnection.h>
diff --git a/common/rfb/Timer.cxx b/common/rfb/Timer.cxx
index b9dd2f6d..4ff15bc5 100644
--- a/common/rfb/Timer.cxx
+++ b/common/rfb/Timer.cxx
@@ -19,6 +19,10 @@
// -=- Timer.cxx
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <sys/time.h>
diff --git a/common/rfb/UpdateTracker.cxx b/common/rfb/UpdateTracker.cxx
index 28e916d5..7c97a6b8 100644
--- a/common/rfb/UpdateTracker.cxx
+++ b/common/rfb/UpdateTracker.cxx
@@ -21,6 +21,10 @@
// Tracks updated regions and a region-copy event, too
//
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/UpdateTracker.h>
#include <rfb/LogWriter.h>
diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index a966e66c..f51fb57b 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -18,6 +18,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <network/TcpSocket.h>
#include <rfb/ComparingUpdateTracker.h>
diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx
index fcc93a4e..3a7caf5c 100644
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -48,6 +48,10 @@
// otherwise blacklisted connections might be "forgotten".
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <stdlib.h>
diff --git a/common/rfb/WinPasswdValidator.cxx b/common/rfb/WinPasswdValidator.cxx
index 22efcc0c..b2edde5f 100644
--- a/common/rfb/WinPasswdValidator.cxx
+++ b/common/rfb/WinPasswdValidator.cxx
@@ -18,6 +18,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rfb/WinPasswdValidator.h>
#include <windows.h>
#include <tchar.h>
diff --git a/common/rfb/ZRLEDecoder.cxx b/common/rfb/ZRLEDecoder.cxx
index 4fba0c22..3c7ed2ce 100644
--- a/common/rfb/ZRLEDecoder.cxx
+++ b/common/rfb/ZRLEDecoder.cxx
@@ -17,6 +17,10 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/InStream.h>
#include <rdr/MemInStream.h>
#include <rdr/OutStream.h>
diff --git a/common/rfb/ZRLEEncoder.cxx b/common/rfb/ZRLEEncoder.cxx
index c055c527..ff70c6ee 100644
--- a/common/rfb/ZRLEEncoder.cxx
+++ b/common/rfb/ZRLEEncoder.cxx
@@ -16,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <rdr/OutStream.h>
#include <rfb/Exception.h>
#include <rfb/encodings.h>
diff --git a/common/rfb/encodings.cxx b/common/rfb/encodings.cxx
index 190e0324..7c9c7408 100644
--- a/common/rfb/encodings.cxx
+++ b/common/rfb/encodings.cxx
@@ -15,6 +15,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <rfb/encodings.h>
#include <rfb/util.h>
diff --git a/common/rfb/util.h b/common/rfb/util.h
index eac72dd0..f0ac9ef8 100644
--- a/common/rfb/util.h
+++ b/common/rfb/util.h
@@ -24,10 +24,6 @@
#ifndef __RFB_UTIL_H__
#define __RFB_UTIL_H__
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <limits.h>
#include <string.h>