minor fixes

driver/common/vx_scope.cpp

@@ -1,3 +1,4 @@
+#include "vx_scope.h"
 #include <iostream>
 #include <fstream>
 #include <thread>
@@ -7,17 +8,9 @@
 #include <chrono>
 #include <thread>
 #include <mutex>
-
-#ifdef USE_VLSIM
-#include "vlsim/fpga.h"
-#else
-#include <opae/fpga.h>
-#endif
-
 #include <VX_config.h>
-#include "vx_scope.h"
-#include "vortex_afu.h"
-#include "scope-defs.h"
+#include <vortex_afu.h>
+#include <scope-defs.h>
 
 #define FRAME_FLUSH_SIZE 100
 

driver/common/vx_scope.h

@@ -1,5 +1,13 @@
 #pragma once
 
+#include <cstdint>
+
+#ifdef USE_VLSIM
+#include <fpga.h>
+#else
+#include <opae/fpga.h>
+#endif
+
 #if defined(USE_FPGA)
 #define HANG_TIMEOUT 60
 #else