Unflatten edk includes

Installing the edk headers into a folder requires us to do odd things
with imports, and either include headers with "..", or otherwise get the
include directories lined up.

Move the contents of edk/*.c/h up a level, and just simplify the include
structure.  This is done to fix the immediate change of the prior patch
and make this build again.  Happy to discuss other options.

Change-Id: I328f20bca6d23100993493445bee0e5e11d2866a
Signed-off-by: Ed Tanous <etanous@nvidia.com>
diff --git a/tests/test-utils.cpp b/tests/test-utils.cpp
index 53aecd3..c508e8d 100644
--- a/tests/test-utils.cpp
+++ b/tests/test-utils.cpp
@@ -8,7 +8,7 @@
 #include <cstdlib>
 #include "test-utils.hpp"
 
-#include "../edk/BaseTypes.h"
+#include "BaseTypes.h"
 #include "../generator/cper-generate.h"
 
 //Returns a ready-for-use memory stream containing a CPER record with the given sections inside.
diff --git a/tests/test-utils.hpp b/tests/test-utils.hpp
index 2dedf8b..af9390e 100644
--- a/tests/test-utils.hpp
+++ b/tests/test-utils.hpp
@@ -2,7 +2,7 @@
 #define CPER_IR_TEST_UTILS_H
 
 extern "C" {
-#include "../edk/BaseTypes.h"
+#include "BaseTypes.h"
 }
 
 FILE *generate_record_memstream(const char **types, UINT16 num_types,