diff --git a/src/input/zapper.cpp b/src/input/zapper.cpp
index d8d101a4..cc2a4cbd 100644
--- a/src/input/zapper.cpp
+++ b/src/input/zapper.cpp
@@ -23,9 +23,9 @@
 
 #include "share.h"
 #include "zapper.h"
-#include "movie.h"
+#include "../movie.h"
 
-static ZAPPER ZD[2];
+extern ZAPPER ZD[2];
 
 static void ZapperFrapper(int w, uint8 *bg, uint8 *spr, uint32 linets, int final)
 {
diff --git a/src/input/zapper.h b/src/input/zapper.h
index 31905f76..c28b6dc9 100644
--- a/src/input/zapper.h
+++ b/src/input/zapper.h
@@ -10,6 +10,6 @@ struct ZAPPER
 	uint64 zaphit;
 };
 
-extern ZAPPER ZD[2];
+static ZAPPER ZD[2];
 
 #endif
diff --git a/src/video.cpp b/src/video.cpp
index f490dde9..72889142 100644
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -44,7 +44,8 @@
 #include "nsf.h"
 #include "input.h"
 #include "vsuni.h"
-#include "drawing.h"
+#include "drawing.h"
+#include "driver.h"
 
 uint8 *XBuf=NULL;
 uint8 *XBackBuf=NULL;