diff --git a/src/apps/showimage/BackgroundImage.cpp b/src/apps/showimage/BackgroundImage.cpp
index 2523ba146e..4037ae0795 100644
--- a/src/apps/showimage/BackgroundImage.cpp
+++ b/src/apps/showimage/BackgroundImage.cpp
@@ -146,7 +146,7 @@ BackgroundImage::_GetImages(BDirectory& directory, BMessage& container)
 
 	char *buffer = new (nothrow) char [info.size];
 	if (buffer == NULL)
-		return NULL;
+		return B_NO_MEMORY;
 
 	status = directory.ReadAttr(B_BACKGROUND_INFO, info.type,
 		0, buffer, (size_t)info.size);
diff --git a/src/apps/showimage/BackgroundImage.h b/src/apps/showimage/BackgroundImage.h
index d06f0203bd..708c146198 100644
--- a/src/apps/showimage/BackgroundImage.h
+++ b/src/apps/showimage/BackgroundImage.h
@@ -34,7 +34,8 @@ All rights reserved.
 #ifndef BACKGROUND_IMAGE_H
 #define BACKGROUND_IMAGE_H
 
-
+#include <Message.h>
+#include <Point.h>
 #include <SupportDefs.h>
 
 class BDirectory;
diff --git a/src/apps/showimage/ShowImageApp.h b/src/apps/showimage/ShowImageApp.h
index fd5efe3f84..57e3492ce2 100644
--- a/src/apps/showimage/ShowImageApp.h
+++ b/src/apps/showimage/ShowImageApp.h
@@ -14,6 +14,7 @@
 #include "ShowImageSettings.h"
 
 #include <Application.h>
+#include <FilePanel.h>
 
 
 class ShowImageApp : public BApplication {
diff --git a/src/apps/showimage/ShowImageSettings.h b/src/apps/showimage/ShowImageSettings.h
index 3507a9bc6c..f6335dbaed 100644
--- a/src/apps/showimage/ShowImageSettings.h
+++ b/src/apps/showimage/ShowImageSettings.h
@@ -29,6 +29,7 @@
 #ifndef _ShowImageSettings_H
 #define _ShowImageSettings_H
 
+#include <File.h>
 #include <Message.h>
 #include <Locker.h>