diff --git a/src/network/network_data.h b/src/network/network_data.h
index 02c112ae99..dfc1a8be1c 100644
--- a/src/network/network_data.h
+++ b/src/network/network_data.h
@@ -3,11 +3,12 @@
 #ifndef NETWORK_DATA_H
 #define NETWORK_DATA_H
 
+#include "../openttd.h"
+#include "network.h"
+
 // Is the network enabled?
 #ifdef ENABLE_NETWORK
 
-#include "../openttd.h"
-#include "network.h"
 #include "core/os_abstraction.h"
 #include "core/core.h"
 #include "core/config.h"
diff --git a/src/spriteloader/png.cpp b/src/spriteloader/png.cpp
index 71f64a2bf6..6048c6fdd7 100644
--- a/src/spriteloader/png.cpp
+++ b/src/spriteloader/png.cpp
@@ -2,6 +2,8 @@
 
 /** @file grf.cpp */
 
+#ifdef WITH_PNG
+
 #include "../stdafx.h"
 #include "../gfx.h"
 #include "../fileio.h"
@@ -184,3 +186,5 @@ bool SpriteLoaderPNG::LoadSprite(SpriteLoader::Sprite *sprite, const char *filen
 	if (!LoadPNG(sprite, filename, file_pos, true)) return false;
 	return true;
 }
+
+#endif /* WITH_PNG */